teiid-commits December 2011

teiid-commits@lists.jboss.org

2 participants
55 discussions

teiid SVN: r3714 - in trunk: admin and 19 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2011-12-01 13:19:11 -0500 (Thu, 01 Dec 2011) New Revision: 3714 Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java Modified: trunk/admin/pom.xml trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties trunk/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java trunk/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java trunk/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java trunk/admin/src/test/resources/vdb-describe.txt trunk/build/assembly/jboss-as7/dist.xml trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/client/main/module.xml trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml trunk/client/pom.xml trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java trunk/connectors/translator-hive/pom.xml trunk/jboss-integration/pom.xml trunk/jboss-integration/src/main/java/org/teiid/jboss/BaseOperationHandler.java trunk/jboss-integration/src/main/java/org/teiid/jboss/BufferManagerService.java trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemDescribe.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties trunk/jboss-integration/src/test/resources/teiid-model-config.txt trunk/jboss-integration/src/test/resources/teiid-transport-config.txt trunk/pom.xml trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1720: Updating the code base to use Jboss-as-7.1.0.Beta1 Modified: trunk/admin/pom.xml =================================================================== --- trunk/admin/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/pom.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -27,7 +27,7 @@ </dependency> <dependency> <groupId>org.jboss</groupId> - <artifactId>jboss-dmr</artifactId> + <artifactId>jboss-dmr</artifactId> </dependency> <dependency> <groupId>org.jboss.as</groupId> Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -29,9 +29,9 @@ import org.teiid.adminapi.AdminPlugin; import org.teiid.adminapi.DataPolicy; import org.teiid.adminapi.Model; -import org.teiid.adminapi.Translator; import org.teiid.adminapi.Request.ProcessingState; import org.teiid.adminapi.Request.ThreadState; +import org.teiid.adminapi.Translator; import org.teiid.adminapi.VDB.ConnectionType; import org.teiid.adminapi.VDB.Status; import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData; @@ -45,10 +45,11 @@ private static final String URL = "url"; //$NON-NLS-1$ private static final String MODELS = "models"; //$NON-NLS-1$ private static final String OVERRIDE_TRANSLATORS = "override-translators"; //$NON-NLS-1$ - private static final String DESCRIPTION = "description"; //$NON-NLS-1$ + private static final String VDB_DESCRIPTION = "vdb-description"; //$NON-NLS-1$ private static final String PROPERTIES = "properties"; //$NON-NLS-1$ private static final String DYNAMIC = "dynamic"; //$NON-NLS-1$ private static final String DATA_POLICIES = "data-policies"; //$NON-NLS-1$ + private static final String DESCRIPTION = "description"; //$NON-NLS-1$ public static VDBMetadataMapper INSTANCE = new VDBMetadataMapper(); @@ -56,7 +57,7 @@ if (vdb == null) { return null; } - + node.get(TYPE).set(ModelType.OBJECT); node.get(VDBNAME).set(vdb.getName()); node.get(CONNECTIONTYPE).set(vdb.getConnectionType().toString()); node.get(STATUS).set(vdb.getStatus().toString()); @@ -64,14 +65,14 @@ if (vdb.getUrl() != null) { } if (vdb.getDescription() != null) { - node.get(DESCRIPTION).set(vdb.getDescription()); + node.get(VDB_DESCRIPTION).set(vdb.getDescription()); } node.get(DYNAMIC).set(vdb.isDynamic()); //PROPERTIES List<PropertyMetadata> properties = vdb.getJAXBProperties(); if (properties!= null && !properties.isEmpty()) { - ModelNode propsNode = node.get(CHILDREN, PROPERTIES); + ModelNode propsNode = node.get(PROPERTIES); for (PropertyMetadata prop:properties) { propsNode.add(PropertyMetaDataMapper.INSTANCE.wrap(prop, new ModelNode())); } @@ -80,7 +81,7 @@ // MODELS Map<String, ModelMetaData> models = vdb.getModelMetaDatas(); if (models != null && !models.isEmpty()) { - ModelNode modelNodes = node.get(CHILDREN, MODELS); + ModelNode modelNodes = node.get(MODELS); for(ModelMetaData model:models.values()) { modelNodes.add(ModelMetadataMapper.INSTANCE.wrap(model, new ModelNode())); } @@ -89,7 +90,7 @@ // OVERRIDE_TRANSLATORS List<Translator> translators = vdb.getOverrideTranslators(); if (translators != null && !translators.isEmpty()) { - ModelNode translatorNodes = node.get(CHILDREN, OVERRIDE_TRANSLATORS); + ModelNode translatorNodes = node.get(OVERRIDE_TRANSLATORS); for (Translator translator:translators) { translatorNodes.add(VDBTranslatorMetaDataMapper.INSTANCE.wrap((VDBTranslatorMetaData)translator, new ModelNode())); } @@ -98,7 +99,7 @@ // DATA_POLICIES List<DataPolicy> policies = vdb.getDataPolicies(); if (policies != null && !policies.isEmpty()) { - ModelNode dataPoliciesNodes = node.get(CHILDREN, DATA_POLICIES); + ModelNode dataPoliciesNodes = node.get(DATA_POLICIES); for (DataPolicy policy:policies) { dataPoliciesNodes.add(DataPolicyMetadataMapper.INSTANCE.wrap((DataPolicyMetadata)policy, new ModelNode())); } @@ -126,16 +127,16 @@ if (node.has(URL)) { vdb.setUrl(node.get(URL).asString()); } - if(node.has(DESCRIPTION)) { - vdb.setDescription(node.get(DESCRIPTION).asString()); + if(node.has(VDB_DESCRIPTION)) { + vdb.setDescription(node.get(VDB_DESCRIPTION).asString()); } if (node.has(DYNAMIC)) { vdb.setDynamic(node.get(DYNAMIC).asBoolean()); } //PROPERTIES - if (node.get(CHILDREN, PROPERTIES).isDefined()) { - List<ModelNode> propNodes = node.get(CHILDREN, PROPERTIES).asList(); + if (node.get(PROPERTIES).isDefined()) { + List<ModelNode> propNodes = node.get(PROPERTIES).asList(); for (ModelNode propNode:propNodes) { PropertyMetadata prop = PropertyMetaDataMapper.INSTANCE.unwrap(propNode); if (prop != null) { @@ -145,8 +146,8 @@ } // MODELS - if (node.get(CHILDREN, MODELS).isDefined()) { - List<ModelNode> modelNodes = node.get(CHILDREN, MODELS).asList(); + if (node.get(MODELS).isDefined()) { + List<ModelNode> modelNodes = node.get(MODELS).asList(); for(ModelNode modelNode:modelNodes) { ModelMetaData model = ModelMetadataMapper.INSTANCE.unwrap(modelNode); if (model != null) { @@ -156,8 +157,8 @@ } // OVERRIDE_TRANSLATORS - if (node.get(CHILDREN, OVERRIDE_TRANSLATORS).isDefined()) { - List<ModelNode> translatorNodes = node.get(CHILDREN, OVERRIDE_TRANSLATORS).asList(); + if (node.get(OVERRIDE_TRANSLATORS).isDefined()) { + List<ModelNode> translatorNodes = node.get(OVERRIDE_TRANSLATORS).asList(); for (ModelNode translatorNode:translatorNodes) { VDBTranslatorMetaData translator = VDBTranslatorMetaDataMapper.INSTANCE.unwrap(translatorNode); if (translator != null) { @@ -167,8 +168,8 @@ } // DATA_POLICIES - if (node.get(CHILDREN, DATA_POLICIES).isDefined()) { - List<ModelNode> policiesNodes = node.get(CHILDREN, DATA_POLICIES).asList(); + if (node.get(DATA_POLICIES).isDefined()) { + List<ModelNode> policiesNodes = node.get(DATA_POLICIES).asList(); for (ModelNode policyNode:policiesNodes) { DataPolicyMetadata policy = DataPolicyMetadataMapper.INSTANCE.unwrap(policyNode); if (policy != null) { @@ -187,34 +188,39 @@ connectionsAllowed.add(ConnectionType.NONE.toString()); connectionsAllowed.add(ConnectionType.ANY.toString()); connectionsAllowed.add(ConnectionType.BY_VERSION.toString()); - addAttribute(node, CONNECTIONTYPE, ModelType.STRING, false).get(ALLOWED).set(connectionsAllowed); + addAttribute(node, CONNECTIONTYPE, ModelType.STRING, false); + node.get(CONNECTIONTYPE).get(ALLOWED).set(connectionsAllowed); ModelNode statusAllowed = new ModelNode(); statusAllowed.add(Status.ACTIVE.toString()); statusAllowed.add(Status.INACTIVE.toString()); - addAttribute(node, STATUS, ModelType.STRING, true).get(ALLOWED).set(statusAllowed); + addAttribute(node, STATUS, ModelType.STRING, true); + node.get(STATUS).get(ALLOWED).set(statusAllowed); addAttribute(node, VERSION, ModelType.INT, true); addAttribute(node, URL, ModelType.STRING, false); - addAttribute(node, DESCRIPTION, ModelType.STRING, false); + addAttribute(node, VDB_DESCRIPTION, ModelType.STRING, false); addAttribute(node, DYNAMIC, ModelType.BOOLEAN, false); - ModelNode props = node.get(CHILDREN, PROPERTIES); + ModelNode props = node.get(PROPERTIES); + props.get(TYPE).set(ModelType.LIST); props.get(DESCRIPTION).set(AdminPlugin.Util.getString(PROPERTIES+DOT_DESC)); - PropertyMetaDataMapper.INSTANCE.describe(props); + PropertyMetaDataMapper.INSTANCE.describe(props.get(VALUE_TYPE)); - ModelNode models = node.get(CHILDREN, MODELS); - ModelMetadataMapper.INSTANCE.describe(models); + ModelNode models = node.get( MODELS); + models.get(TYPE).set(ModelType.LIST); + ModelMetadataMapper.INSTANCE.describe(models.get(VALUE_TYPE)); models.get(DESCRIPTION).set(AdminPlugin.Util.getString(MODELS+DOT_DESC)); - models.get(MIN_OCCURS).set(1); - ModelNode translators = node.get(CHILDREN, OVERRIDE_TRANSLATORS); + ModelNode translators = node.get(OVERRIDE_TRANSLATORS); + translators.get(TYPE).set(ModelType.LIST); translators.get(DESCRIPTION).set(AdminPlugin.Util.getString(OVERRIDE_TRANSLATORS+DOT_DESC)); - VDBTranslatorMetaDataMapper.INSTANCE.describe(translators); + VDBTranslatorMetaDataMapper.INSTANCE.describe(translators.get(VALUE_TYPE)); - ModelNode dataPolicies = node.get(CHILDREN, DATA_POLICIES); + ModelNode dataPolicies = node.get(DATA_POLICIES); + dataPolicies.get(TYPE).set(ModelType.LIST); dataPolicies.get(DESCRIPTION).set(AdminPlugin.Util.getString(DATA_POLICIES+DOT_DESC)); - DataPolicyMetadataMapper.INSTANCE.describe(dataPolicies); + DataPolicyMetadataMapper.INSTANCE.describe(dataPolicies.get(VALUE_TYPE)); return node; } @@ -250,7 +256,7 @@ List<PropertyMetadata> properties = model.getJAXBProperties(); if (properties!= null && !properties.isEmpty()) { - ModelNode propsNode = node.get(CHILDREN, PROPERTIES); + ModelNode propsNode = node.get(PROPERTIES); for (PropertyMetadata prop:properties) { propsNode.add(PropertyMetaDataMapper.INSTANCE.wrap(prop, new ModelNode())); } @@ -258,7 +264,7 @@ List<SourceMappingMetadata> sources = model.getSourceMappings(); if (sources != null && !sources.isEmpty()) { - ModelNode sourceMappingNode = node.get(CHILDREN, SOURCE_MAPPINGS); + ModelNode sourceMappingNode = node.get(SOURCE_MAPPINGS); for(SourceMappingMetadata source:sources) { sourceMappingNode.add(SourceMappingMetadataMapper.INSTANCE.wrap(source, new ModelNode())); } @@ -266,7 +272,7 @@ List<ValidationError> errors = model.getErrors(); if (errors != null && !errors.isEmpty()) { - ModelNode errorsNode = node.get(CHILDREN, VALIDITY_ERRORS); + ModelNode errorsNode = node.get(VALIDITY_ERRORS); for (ValidationError error:errors) { errorsNode.add(ValidationErrorMapper.INSTANCE.wrap(error, new ModelNode())); } @@ -296,8 +302,8 @@ model.setPath(node.get(MODELPATH).asString()); } - if (node.get(CHILDREN, PROPERTIES).isDefined()) { - List<ModelNode> propNodes = node.get(CHILDREN, PROPERTIES).asList(); + if (node.get(PROPERTIES).isDefined()) { + List<ModelNode> propNodes = node.get(PROPERTIES).asList(); for (ModelNode propNode:propNodes) { PropertyMetadata prop = PropertyMetaDataMapper.INSTANCE.unwrap(propNode); if (prop != null) { @@ -306,8 +312,8 @@ } } - if (node.get(CHILDREN, SOURCE_MAPPINGS).isDefined()) { - List<ModelNode> sourceMappingNodes = node.get(CHILDREN, SOURCE_MAPPINGS).asList(); + if (node.get(SOURCE_MAPPINGS).isDefined()) { + List<ModelNode> sourceMappingNodes = node.get(SOURCE_MAPPINGS).asList(); for (ModelNode sourceMapping:sourceMappingNodes) { SourceMappingMetadata source = SourceMappingMetadataMapper.INSTANCE.unwrap(sourceMapping); if (source != null) { @@ -316,8 +322,8 @@ } } - if (node.get(CHILDREN, VALIDITY_ERRORS).isDefined()) { - List<ModelNode> errorNodes = node.get(CHILDREN, VALIDITY_ERRORS).asList(); + if (node.get(VALIDITY_ERRORS).isDefined()) { + List<ModelNode> errorNodes = node.get(VALIDITY_ERRORS).asList(); for(ModelNode errorNode:errorNodes) { ValidationError error = ValidationErrorMapper.INSTANCE.unwrap(errorNode); if (error != null) { @@ -334,24 +340,28 @@ modelTypes.add(Model.Type.VIRTUAL.toString()); modelTypes.add(Model.Type.FUNCTION.toString()); modelTypes.add(Model.Type.OTHER.toString()); - addAttribute(node, MODEL_NAME, ModelType.STRING, true).get(ALLOWED).set(modelTypes); + addAttribute(node, MODEL_NAME, ModelType.STRING, true); + node.get(MODEL_NAME).get(ALLOWED).set(modelTypes); addAttribute(node, DESCRIPTION, ModelType.STRING, false); addAttribute(node, VISIBLE, ModelType.BOOLEAN, false); addAttribute(node, MODEL_TYPE, ModelType.STRING, true); addAttribute(node, MODELPATH, ModelType.STRING, false); - ModelNode props = node.get(CHILDREN, PROPERTIES); + ModelNode props = node.get(PROPERTIES); + props.get(TYPE).set(ModelType.LIST); props.get(DESCRIPTION).set(AdminPlugin.Util.getString(PROPERTIES+DOT_DESC)); - PropertyMetaDataMapper.INSTANCE.describe(props); + PropertyMetaDataMapper.INSTANCE.describe(props.get(VALUE_TYPE)); - ModelNode source = node.get(CHILDREN, SOURCE_MAPPINGS); + ModelNode source = node.get(SOURCE_MAPPINGS); + source.get(TYPE).set(ModelType.LIST); source.get(DESCRIPTION).set(AdminPlugin.Util.getString(SOURCE_MAPPINGS+DOT_DESC)); - SourceMappingMetadataMapper.INSTANCE.describe(source); + SourceMappingMetadataMapper.INSTANCE.describe(source.get(VALUE_TYPE)); - ModelNode errors = node.get(CHILDREN, VALIDITY_ERRORS); + ModelNode errors = node.get(VALIDITY_ERRORS); + errors.get(TYPE).set(ModelType.LIST); errors.get(DESCRIPTION).set(AdminPlugin.Util.getString(VALIDITY_ERRORS+DOT_DESC)); - ValidationErrorMapper.INSTANCE.describe(errors); + ValidationErrorMapper.INSTANCE.describe(errors.get(VALUE_TYPE)); return node; } @@ -460,7 +470,7 @@ public static class VDBTranslatorMetaDataMapper implements MetadataMapper<VDBTranslatorMetaData>{ private static final String TRANSLATOR_NAME = "translator-name"; //$NON-NLS-1$ private static final String BASETYPE = "base-type"; //$NON-NLS-1$ - private static final String DESCRIPTION = "description"; //$NON-NLS-1$ + private static final String TRANSLATOR_DESCRIPTION = "translator-description"; //$NON-NLS-1$ private static final String PROPERTIES = "properties"; //$NON-NLS-1$ private static final String MODULE_NAME = "module-name"; //$NON-NLS-1$ @@ -477,7 +487,7 @@ node.get(BASETYPE).set(translator.getType()); } if (translator.getDescription() != null) { - node.get(DESCRIPTION).set(translator.getDescription()); + node.get(TRANSLATOR_DESCRIPTION).set(translator.getDescription()); } if (translator.getModuleName() != null) { @@ -486,7 +496,7 @@ List<PropertyMetadata> properties = translator.getJAXBProperties(); if (properties!= null && !properties.isEmpty()) { - ModelNode propsNode = node.get(CHILDREN, PROPERTIES); + ModelNode propsNode = node.get(PROPERTIES); for (PropertyMetadata prop:properties) { propsNode.add(PropertyMetaDataMapper.INSTANCE.wrap(prop, new ModelNode())); } @@ -505,15 +515,15 @@ if (node.has(BASETYPE)) { translator.setType(node.get(BASETYPE).asString()); } - if (node.has(DESCRIPTION)) { - translator.setDescription(node.get(DESCRIPTION).asString()); + if (node.has(TRANSLATOR_DESCRIPTION)) { + translator.setDescription(node.get(TRANSLATOR_DESCRIPTION).asString()); } if (node.has(MODULE_NAME)) { translator.setModuleName(node.get(MODULE_NAME).asString()); } - if (node.get(CHILDREN,PROPERTIES).isDefined()) { - List<ModelNode> propNodes = node.get(CHILDREN, PROPERTIES).asList(); + if (node.get(PROPERTIES).isDefined()) { + List<ModelNode> propNodes = node.get(PROPERTIES).asList(); for (ModelNode propNode:propNodes) { PropertyMetadata prop = PropertyMetaDataMapper.INSTANCE.unwrap(propNode); if (prop != null) { @@ -527,12 +537,13 @@ public ModelNode describe(ModelNode node) { addAttribute(node, TRANSLATOR_NAME, ModelType.STRING, true); addAttribute(node, BASETYPE, ModelType.STRING, true); - addAttribute(node, DESCRIPTION, ModelType.STRING, false); + addAttribute(node, TRANSLATOR_DESCRIPTION, ModelType.STRING, false); addAttribute(node, MODULE_NAME, ModelType.STRING, false); - ModelNode props = node.get(CHILDREN, PROPERTIES); + ModelNode props = node.get(PROPERTIES); + props.get(TYPE).set(ModelType.LIST); props.get(DESCRIPTION).set(AdminPlugin.Util.getString(PROPERTIES+DOT_DESC)); - PropertyMetaDataMapper.INSTANCE.describe(props); + PropertyMetaDataMapper.INSTANCE.describe(props.get(VALUE_TYPE)); return node; } } @@ -593,6 +604,7 @@ private static final String ALLOW_DELETE = "allow-delete"; //$NON-NLS-1$ private static final String ALLOW_EXECUTE = "allow-execute"; //$NON-NLS-1$ private static final String ALLOW_ALTER= "allow-alter"; //$NON-NLS-1$ + private static final String POLICY_DESCRIPTION = "policy-description"; //$NON-NLS-1$ public static DataPolicyMetadataMapper INSTANCE = new DataPolicyMetadataMapper(); @@ -603,7 +615,7 @@ node.get(POLICY_NAME).set(policy.getName()); if (policy.getDescription() != null) { - node.get(DESCRIPTION).set(policy.getDescription()); + node.get(POLICY_DESCRIPTION).set(policy.getDescription()); } if (policy.isAllowCreateTemporaryTables() != null) { node.get(ALLOW_CREATE_TEMP_TABLES).set(policy.isAllowCreateTemporaryTables()); @@ -613,7 +625,7 @@ //DATA_PERMISSIONS List<DataPolicy.DataPermission> permissions = policy.getPermissions(); if (permissions != null && !permissions.isEmpty()) { - ModelNode permissionNodes = node.get(CHILDREN, DATA_PERMISSIONS); + ModelNode permissionNodes = node.get(DATA_PERMISSIONS); for (DataPolicy.DataPermission dataPermission:permissions) { permissionNodes.add(PermissionMetaDataMapper.INSTANCE.wrap((PermissionMetaData)dataPermission, new ModelNode())); } @@ -621,7 +633,7 @@ //MAPPED_ROLE_NAMES if (policy.getMappedRoleNames() != null && !policy.getMappedRoleNames().isEmpty()) { - ModelNode mappedRoleNodes = node.get(CHILDREN, MAPPED_ROLE_NAMES); + ModelNode mappedRoleNodes = node.get(MAPPED_ROLE_NAMES); for (String role:policy.getMappedRoleNames()) { mappedRoleNodes.add(role); } @@ -637,8 +649,8 @@ if (node.has(POLICY_NAME)) { policy.setName(node.get(POLICY_NAME).asString()); } - if (node.has(DESCRIPTION)) { - policy.setDescription(node.get(DESCRIPTION).asString()); + if (node.has(POLICY_DESCRIPTION)) { + policy.setDescription(node.get(POLICY_DESCRIPTION).asString()); } if (node.has(ALLOW_CREATE_TEMP_TABLES)) { policy.setAllowCreateTemporaryTables(node.get(ALLOW_CREATE_TEMP_TABLES).asBoolean()); @@ -648,8 +660,8 @@ } //DATA_PERMISSIONS - if (node.get(CHILDREN, DATA_PERMISSIONS).isDefined()) { - List<ModelNode> permissionNodes = node.get(CHILDREN, DATA_PERMISSIONS).asList(); + if (node.get(DATA_PERMISSIONS).isDefined()) { + List<ModelNode> permissionNodes = node.get(DATA_PERMISSIONS).asList(); for (ModelNode permissionNode:permissionNodes) { PermissionMetaData permission = PermissionMetaDataMapper.INSTANCE.unwrap(permissionNode); if (permission != null) { @@ -659,8 +671,8 @@ } //MAPPED_ROLE_NAMES - if (node.get(CHILDREN, MAPPED_ROLE_NAMES).isDefined()) { - List<ModelNode> roleNameNodes = node.get(CHILDREN, MAPPED_ROLE_NAMES).asList(); + if (node.get(MAPPED_ROLE_NAMES).isDefined()) { + List<ModelNode> roleNameNodes = node.get(MAPPED_ROLE_NAMES).asList(); for (ModelNode roleNameNode:roleNameNodes) { policy.addMappedRoleName(roleNameNode.asString()); } @@ -670,36 +682,42 @@ public ModelNode describe(ModelNode node) { addAttribute(node, POLICY_NAME, ModelType.STRING, true); - addAttribute(node, DESCRIPTION, ModelType.STRING, false); + addAttribute(node, POLICY_DESCRIPTION, ModelType.STRING, false); addAttribute(node, ALLOW_CREATE_TEMP_TABLES, ModelType.BOOLEAN, false); addAttribute(node, ANY_AUTHENTICATED, ModelType.BOOLEAN, false); - ModelNode permissions = node.get(CHILDREN, DATA_PERMISSIONS); + ModelNode permissions = node.get(DATA_PERMISSIONS); + permissions.get(TYPE).set(ModelType.LIST); permissions.get(DESCRIPTION).set(AdminPlugin.Util.getString(DATA_PERMISSIONS+DOT_DESC)); - permissions.get(MIN_OCCURS).set(1); - ModelNode create = permissions.get(CHILDREN, ALLOW_CREATE); + ModelNode create = permissions.get(VALUE_TYPE, ALLOW_CREATE); create.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_CREATE+DOT_DESC)); + create.get(TYPE).set(ModelType.STRING); - ModelNode read = permissions.get(CHILDREN, ALLOW_READ); + ModelNode read = permissions.get(VALUE_TYPE, ALLOW_READ); read.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_READ+DOT_DESC)); + read.get(TYPE).set(ModelType.STRING); - ModelNode update = permissions.get(CHILDREN, ALLOW_UPDATE); + ModelNode update = permissions.get(VALUE_TYPE, ALLOW_UPDATE); update.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_UPDATE+DOT_DESC)); + update.get(TYPE).set(ModelType.STRING); - ModelNode delete = permissions.get(CHILDREN, ALLOW_DELETE); + ModelNode delete = permissions.get(VALUE_TYPE, ALLOW_DELETE); delete.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_DELETE+DOT_DESC)); + delete.get(TYPE).set(ModelType.STRING); - ModelNode execute = permissions.get(CHILDREN, ALLOW_EXECUTE); + ModelNode execute = permissions.get(VALUE_TYPE, ALLOW_EXECUTE); execute.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_EXECUTE+DOT_DESC)); + execute.get(TYPE).set(ModelType.STRING); - ModelNode alter = permissions.get(CHILDREN, ALLOW_ALTER); + ModelNode alter = permissions.get(VALUE_TYPE, ALLOW_ALTER); alter.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_ALTER+DOT_DESC)); + alter.get(TYPE).set(ModelType.STRING); - ModelNode roleNames = node.get(CHILDREN, MAPPED_ROLE_NAMES); + ModelNode roleNames = node.get(MAPPED_ROLE_NAMES); roleNames.get(TYPE).set(ModelType.LIST); roleNames.get(DESCRIPTION).set(AdminPlugin.Util.getString(MAPPED_ROLE_NAMES+DOT_DESC)); - roleNames.get("value-type").set(ModelType.STRING); //$NON-NLS-1$ + roleNames.get(VALUE_TYPE).set(ModelType.STRING); return node; } } @@ -1025,7 +1043,7 @@ public ModelNode wrap(WorkerPoolStatisticsMetadata stats, ModelNode node) { if (stats == null) return null; - + node.get(TYPE).set(ModelType.OBJECT); node.get(ACTIVE_THREADS).set(stats.getActiveThreads()); node.get(HIGHEST_ACTIVE_THREADS).set(stats.getHighestActiveThreads()); node.get(TOTAL_COMPLETED).set(stats.getTotalCompleted()); @@ -1067,17 +1085,15 @@ } } - private static final String CHILDREN = "children"; //$NON-NLS-1$ - private static final String ATTRIBUTES = "attributes"; //$NON-NLS-1$ private static final String DOT_DESC = ".describe"; //$NON-NLS-1$ private static final String TYPE = "type"; //$NON-NLS-1$ - private static final String MIN_OCCURS = "min-occurs"; //$NON-NLS-1$ private static final String REQUIRED = "required"; //$NON-NLS-1$ private static final String ALLOWED = "allowed"; //$NON-NLS-1$ + private static final String VALUE_TYPE = "value-type"; //$NON-NLS-1$ static ModelNode addAttribute(ModelNode node, String name, ModelType dataType, boolean required) { - node.get(ATTRIBUTES, name, TYPE).set(dataType); - node.get(ATTRIBUTES, name, DESCRIPTION).set(AdminPlugin.Util.getString(name+DOT_DESC)); - node.get(ATTRIBUTES, name, REQUIRED).set(required); + node.get(name, TYPE).set(dataType); + node.get(name, DESCRIPTION).set(AdminPlugin.Util.getString(name+DOT_DESC)); + node.get(name, REQUIRED).set(required); return node; } } Modified: trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties =================================================================== --- trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2011-12-01 18:19:11 UTC (rev 3714) @@ -15,6 +15,7 @@ source-name.describe=Source name for this model jndi-name.describe=Connection JNDI Name translator-name.describe=Name of the translator +translator-description.describe=Translator description error-path.describe=Path to the error in the Virtual Database severity.describe=Severity message.describe=Error message Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java =================================================================== --- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -57,7 +57,7 @@ return request; } - public static final String desc = "{\"attributes\" : {\n" + + public static final String desc = "{\n" + " \"execution-id\" : {\n" + " \"type\" : {\n" + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + @@ -121,7 +121,7 @@ " \"description\" : \"Thread state\",\n" + " \"required\" : true\n" + " }\n" + - "}}"; + "}"; @Test public void testDescribe() { assertEquals(desc, VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode()).toJSONString(false)); } Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java =================================================================== --- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -51,7 +51,7 @@ } - private static final String describe = "{\"attributes\" : {\n" + + private static final String describe = "{\n" + " \"application-name\" : {\n" + " \"type\" : {\n" + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + @@ -122,7 +122,7 @@ " \"description\" : \"Security domain that session used for login\",\n" + " \"required\" : false\n" + " }\n" + - "}}"; + "}"; @Test public void testDescribe() { ModelNode n = VDBMetadataMapper.SessionMetadataMapper.INSTANCE.describe(new ModelNode()); Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java =================================================================== --- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -48,7 +48,7 @@ assertEquals(tm.getScope(), tm1.getScope()); } - private static final String describe = "{\"attributes\" : {\n" + + private static final String describe = "{\n" + " \"session-id\" : {\n" + " \"type\" : {\n" + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + @@ -77,7 +77,7 @@ " \"description\" : \"Transaction Identifier (XID)\",\n" + " \"required\" : true\n" + " }\n" + - "}}"; + "}"; @Test public void testDescribe() { ModelNode n = VDBMetadataMapper.TransactionMetadataMapper.INSTANCE.describe(new ModelNode()); Modified: trunk/admin/src/test/resources/vdb-describe.txt =================================================================== --- trunk/admin/src/test/resources/vdb-describe.txt 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/admin/src/test/resources/vdb-describe.txt 2011-12-01 18:19:11 UTC (rev 3714) @@ -1,234 +1,253 @@ { - "attributes" : { - "vdb-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "The Virtual Database Name", - "required" : true + "vdb-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "connection-type" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Allowable Connections: 1) NONE - disallow new connections 2) BY VERSION - allow connections only if the version is specified or if this is the earliest 'BY VERSION' vdb and there are no vdbs marked as 'ANY' 3) ANY - allow connections with or without a version specified. If multiple versions of same VDB are deployed, connect to one specified with ANY, or if there are multiple VDBs with ANY then connect to the latest version with ANY ", - "required" : false + "description" : "The Virtual Database Name", + "required" : true + }, + "connection-type" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "status" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "The Virtual Database Status", - "required" : true + "description" : "Allowable Connections: 1) NONE - disallow new connections 2) BY VERSION - allow connections only if the version is specified or if this is the earliest 'BY VERSION' vdb and there are no vdbs marked as 'ANY' 3) ANY - allow connections with or without a version specified. If multiple versions of same VDB are deployed, connect to one specified with ANY, or if there are multiple VDBs with ANY then connect to the latest version with ANY ", + "required" : false, + "allowed" : [ + "NONE", + "ANY", + "BY_VERSION" + ] + }, + "status" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "vdb-version" : { - "type" : { - "TYPE_MODEL_VALUE" : "INT" - }, - "description" : "The Virtual Database Version", - "required" : true + "description" : "The Virtual Database Status", + "required" : true, + "allowed" : [ + "ACTIVE", + "INACTIVE" + ] + }, + "vdb-version" : { + "type" : { + "TYPE_MODEL_VALUE" : "INT" }, - "url" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "The Virtual Database URL", - "required" : false + "description" : "The Virtual Database Version", + "required" : true + }, + "url" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "description" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Description", - "required" : false + "description" : "The Virtual Database URL", + "required" : false + }, + "vdb-description" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "dynamic" : { - "type" : { - "TYPE_MODEL_VALUE" : "BOOLEAN" + "description" : "<Missing message for key \"vdb-description.describe\" in: org.teiid.adminapi.i18n>", + "required" : false + }, + "dynamic" : { + "type" : { + "TYPE_MODEL_VALUE" : "BOOLEAN" + }, + "description" : "Dynamic Virtual Database", + "required" : false + }, + "properties" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, + "description" : "properties", + "value-type" : { + "property-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Name", + "required" : true }, - "description" : "Dynamic Virtual Database", - "required" : false + "property-value" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Property value", + "required" : true + } } }, - "allowed" : [ - "ACTIVE", - "INACTIVE" - ], - "children" : { - "properties" : { - "description" : "properties", - "attributes" : { - "property-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Name", - "required" : true - }, - "property-value" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Property value", - "required" : true - } - } + "models" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" }, - "models" : { - "attributes" : { - "model-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Name of the model", - "required" : true + "value-type" : { + "model-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "description" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Description", - "required" : false + "description" : "Name of the model", + "required" : true, + "allowed" : [ + "PHYSICAL", + "VIRTUAL", + "FUNCTION", + "OTHER" + ] + }, + "description" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "visible" : { - "type" : { - "TYPE_MODEL_VALUE" : "BOOLEAN" - }, - "description" : "Visibility of the model", - "required" : false + "description" : "Description", + "required" : false + }, + "visible" : { + "type" : { + "TYPE_MODEL_VALUE" : "BOOLEAN" }, - "model-type" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Type of the Model(PHYSICAL, VIRTUAL, FUNCTION, OTHER)", - "required" : true + "description" : "Visibility of the model", + "required" : false + }, + "model-type" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "model-path" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" + "description" : "Type of the Model(PHYSICAL, VIRTUAL, FUNCTION, OTHER)", + "required" : true + }, + "model-path" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Path to model file inside the archive", + "required" : false + }, + "properties" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, + "description" : "properties", + "value-type" : { + "property-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Name", + "required" : true }, - "description" : "Path to model file inside the archive", - "required" : false + "property-value" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Property value", + "required" : true + } } }, - "allowed" : [ - "PHYSICAL", - "VIRTUAL", - "FUNCTION", - "OTHER" - ], - "children" : { - "properties" : { - "description" : "properties", - "attributes" : { - "property-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Name", - "required" : true - }, - "property-value" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Property value", - "required" : true - } - } + "source-mappings" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" }, - "source-mappings" : { - "description" : "Model to source mapping", - "attributes" : { - "source-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Source name for this model", - "required" : true + "description" : "Model to source mapping", + "value-type" : { + "source-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "jndi-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Connection JNDI Name", - "required" : true + "description" : "Source name for this model", + "required" : true + }, + "jndi-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "translator-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Name of the translator", - "required" : true - } + "description" : "Connection JNDI Name", + "required" : true + }, + "translator-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Name of the translator", + "required" : true } + } + }, + "validity-errors" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" }, - "validity-errors" : { - "description" : "Model validation errors", - "attributes" : { - "error-path" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Path to the error in the Virtual Database", - "required" : false + "description" : "Model validation errors", + "value-type" : { + "error-path" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "severity" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Severity", - "required" : true + "description" : "Path to the error in the Virtual Database", + "required" : false + }, + "severity" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "message" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Error message", - "required" : true - } + "description" : "Severity", + "required" : true + }, + "message" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Error message", + "required" : true } } - }, - "description" : "Models inside a virtual database", - "min-occurs" : 1 + } }, - "override-translators" : { - "description" : "Overridden translators for the Virtual Database", - "attributes" : { - "translator-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Name of the translator", - "required" : true + "description" : "Models inside a virtual database" + }, + "override-translators" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, + "description" : "Overridden translators for the Virtual Database", + "value-type" : { + "translator-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "base-type" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Translator Base Type", - "required" : true + "description" : "Name of the translator", + "required" : true + }, + "base-type" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "description" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Description", - "required" : false + "description" : "Translator Base Type", + "required" : true + }, + "translator-description" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "module-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Translator's Module name", - "required" : false - } + "description" : "Translator description", + "required" : false }, - "children" : {"properties" : { + "module-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + }, + "description" : "Translator's Module name", + "required" : false + }, + "properties" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, "description" : "properties", - "attributes" : { + "value-type" : { "property-name" : { "type" : { "TYPE_MODEL_VALUE" : "STRING" @@ -244,62 +263,95 @@ "required" : true } } - }} + } + } + }, + "data-policies" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" }, - "data-policies" : { - "description" : "Data access policies defined for the Virtual Database", - "attributes" : { - "policy-name" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Resource Name, for which permission defined", - "required" : true + "description" : "Data access policies defined for the Virtual Database", + "value-type" : { + "policy-name" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "description" : { - "type" : { - "TYPE_MODEL_VALUE" : "STRING" - }, - "description" : "Description", - "required" : false + "description" : "Resource Name, for which permission defined", + "required" : true + }, + "policy-description" : { + "type" : { + "TYPE_MODEL_VALUE" : "STRING" }, - "allow-create-temp-tables" : { - "type" : { - "TYPE_MODEL_VALUE" : "BOOLEAN" - }, - "description" : "Allows create of temporary table", - "required" : false + "description" : "<Missing message for key \"policy-description.describe\" in: org.teiid.adminapi.i18n>", + "required" : false + }, + "allow-create-temp-tables" : { + "type" : { + "TYPE_MODEL_VALUE" : "BOOLEAN" }, - "any-authenticated" : { - "type" : { - "TYPE_MODEL_VALUE" : "BOOLEAN" - }, - "description" : "Indicates if the role is mapped to any authenticated user", - "required" : false - } + "description" : "Allows create of temporary table", + "required" : false }, - "children" : { - "data-permissions" : { - "description" : "Permissions defined for data access", - "min-occurs" : 1, - "children" : { - "allow-create" : {"description" : "create allowed"}, - "allow-read" : {"description" : "read allowed"}, - "allow-update" : {"description" : "update allowed"}, - "allow-delete" : {"description" : "delete allowed"}, - "allow-execute" : {"description" : "execute allowed"}, - "allow-alter" : {"description" : "alter allowed"} - } + "any-authenticated" : { + "type" : { + "TYPE_MODEL_VALUE" : "BOOLEAN" }, - "mapped-role-names" : { - "type" : { - "TYPE_MODEL_VALUE" : "LIST" + "description" : "Indicates if the role is mapped to any authenticated user", + "required" : false + }, + "data-permissions" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, + "description" : "Permissions defined for data access", + "value-type" : { + "allow-create" : { + "description" : "create allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } }, - "description" : "Policy name to role name mapping", - "value-type" : { - "TYPE_MODEL_VALUE" : "STRING" + "allow-read" : { + "description" : "read allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } + }, + "allow-update" : { + "description" : "update allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } + }, + "allow-delete" : { + "description" : "delete allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } + }, + "allow-execute" : { + "description" : "execute allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } + }, + "allow-alter" : { + "description" : "alter allowed", + "type" : { + "TYPE_MODEL_VALUE" : "STRING" + } } } + }, + "mapped-role-names" : { + "type" : { + "TYPE_MODEL_VALUE" : "LIST" + }, + "description" : "Policy name to role name mapping", + "value-type" : { + "TYPE_MODEL_VALUE" : "STRING" + } } } } Modified: trunk/build/assembly/jboss-as7/dist.xml =================================================================== --- trunk/build/assembly/jboss-as7/dist.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/build/assembly/jboss-as7/dist.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -41,20 +41,7 @@ <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> - -  - + </fileSets> <files> @@ -167,6 +154,19 @@ </binaries> </moduleSet> +  + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.jboss.teiid:teiid-admin</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + <outputDirectory>modules/org/jboss/teiid/main</outputDirectory> + </binaries> + </moduleSet> +  <moduleSet> <includeSubModules>true</includeSubModules> Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -1,30 +1,11 @@ - +<?xml version='1.0' encoding='UTF-8'?> <domain xmlns="urn:jboss:domain:1.1"> <extensions> <extension module="org.jboss.as.clustering.infinispan"/> <extension module="org.jboss.as.clustering.jgroups"/> + <extension module="org.jboss.as.cmp"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> @@ -34,6 +15,7 @@ <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.mail"/> <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.modcluster"/> <extension module="org.jboss.as.naming"/> @@ -45,7 +27,7 @@ <extension module="org.jboss.as.threads"/> <extension module="org.jboss.as.transactions"/> <extension module="org.jboss.as.web"/> - <extension module="org.jboss.as.webservices" /> + <extension module="org.jboss.as.webservices"/> <extension module="org.jboss.as.weld"/> </extensions> @@ -63,7 +45,6 @@ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> </console-handler> - <periodic-rotating-file-handler name="FILE"> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> @@ -71,7 +52,6 @@ <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> </periodic-rotating-file-handler> - <logger category="com.arjuna"> <level name="WARN"/> </logger> @@ -84,11 +64,9 @@ <logger category="jacorb"> <level name="WARN"/> </logger> -  <logger category="jacorb.config"> <level name="ERROR"/> </logger> - <root-logger> <level name="INFO"/> <handlers> @@ -116,33 +94,7 @@ </datasources> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.2" > - - <remote connector-ref="remoting-connector" thread-pool-name="default" /> - <async thread-pool-name="default" /> - - <timer-service thread-pool-name="default" > - <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> - </timer-service> - -  - <pools> - <bean-instance-pools> - <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - - <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - </bean-instance-pools> - </pools> - -  - <mdb> - <resource-adapter-ref resource-adapter-name="hornetq-ra"/> - <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> - </mdb> - -  + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> <session-bean> <stateless> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> @@ -150,12 +102,26 @@ <stateful default-access-timeout="5000"/> <singleton default-access-timeout="5000"/> </session-bean> - + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <pools> + <bean-instance-pools> + <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + </bean-instance-pools> + </pools> + <async thread-pool-name="default"/> + <timer-service thread-pool-name="default"> + <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> + </timer-service> + <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> - <thread-pool name="default" max-threads="10" keepalive-time="100" /> + <thread-pool name="default" max-threads="10" keepalive-time="100"/> </thread-pools> </subsystem> - <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="cluster"> + <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster"> <cache-container name="cluster" default-cache="default"> <alias>ha-partition</alias> <replicated-cache name="default" mode="SYNC" batching="true"> @@ -203,7 +169,7 @@ </subsystem> <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jca:1.0"> + <subsystem xmlns="urn:jboss:domain:jca:1.1"> <archive-validation enabled="true"/> <bean-validation enabled="true"/> <default-workmanager> @@ -260,20 +226,22 @@ <protocol type="pbcast.FLUSH"/> </stack> </subsystem> - <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"> - <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> - </subsystem> + <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"/> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> <jpa default-datasource=""/> </subsystem> + <subsystem xmlns="urn:jboss:domain:mail:1.0"> + <mail-session jndi-name="java:jboss/mail/Default"> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> + </mail-session> + </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:1.1"> <hornetq-server> +  + <persistence-enabled>false</persistence-enabled>  <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> - <journal-type>NIO</journal-type> -  - <persistence-enabled>false</persistence-enabled> <connectors> <netty-connector name="netty" socket-binding="messaging"/> @@ -294,10 +262,10 @@ <security-settings> <security-setting match="#"> + <permission type="send" roles="guest"/> + <permission type="consume" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> </security-setting> </security-settings> @@ -313,7 +281,6 @@ </address-setting> </address-settings> -  <jms-connection-factories> <connection-factory name="InVmConnectionFactory"> <connectors> @@ -355,7 +322,7 @@ <subsystem xmlns="urn:jboss:domain:modcluster:1.0"> <mod-cluster-config advertise-socket="modcluster"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:naming:1.1"/> <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> <property name="manager.root" value="jboss-osgi"/> @@ -394,12 +361,12 @@ <capability name="org.jboss.osgi.xerces" startlevel="3"/> </capabilities> </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0"> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> <connector name="remoting-connector" socket-binding="remoting"/> </subsystem> <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> + <subsystem xmlns="urn:jboss:domain:security:1.1"> <security-domains> <security-domain name="other"> <authentication> @@ -457,33 +424,47 @@ <max-threads count="2" per-cpu="2" /> </queueless-thread-pool> </subsystem> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <core-environment> <process-id> <uuid /> </process-id> </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host"> - <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/> + <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <virtual-server name="default-host" enable-welcome-root="true"> - <alias name="localhost" /> - <alias name="example.com" /> + <alias name="localhost"/> + <alias name="example.com"/> </virtual-server> </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.0"> + <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> <modify-wsdl-address>true</modify-wsdl-address> <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>  + <endpoint-config> + <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> + </endpoint-config> + <endpoint-config> + <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> + <jaxwsconfig:pre-handler-chains> + <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> + <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>RecordingHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </jaxwsconfig:pre-handler-chains> + </endpoint-config> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> </profile> - </profiles>  +<?xml version='1.0' encoding='UTF-8'?> -<host xmlns="urn:jboss:domain:1.1" - name="master"> +<host name="master" xmlns="urn:jboss:domain:1.1"> <management> <security-realms> @@ -73,16 +52,14 @@ --> </jvm> </server> - <server name="server-two" group="main-server-group" auto-start="true">  <socket-binding-group ref="ha-sockets" port-offset="150"/> <jvm name="default"> - <heap size="512m" max-size="1024m"/> + <heap size="64m" max-size="256m"/> </jvm> </server> - <server name="server-three" group="main-server-group" auto-start="false">  Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/client/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/client/main/module.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/client/main/module.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -10,5 +10,7 @@ <module name="org.jboss.teiid.common-core" /> <module name="javax.transaction.api"/> <module name="javax.api"/> + <module name="sun.jdk"/> + <module name="org.jboss.modules"/> </dependencies> </module> \ No newline at end of file Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -1,43 +1,19 @@ - +<?xml version='1.0' encoding='UTF-8'?> <server xmlns="urn:jboss:domain:1.1"> <extensions> <extension module="org.jboss.as.clustering.infinispan"/> - <extension module="org.jboss.as.cmp"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> - <extension module="org.jboss.as.jacorb"/> - <extension module="org.jboss.as.jaxr"/> <extension module="org.jboss.as.jaxrs"/> <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> <extension module="org.jboss.as.mail"/> - <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> <extension module="org.jboss.as.pojo"/> @@ -78,7 +54,6 @@ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> </console-handler> - <periodic-rotating-file-handler name="FILE"> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> @@ -87,7 +62,6 @@ <suffix value=".yyyy-MM-dd"/> <append value="true"/> </periodic-rotating-file-handler> - <logger category="com.arjuna"> <level name="WARN"/> </logger> @@ -100,11 +74,9 @@ <logger category="jacorb"> <level name="WARN"/> </logger> -  <logger category="jacorb.config"> <level name="ERROR"/> </logger> - <root-logger> <level name="INFO"/> <handlers> @@ -113,7 +85,6 @@ </handlers> </root-logger> </subsystem> - <subsystem xmlns="urn:jboss:domain:cmp:1.0"/> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" @@ -126,78 +97,18 @@ <password>sa</password> </security> </datasource> - <datasource jndi-name="java:/postgres-ds" pool-name="PostgreDS"> - <connection-url>jdbc:postgresql://127.0.0.1:5432/txns</connection-url> - <driver>postgresql</driver> - <pool> - <prefill>false</prefill> - <use-strict-min>false</use-strict-min> - <flush-strategy>FailingConnectionOnly</flush-strategy> - </pool> - <security> - <user-name>rareddy</user-name> - <password>mm</password> - </security> - </datasource> - <datasource jndi-name="java:/mysql-ds" pool-name="mysqlDS"> - <connection-url>jdbc:mysql://localhost:3306/txns</connection-url> - <driver>mysql</driver> - <pool> - <prefill>false</prefill> - <use-strict-min>false</use-strict-min> - <flush-strategy>FailingConnectionOnly</flush-strategy> - </pool> - <security> - <user-name>rareddy</user-name> - <password>mm</password> - </security> - </datasource> <drivers> <driver name="h2" module="com.h2database.h2"> <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> </driver> - <driver name="mysql" module="com.mysql"> - <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> - </driver> - <driver name="oracle" module="com.oracle"> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - </driver> - <driver name="com.mysql" module="com.mysql"/> - <driver name="postgresql" module="com.mysql"/> </drivers> </datasources> </subsystem> <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:ee:1.0" /> - <subsystem xmlns="urn:jboss:domain:ejb3:1.2" > - - <remote connector-ref="remoting-connector" thread-pool-name="default" /> - <async thread-pool-name="default" /> - - <timer-service thread-pool-name="default" > - <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> - </timer-service> - -  - <pools> - <bean-instance-pools> - <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - - <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - </bean-instance-pools> - </pools> - -  - <mdb> - <resource-adapter-ref resource-adapter-name="hornetq-ra"/> - <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> - </mdb> - -  + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> <session-bean> <stateless> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> @@ -205,12 +116,26 @@ <stateful default-access-timeout="5000"/> <singleton default-access-timeout="5000"/> </session-bean> - + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <pools> + <bean-instance-pools> + <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + </bean-instance-pools> + </pools> + <async thread-pool-name="default"/> + <timer-service thread-pool-name="default"> + <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> + </timer-service> + <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> - <thread-pool name="default" max-threads="10" keepalive-time="100" /> + <thread-pool name="default" max-threads="10" keepalive-time="100"/> </thread-pools> </subsystem> - <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate"> + <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate"> <cache-container name="hibernate" default-cache="local-query"> <local-cache name="entity"> <eviction strategy="LRU" max-entries="10000"/> @@ -231,12 +156,8 @@ </local-cache> </cache-container> </subsystem> - <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/> - <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> - <datasource jndi-name="java:jboss/datasources/ExampleDS"/> - </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jca:1.0"> + <subsystem xmlns="urn:jboss:domain:jca:1.1"> <archive-validation enabled="false"/> <bean-validation enabled="false"/> <default-workmanager> @@ -255,103 +176,16 @@ </default-workmanager> </subsystem> <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> - <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"> - <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> - </subsystem> + <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"/> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> <jpa default-datasource=""/> </subsystem> <subsystem xmlns="urn:jboss:domain:mail:1.0"> <mail-session jndi-name="java:jboss/mail/Default"> - <smtp-server address="localhost" port="25"/> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> </mail-session> </subsystem> - <subsystem xmlns="urn:jboss:domain:messaging:1.1"> - <hornetq-server> -  - <journal-file-size>102400</journal-file-size> - <journal-min-files>2</journal-min-files> -  - <persistence-enabled>false</persistence-enabled> - - <connectors> - <netty-connector name="netty" socket-binding="messaging-client"/> - <netty-connector name="netty-throughput" socket-binding="messaging-throughput-client"> - <param key="batch-delay" value="50"/> - </netty-connector> - <in-vm-connector name="in-vm" server-id="0"/> - </connectors> - - <acceptors> - <netty-acceptor name="netty" socket-binding="messaging"/> - <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput"> - <param key="batch-delay" value="50"/> - <param key="direct-deliver" value="false"/> - </netty-acceptor> - <in-vm-acceptor name="in-vm" server-id="0"/> - </acceptors> - - <security-settings> - <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - - <address-settings> -  - <address-setting match="#"> - <dead-letter-address>jms.queue.DLQ</dead-letter-address> - <expiry-address>jms.queue.ExpiryQueue</expiry-address> - <redelivery-delay>0</redelivery-delay> - <max-size-bytes>10485760</max-size-bytes> - <message-counter-history-day-limit>10</message-counter-history-day-limit> - <address-full-policy>BLOCK</address-full-policy> - </address-setting> - </address-settings> - -  - <jms-connection-factories> - <connection-factory name="InVmConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="java:/ConnectionFactory"/> - </entries> - </connection-factory> - <connection-factory name="RemoteConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="RemoteConnectionFactory"/> - </entries> - </connection-factory> - <pooled-connection-factory name="hornetq-ra"> - <transaction mode="xa"/> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="java:/JmsXA"/> - </entries> - </pooled-connection-factory> - </jms-connection-factories> - - <jms-destinations> - <jms-queue name="testQueue"> - <entry name="queue/test"/> - </jms-queue> - <jms-topic name="testTopic"> - <entry name="topic/test"/> - </jms-topic> - </jms-destinations> - </hornetq-server> - </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:naming:1.1"/> <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> <property name="manager.root" value="jboss-osgi"/> @@ -390,30 +224,13 @@ <capability name="org.jboss.osgi.xerces" startlevel="3"/> </capabilities> </subsystem> - <subsystem xmlns="urn:jboss:domain:pojo:1.0" /> - <subsystem xmlns="urn:jboss:domain:remoting:1.0"> + <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> <connector name="remoting-connector" socket-binding="remoting"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"> - <resource-adapters> - <resource-adapter> - <archive>teiid-connector-file.rar</archive> - <transaction-support>NoTransaction</transaction-support> - <connection-definitions> - <connection-definition class-name="org.teiid.resource.adapter.file.FileManagedConnectionFactory" - jndi-name="java:/fileDS" - enabled="true" - use-java-context="true" - pool-name="teiid-file-ds"> - <config-property name="ParentDirectory">/home/rareddy/testing/</config-property> - <config-property name="AllowParentPaths">true</config-property> - </connection-definition> - </connection-definitions> - </resource-adapter> - </resource-adapters> - </subsystem> + <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> + <subsystem xmlns="urn:jboss:domain:security:1.1"> <security-domains> <security-domain name="other" cache-type="default"> <authentication> @@ -490,43 +307,42 @@ </queueless-thread-pool> </subsystem> <subsystem xmlns="urn:jboss:domain:transactions:1.1"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <core-environment> <process-id> <uuid/> </process-id> </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host"> - <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host"> + <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <virtual-server name="default-host" enable-welcome-root="true"> <alias name="localhost"/> <alias name="example.com"/> </virtual-server> </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.0"> + <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> <modify-wsdl-address>true</modify-wsdl-address> <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>  - <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0"> - <ws:config-name>Standard-Endpoint-Config</ws:config-name> + <endpoint-config> + <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> </endpoint-config> - <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0"> - <ws:config-name>Recording-Endpoint-Config</ws:config-name> - <ws:pre-handler-chains> - <handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> - <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM - </protocol-bindings> - <handler> - <handler-name>RecordingHandler</handler-name> - <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class> - </handler> - </handler-chain> - </ws:pre-handler-chains> + <endpoint-config> + <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> + <jaxwsconfig:pre-handler-chains> + <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> + <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>RecordingHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </jaxwsconfig:pre-handler-chains> </endpoint-config> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> @@ -537,7 +353,7 @@ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/> </interface> <interface name="public"> - <inet-address value="${jboss.bind.address:127.0.0.1}"/> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> </interface> </interfaces> @@ -557,13 +373,10 @@ <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> <socket-binding name="teiid-jdbc" port="31000"/> - <socket-binding name="teiid-odbc" port="35432"/> - <outbound-socket-binding name="messaging-client"> - <local-destination socket-binding-ref="messaging"/> + <socket-binding name="teiid-odbc" port="35432"/> + <outbound-socket-binding name="mail-smtp"> + <remote-destination host="localhost" port="25"/> </outbound-socket-binding> - <outbound-socket-binding name="messaging-throughput-client"> - <local-destination socket-binding-ref="messaging-throughput"/> - </outbound-socket-binding> </socket-binding-group> </server> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/client/pom.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -20,5 +20,10 @@ <artifactId>teiid-common-core</artifactId> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.jboss.modules</groupId> + <artifactId>jboss-modules</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -26,6 +26,9 @@ import java.util.Arrays; import java.util.Properties; +import org.jboss.modules.Module; +import org.jboss.modules.ModuleIdentifier; +import org.jboss.modules.ModuleLoadException; import org.teiid.core.TeiidException; import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.PropertiesUtils; @@ -62,9 +65,19 @@ } } - protected ServerConnection createServerConnection(Properties info) - throws TeiidException { - return (ServerConnection)ReflectionHelper.create("org.teiid.transport.LocalServerConnection", Arrays.asList(info, PropertiesUtils.getBooleanProperty(info, USE_CALLING_THREAD, true)), Thread.currentThread().getContextClassLoader()); //$NON-NLS-1$ + protected ServerConnection createServerConnection(Properties info) throws TeiidException { + ClassLoader tccl = Thread.currentThread().getContextClassLoader(); + try { + try { + final Module module = Module.getCallerModuleLoader().loadModule(ModuleIdentifier.create("org.jboss.teiid")); //$NON-NLS-1$ + Thread.currentThread().setContextClassLoader(module.getClassLoader()); + } catch (ModuleLoadException e) { + Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader()); + } + return (ServerConnection)ReflectionHelper.create("org.teiid.transport.LocalServerConnection", Arrays.asList(info, PropertiesUtils.getBooleanProperty(info, USE_CALLING_THREAD, true)), Thread.currentThread().getContextClassLoader()); //$NON-NLS-1$ + } finally { + Thread.currentThread().setContextClassLoader(tccl); + } } } Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666 Modified: trunk/connectors/translator-hive/pom.xml =================================================================== --- trunk/connectors/translator-hive/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/connectors/translator-hive/pom.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -25,13 +25,13 @@ <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>translator-jdbc</artifactId> - <version>${version}</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>translator-jdbc</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/pom.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -37,6 +37,7 @@ <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-admin</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -62,22 +63,34 @@ <artifactId>jta</artifactId> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-security</artifactId> - <scope>provided</scope> + <scope>provided</scope> </dependency>  <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-connector</artifactId> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-server</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> <artifactId>jboss-as-security</artifactId> <scope>provided</scope> </dependency> @@ -108,12 +121,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <scope>test</scope> - </dependency> - </dependencies> </project> Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/BaseOperationHandler.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/BaseOperationHandler.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/BaseOperationHandler.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -24,6 +24,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_NAME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; import java.util.Locale; import java.util.ResourceBundle; @@ -38,6 +39,7 @@ public abstract class BaseOperationHandler<T> implements DescriptionProvider, OperationStepHandler { private static final String DESCRIBE = ".describe"; //$NON-NLS-1$ + private static final String REPLY = ".reply"; //$NON-NLS-1$ protected static final String MISSING = ".missing"; //$NON-NLS-1$ private String operationName; @@ -86,14 +88,14 @@ final ModelNode operation = new ModelNode(); operation.get(OPERATION_NAME).set(this.operationName); operation.get(DESCRIPTION).set(bundle.getString(name()+DESCRIBE)); + + ModelNode reply = operation.get(REPLY_PROPERTIES); + reply.get(DESCRIPTION).set(bundle.getString(name()+REPLY)); + describeParameters(operation, bundle); return operation; } -// protected String getReplyName() { -// return name()+".reply"+DESCRIBE; //$NON-NLS-1$ -// } - protected String getParameterDescription(ResourceBundle bundle, String paramName) { return bundle.getString(name()+"."+paramName+DESCRIBE); //$NON-NLS-1$ } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/BufferManagerService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/BufferManagerService.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/BufferManagerService.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -33,25 +33,24 @@ class BufferManagerService implements Service<BufferService>, BufferService { - private BufferServiceImpl bufferMgr; - private ObjectReplicator replicator; + private BufferServiceImpl bufferService; public final InjectedValue<String> pathInjector = new InjectedValue<String>(); + public final InjectedValue<ObjectReplicator> replicatorInjector = new InjectedValue<ObjectReplicator>(); private BufferManager manager; - public BufferManagerService(BufferServiceImpl buffer, ObjectReplicator replicator) { - this.bufferMgr = buffer; - this.replicator = replicator; + public BufferManagerService(BufferServiceImpl buffer) { + this.bufferService = buffer; } @Override public void start(StartContext context) throws StartException { - bufferMgr.setDiskDirectory(pathInjector.getValue()); - bufferMgr.start(); - manager = bufferMgr.getBufferManager(); - if (replicator != null) { + bufferService.setDiskDirectory(pathInjector.getValue()); + bufferService.start(); + manager = bufferService.getBufferManager(); + if (replicatorInjector.getValue() != null) { try { //use a mux name that will not conflict with any vdb - manager = this.replicator.replicate("$BM$", BufferManager.class, this.manager, 0); //$NON-NLS-1$ + manager = this.replicatorInjector.getValue().replicate("$BM$", BufferManager.class, this.manager, 0); //$NON-NLS-1$ } catch (Exception e) { throw new StartException(e); } @@ -60,9 +59,9 @@ @Override public void stop(StopContext context) { - bufferMgr.stop(); - if (this.replicator != null) { - this.replicator.stop(bufferMgr); + bufferService.stop(); + if (this.replicatorInjector.getValue() != null) { + this.replicatorInjector.getValue().stop(bufferService); } } @@ -73,7 +72,7 @@ @Override public BufferService getValue() throws IllegalStateException,IllegalArgumentException { - return this.bufferMgr; + return this.bufferService; } } Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java (rev 0) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.jboss; + +import org.jboss.msc.service.Service; +import org.jboss.msc.service.StartContext; +import org.jboss.msc.service.StartException; +import org.jboss.msc.service.StopContext; +import org.jboss.msc.value.InjectedValue; +import org.teiid.dqp.internal.process.SessionAwareCache; +import org.teiid.dqp.service.BufferService; + +class CacheService<T> implements Service<SessionAwareCache<T>> { + private SessionAwareCache<T> cache; + public final InjectedValue<BufferService> bufferMgrInjector = new InjectedValue<BufferService>(); + + public CacheService(SessionAwareCache<T> t){ + this.cache = t; + } + + @Override + public void start(StartContext context) throws StartException { + this.cache.setBufferManager(this.bufferMgrInjector.getValue().getBufferManager()); + } + + @Override + public void stop(StopContext context) { + } + + @Override + public SessionAwareCache<T> getValue() throws IllegalStateException, IllegalArgumentException { + return this.cache; + } +} Property changes on: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -196,7 +196,7 @@ node.get(type, name, TYPE).set(this.modelType); node.get(type, name, DESCRIPTION).set(getDescription(bundle)); node.get(type, name, REQUIRED).set(this.required); - node.get(type, name, MAX_OCCURS).set(1); + //node.get(type, name, MAX_OCCURS).set(1); if (this.defaultValue != null) { if (ModelType.INT == this.modelType) { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -22,7 +22,10 @@ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_NAME; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; import java.util.List; import java.util.Locale; @@ -49,19 +52,18 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; import org.jboss.msc.service.ServiceBuilder; +import org.jboss.msc.service.ServiceBuilder.DependencyType; import org.jboss.msc.service.ServiceContainer; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceTarget; import org.jboss.msc.service.ValueService; -import org.jboss.msc.service.ServiceBuilder.DependencyType; import org.jboss.msc.value.InjectedValue; import org.teiid.PolicyDecider; import org.teiid.cache.CacheConfiguration; -import org.teiid.cache.DefaultCacheFactory; import org.teiid.cache.CacheConfiguration.Policy; +import org.teiid.cache.DefaultCacheFactory; import org.teiid.cache.jboss.ClusterableCacheFactory; -import org.teiid.common.buffer.BufferManager; import org.teiid.deployers.SystemVDBDeployer; import org.teiid.deployers.VDBRepository; import org.teiid.deployers.VDBStatusChecker; @@ -164,7 +166,12 @@ final ServiceVerificationHandler verificationHandler, final List<ServiceController<?>> newControllers) throws OperationFailedException { ClassLoader classloader = Thread.currentThread().getContextClassLoader(); try { - Thread.currentThread().setContextClassLoader(Module.getCallerModule().getClassLoader()); + try { + classloader = Module.getCallerModule().getClassLoader(); + } catch(Throwable t) { + //ignore.. + } + Thread.currentThread().setContextClassLoader(classloader); initilaizeTeiidEngine(context, operation, newControllers); } finally { Thread.currentThread().setContextClassLoader(classloader); @@ -198,7 +205,7 @@ else { systemFunctionManager.setAllowEnvFunction(false); } - systemFunctionManager.setClassloader(Module.getCallerModule().getClassLoader()); + systemFunctionManager.setClassloader(Thread.currentThread().getContextClassLoader()); // VDB repository final VDBRepository vdbRepository = new VDBRepository(); @@ -232,7 +239,6 @@ newControllers.add(objectSerializerService.install()); // Object Replicator - JGroupsObjectReplicatorService replicatorService = null; if (Element.OR_STACK_ATTRIBUTE.isDefined(operation)) { String stack = Element.OR_STACK_ATTRIBUTE.asString(operation); @@ -241,7 +247,7 @@ clusterName = Element.OR_CLUSTER_NAME_ATTRIBUTE.asString(operation); } - replicatorService = new JGroupsObjectReplicatorService(clusterName); + JGroupsObjectReplicatorService replicatorService = new JGroupsObjectReplicatorService(clusterName); ServiceBuilder<JGroupsObjectReplicator> serviceBuilder = target.addService(TeiidServiceNames.OBJECT_REPLICATOR, replicatorService); serviceBuilder.addDependency(ServiceName.JBOSS.append("jgroups", "stack", stack), ChannelFactory.class, replicatorService.channelFactoryInjector); //$NON-NLS-1$ //$NON-NLS-2$ newControllers.add(serviceBuilder.install()); @@ -249,10 +255,10 @@ // TODO: remove verbose service by moving the buffer service from runtime project newControllers.add(RelativePathService.addService(TeiidServiceNames.BUFFER_DIR, "teiid-buffer", "jboss.server.temp.dir", target)); //$NON-NLS-1$ //$NON-NLS-2$ - BufferManagerService bufferService = new BufferManagerService(buildBufferManager(operation), replicatorService.getValue()); + BufferManagerService bufferService = new BufferManagerService(buildBufferManager(operation)); ServiceBuilder<BufferService> bufferServiceBuilder = target.addService(TeiidServiceNames.BUFFER_MGR, bufferService); bufferServiceBuilder.addDependency(TeiidServiceNames.BUFFER_DIR, String.class, bufferService.pathInjector); - bufferServiceBuilder.addDependency(TeiidServiceNames.BUFFER_DIR, String.class, bufferService.pathInjector); + bufferServiceBuilder.addDependency(DependencyType.OPTIONAL, TeiidServiceNames.OBJECT_REPLICATOR, ObjectReplicator.class, bufferService.replicatorInjector); newControllers.add(bufferServiceBuilder.install()); PolicyDecider policyDecider; @@ -287,24 +293,18 @@ newControllers.add(target.addService(TeiidServiceNames.AUTHORIZATION_VALIDATOR, authValidatorService).install()); // resultset cache - final SessionAwareCache<CachedResults> resultsetCache = buildResultsetCache(operation, bufferService.getValue().getBufferManager()); - ValueService<SessionAwareCache<CachedResults>> resultSetService = new ValueService<SessionAwareCache<CachedResults>>(new org.jboss.msc.value.Value<SessionAwareCache<CachedResults>>() { - @Override - public SessionAwareCache<CachedResults> getValue() throws IllegalStateException, IllegalArgumentException { - return resultsetCache; - } - }); - newControllers.add(target.addService(TeiidServiceNames.CACHE_RESULTSET, resultSetService).install()); + final SessionAwareCache<CachedResults> resultsetCache = buildResultsetCache(operation); + CacheService<CachedResults> resultSetService = new CacheService<CachedResults>(resultsetCache); + ServiceBuilder<SessionAwareCache<CachedResults>> resultsCacheBuilder = target.addService(TeiidServiceNames.CACHE_RESULTSET, resultSetService); + resultsCacheBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferService.class, resultSetService.bufferMgrInjector); + newControllers.add(resultsCacheBuilder.install()); // prepared-plan cache - final SessionAwareCache<PreparedPlan> preparedPlanCache = buildPreparedPlanCache(operation, bufferService.getValue().getBufferManager()); - ValueService<SessionAwareCache<PreparedPlan>> preparedPlanService = new ValueService<SessionAwareCache<PreparedPlan>>(new org.jboss.msc.value.Value<SessionAwareCache<PreparedPlan>>() { - @Override - public SessionAwareCache<PreparedPlan> getValue() throws IllegalStateException, IllegalArgumentException { - return preparedPlanCache; - } - }); - newControllers.add(target.addService(TeiidServiceNames.CACHE_PREPAREDPLAN, preparedPlanService).install()); + final SessionAwareCache<PreparedPlan> preparedPlanCache = buildPreparedPlanCache(operation); + CacheService<PreparedPlan> preparedPlanService = new CacheService<PreparedPlan>(preparedPlanCache); + ServiceBuilder<SessionAwareCache<PreparedPlan>> preparedPlanCacheBuilder = target.addService(TeiidServiceNames.CACHE_PREPAREDPLAN, preparedPlanService); + preparedPlanCacheBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferService.class, preparedPlanService.bufferMgrInjector); + newControllers.add(preparedPlanCacheBuilder.install()); // Query Engine final RuntimeEngineDeployer engine = buildQueryEngine(operation); @@ -413,7 +413,7 @@ return bufferManger; } - private SessionAwareCache<CachedResults> buildResultsetCache(ModelNode node, BufferManager bufferManager) { + private SessionAwareCache<CachedResults> buildResultsetCache(ModelNode node) { CacheConfiguration cacheConfig = new CacheConfiguration(); cacheConfig.setMaxEntries(1024); @@ -436,7 +436,6 @@ } else { SessionAwareCache<CachedResults> resultsetCache = new SessionAwareCache<CachedResults>(new DefaultCacheFactory(), SessionAwareCache.Type.RESULTSET, cacheConfig); - resultsetCache.setBufferManager(bufferManager); return resultsetCache; } @@ -452,12 +451,11 @@ } SessionAwareCache<CachedResults> resultsetCache = new SessionAwareCache<CachedResults>(cacheFactory, SessionAwareCache.Type.RESULTSET, cacheConfig); - resultsetCache.setBufferManager(bufferManager); return resultsetCache; } - private SessionAwareCache<PreparedPlan> buildPreparedPlanCache(ModelNode node, BufferManager bufferManager) { + private SessionAwareCache<PreparedPlan> buildPreparedPlanCache(ModelNode node) { CacheConfiguration cacheConfig = new CacheConfiguration(); if (Element.PPC_MAX_ENTRIES_ATTRIBUTE.isDefined(node)) { cacheConfig.setMaxEntries(Element.PPC_MAX_ENTRIES_ATTRIBUTE.asInt(node)); @@ -477,7 +475,6 @@ cacheConfig.setLocation("prepared"); //$NON-NLS-1$ SessionAwareCache<PreparedPlan> cache = new SessionAwareCache<PreparedPlan>(new DefaultCacheFactory(), SessionAwareCache.Type.PREPAREDPLAN, cacheConfig); - cache.setBufferManager(bufferManager); return cache; } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -23,11 +23,10 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ATTRIBUTES; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CHILDREN; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.HEAD_COMMENT_ALLOWED; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TAIL_COMMENT_ALLOWED; import java.util.Locale; import java.util.ResourceBundle; @@ -37,6 +36,7 @@ import org.jboss.as.controller.PathElement; import org.jboss.as.controller.SubsystemRegistration; import org.jboss.as.controller.descriptions.DescriptionProvider; +import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.controller.parsing.ExtensionParsingContext; import org.jboss.as.controller.registry.AttributeAccess.Storage; import org.jboss.as.controller.registry.ManagementResourceRegistration; @@ -67,7 +67,19 @@ // Main Teiid system, with children query engine and translators. - final ManagementResourceRegistration teiidSubsystem = registration.registerSubsystemModel(TEIID_DESCRIBE); + final ManagementResourceRegistration teiidSubsystem = registration.registerSubsystemModel(new DescriptionProvider() { + @Override + public ModelNode getModelDescription(Locale locale) { + final ResourceBundle bundle = IntegrationPlugin.getResourceBundle(locale); + ModelNode node = new ModelNode(); + node.get(ModelDescriptionConstants.DESCRIPTION).set("teiid subsystem"); //$NON-NLS-1$ + + TeiidAdd.describeTeiid(node, ATTRIBUTES, bundle); + node.get(CHILDREN, Element.TRANSPORT_ELEMENT.getLocalName(), DESCRIPTION).set(Element.TRANSPORT_ELEMENT.getDescription(bundle)); + node.get(CHILDREN, Element.TRANSLATOR_ELEMENT.getLocalName(), DESCRIPTION).set(Element.TRANSLATOR_ELEMENT.getDescription(bundle)); + return node; + } + }); teiidSubsystem.registerOperationHandler(ADD, TEIID_BOOT_ADD, TEIID_BOOT_ADD, false); teiidSubsystem.registerOperationHandler(DESCRIBE, TEIID_DESCRIBE, TEIID_DESCRIBE, false); @@ -79,8 +91,6 @@ final ModelNode node = new ModelNode(); node.get(DESCRIPTION).set(Element.TRANSLATOR_ELEMENT.getDescription(bundle)); - node.get(HEAD_COMMENT_ALLOWED).set(true); - node.get(TAIL_COMMENT_ALLOWED).set(true); Element.TRANSLATOR_MODULE_ATTRIBUTE.describe(node, ATTRIBUTES, bundle); return node; } @@ -97,11 +107,7 @@ final ModelNode node = new ModelNode(); node.get(DESCRIPTION).set(Element.TRANSPORT_ELEMENT.getDescription(bundle)); - node.get(HEAD_COMMENT_ALLOWED).set(true); - node.get(TAIL_COMMENT_ALLOWED).set(true); - TransportAdd.transportDescribe(node, ATTRIBUTES, bundle); - return node; } }); Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -21,7 +21,15 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOWED; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEFAULT; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ONLY; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VALUE_TYPE; import java.io.IOException; import java.math.BigDecimal; @@ -130,7 +138,8 @@ context.getResult().set(engine.getRuntimeVersion()); } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).set(ModelType.STRING); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.STRING); } } @@ -145,13 +154,14 @@ for (Transport t: this.transports) { count += t.getActiveSessionsCount(); } - context.getResult().set(String.valueOf(count)); + context.getResult().set(count); } catch (AdminException e) { throw new OperationFailedException(new ModelNode().set(e.getMessage())); } } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).set(ModelType.INT); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.INT); } } @@ -171,7 +181,9 @@ } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.SessionMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.SessionMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -196,7 +208,9 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.SESSION)); - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -213,7 +227,9 @@ } } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -250,7 +266,9 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.VDB_VERSION)); - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -267,7 +285,9 @@ } } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -289,6 +309,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SESSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.SESSION)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -307,6 +328,7 @@ } boolean pass = engine.cancelRequest(operation.get(OperationsConstants.SESSION).asString(), operation.get(OperationsConstants.EXECUTION_ID).asLong()); ModelNode result = context.getResult(); + result.set(pass); } catch (TeiidComponentException e) { throw new OperationFailedException(e, new ModelNode().set(e.getMessage())); @@ -322,7 +344,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.EXECUTION_ID, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.EXECUTION_ID, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.EXECUTION_ID)); - operationNode.get(REPLY_PROPERTIES).set(ModelType.BOOLEAN); + operationNode.get(REPLY_PROPERTIES).get(TYPE).set(ModelType.BOOLEAN); } } @@ -368,11 +390,12 @@ } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - ModelNode node = new ModelNode(); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + + ModelNode node = reply.get(VALUE_TYPE); node.get(OperationsConstants.CACHE_TYPE, TYPE).set(ModelType.STRING); - node.get(OperationsConstants.CACHE_TYPE, REQUIRED).set(true); node.get(OperationsConstants.CACHE_TYPE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.CACHE_TYPE)); - operationNode.get(REPLY_PROPERTIES).add(node); } } @@ -413,7 +436,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, TYPE).set(ModelType.INT); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, REQUIRED).set(false); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.VDB_VERSION)); - + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -448,8 +471,9 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.CACHE_TYPE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.CACHE_TYPE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.CACHE_TYPE)); - ModelNode node = new ModelNode(); - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.CacheStatisticsMetadataMapper.INSTANCE.describe(node)); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.OBJECT); + VDBMetadataMapper.CacheStatisticsMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -473,6 +497,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.DS_NAME)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -488,7 +513,9 @@ VDBMetadataMapper.WorkerPoolStatisticsMetadataMapper.INSTANCE.wrap(stats, result); } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.WorkerPoolStatisticsMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.OBJECT); + VDBMetadataMapper.WorkerPoolStatisticsMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -506,8 +533,9 @@ } } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - ModelNode node = new ModelNode(); - operationNode.get(REPLY_PROPERTIES).add(TransactionMetadataMapper.INSTANCE.describe(node)); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + TransactionMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -535,6 +563,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.XID, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.XID, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.XID, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.XID)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -593,6 +622,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.TARGET_VDBVERSION)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -643,7 +673,8 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TIMEOUT_IN_MILLI, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TIMEOUT_IN_MILLI, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.TIMEOUT_IN_MILLI)); - operationNode.get(REPLY_PROPERTIES).set(ModelType.LIST); + operationNode.get(REPLY_PROPERTIES).get(TYPE).set(ModelType.LIST); + operationNode.get(REPLY_PROPERTIES).get(VALUE_TYPE).set(ModelType.STRING); } public ModelNode executeQuery(final String vdbName, final int version, final String command, final long timoutInMilli, final ModelNode resultsNode) throws OperationFailedException { @@ -812,7 +843,9 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.VDB_VERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.VDB_VERSION)); - operationNode.get(REPLY_PROPERTIES).set(VDBMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.OBJECT); + VDBMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -837,7 +870,9 @@ } } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -857,7 +892,9 @@ } protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { - operationNode.get(REPLY_PROPERTIES).add(VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -885,7 +922,9 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TRANSLATOR_NAME, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TRANSLATOR_NAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.TRANSLATOR_NAME)); - operationNode.get(REPLY_PROPERTIES).set(VDBTranslatorMetaDataMapper.INSTANCE.describe(new ModelNode())); + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.OBJECT); + VDBTranslatorMetaDataMapper.INSTANCE.describe(reply.get(VALUE_TYPE)); } } @@ -981,6 +1020,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.MAPPED_ROLE)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1028,6 +1068,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.MAPPED_ROLE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.MAPPED_ROLE)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1066,6 +1107,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.DATA_ROLE)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1105,6 +1147,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DATA_ROLE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.DATA_ROLE)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1136,6 +1179,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.CONNECTION_TYPE, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.CONNECTION_TYPE, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.CONNECTION_TYPE, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.CONNECTION_TYPE)); + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1211,7 +1255,7 @@ operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, REQUIRED).set(true); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.DS_NAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.DS_NAME)); - + operationNode.get(REPLY_PROPERTIES).setEmptyObject(); } } @@ -1301,6 +1345,11 @@ protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) { operationNode.get(REQUEST_PROPERTIES, OperationsConstants.RAR_NAME, TYPE).set(ModelType.STRING); operationNode.get(REQUEST_PROPERTIES, OperationsConstants.RAR_NAME, REQUIRED).set(true); - operationNode.get(REQUEST_PROPERTIES, OperationsConstants.RAR_NAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.RAR_NAME)); + operationNode.get(REQUEST_PROPERTIES, OperationsConstants.RAR_NAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.RAR_NAME)); + + ModelNode reply = operationNode.get(REPLY_PROPERTIES); + reply.get(TYPE).set(ModelType.LIST); + // this is incomplete + reply.get(VALUE_TYPE).set(ModelType.STRING); } } \ No newline at end of file Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemDescribe.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemDescribe.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemDescribe.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -22,7 +22,14 @@ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_NAME; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VALUE_TYPE; import java.util.Locale; import java.util.ResourceBundle; @@ -35,8 +42,12 @@ import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.controller.registry.Resource; import org.jboss.dmr.ModelNode; +import org.jboss.dmr.ModelType; import org.jboss.dmr.Property; +/** + * This is class that satisfies "describe" operation. + */ public class TeiidSubsystemDescribe implements OperationStepHandler, DescriptionProvider { @Override @@ -44,18 +55,10 @@ final ResourceBundle bundle = IntegrationPlugin.getResourceBundle(locale); ModelNode node = new ModelNode(); - node.get(ModelDescriptionConstants.DESCRIPTION).set("teiid subsystem"); //$NON-NLS-1$ - node.get(ModelDescriptionConstants.HEAD_COMMENT_ALLOWED).set(true); - node.get(ModelDescriptionConstants.TAIL_COMMENT_ALLOWED).set(true); - node.get(ModelDescriptionConstants.NAMESPACE).set(Namespace.CURRENT.getUri()); - - TeiidAdd.describeTeiid(node, ATTRIBUTES, bundle); - node.get(CHILDREN, Element.TRANSPORT_ELEMENT.getLocalName(), DESCRIPTION).set(Element.TRANSPORT_ELEMENT.getDescription(bundle)); - node.get(CHILDREN, Element.TRANSPORT_ELEMENT.getLocalName(), REQUIRED).set(true); - - node.get(CHILDREN, Element.TRANSLATOR_ELEMENT.getLocalName(), DESCRIPTION).set(Element.TRANSLATOR_ELEMENT.getDescription(bundle)); - node.get(CHILDREN, Element.TRANSLATOR_ELEMENT.getLocalName(), REQUIRED).set(true); - + node.get(OPERATION_NAME).set(DESCRIBE); + node.get(ModelDescriptionConstants.DESCRIPTION).set(bundle.getString("teiid_subsystem.describe")); //$NON-NLS-1$ + node.get(REPLY_PROPERTIES).get(TYPE).set(ModelType.LIST); + TeiidAdd.describeTeiid(node.get(REPLY_PROPERTIES), VALUE_TYPE, bundle); return node; } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -42,6 +42,7 @@ import org.jboss.modules.Module; import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; +import org.jboss.modules.ModuleLoader; import org.jboss.msc.service.ServiceBuilder; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceTarget; @@ -93,10 +94,11 @@ final Module module; ClassLoader translatorLoader = this.getClass().getClassLoader(); - if (moduleName != null) { + ModuleLoader ml = Module.getCallerModuleLoader(); + if (moduleName != null && ml != null) { try { - module = Module.getCallerModuleLoader().loadModule(ModuleIdentifier.create(moduleName)); - translatorLoader = module.getClassLoader(); + module = ml.loadModule(ModuleIdentifier.create(moduleName)); + translatorLoader = module.getClassLoader(); } catch (ModuleLoadException e) { throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_module", moduleName, translatorName))); //$NON-NLS-1$ } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -65,7 +65,7 @@ import org.teiid.transport.SSLConfiguration; import org.teiid.transport.SocketConfiguration; -public class TransportAdd extends AbstractAddStepHandler implements DescriptionProvider { +class TransportAdd extends AbstractAddStepHandler implements DescriptionProvider { private static Element[] attributes = { Element.TRANSPORT_PROTOCOL_ATTRIBUTE, @@ -189,7 +189,7 @@ // add security domains for (String domain:domainList) { - LogManager.logInfo(LogConstants.CTX_SECURITY, IntegrationPlugin.Util.getString("security_enabled", domain)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SECURITY, IntegrationPlugin.Util.getString("security_enabled", domain, transportName)); //$NON-NLS-1$ transportBuilder.addDependency(ServiceName.JBOSS.append("security", "security-domain", domain), SecurityDomainContext.class, new ConcurrentMapInjector<String,SecurityDomainContext>(transport.securityDomains, domain)); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -35,7 +35,6 @@ import javax.resource.spi.work.WorkManager; import javax.transaction.TransactionManager; -import org.jboss.modules.Module; import org.jboss.msc.service.Service; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; @@ -114,7 +113,7 @@ setBufferService(bufferServiceInjector.getValue()); - dqpCore.setTransactionService((TransactionService)LogManager.createLoggingProxy(LogConstants.CTX_TXN_LOG, transactionServerImpl, new Class[] {TransactionService.class}, MessageLevel.DETAIL, Module.getCallerModule().getClassLoader())); + dqpCore.setTransactionService((TransactionService)LogManager.createLoggingProxy(LogConstants.CTX_TXN_LOG, transactionServerImpl, new Class[] {TransactionService.class}, MessageLevel.DETAIL, Thread.currentThread().getContextClassLoader())); if (getObjectReplicatorInjector().getValue() != null) { try { @@ -132,7 +131,7 @@ this.dqpCore.setResultsetCache(getResultSetCacheInjector().getValue()); this.dqpCore.setPreparedPlanCache(getPreparedPlanCacheInjector().getValue()); this.dqpCore.start(this); - this.eventDistributorProxy = (EventDistributor)Proxy.newProxyInstance(Module.getCallerModule().getClassLoader(), new Class[] {EventDistributor.class}, new InvocationHandler() { + this.eventDistributorProxy = (EventDistributor)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {EventDistributor.class}, new InvocationHandler() { @Override public Object invoke(Object proxy, Method method, Object[] args) Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-12-01 18:19:11 UTC (rev 3714) @@ -58,7 +58,7 @@ translator.add=Add Translator translator.remove=Remove Translator protocol_not_found=protocol is not defined for the transport configuration. -security_enabled=Security Enabled: {0} +security_enabled=Security enabled for transport "{1}" with security-domain set to {0} DQPCore.unable_to_process_event=Unable to process event. translator.added = Teiid translator "{0}" added. wrong_protocol=Wrong type of protocol supplied @@ -204,19 +204,22 @@ model-name.missing=Parameter "model-name" is required connection-type.missing = Parameter "connection-type" is required. Must be one of [NONE, BY_VERSION, ANY] rar-name.missing=Parameter "rar-name" is is required. +vdb-description.describe=vdb description +teiid_subsystem.describe=describe the teiid subsystem - # Operation descriptions (alpha layout) add-anyauthenticated-role.describe=Mark any authenticated to the datarole add-anyauthenticated-role.vdb-name.describe=VDB Name add-anyauthenticated-role.vdb-version.describe=VDB Version add-anyauthenticated-role.data-role.describe=VDB Defined Data Role Name +add-anyauthenticated-role.reply=void add-data-role.describe= Map a JAAS based role to the VDB data role, for granting permission add-data-role.vdb-name.describe=VDB Name add-data-role.vdb-version.describe=VDB Version add-data-role.data-role.describe=VDB Defined Data Role Name add-data-role.mapped-role.describe=Security domain defined role name +add-data-role.reply=void assign-datasource.describe=Assign a data source or translator names to a given model in the VDB assign-datasource.vdb-name.describe=VDB Name @@ -225,91 +228,119 @@ assign-datasource.ds-name.describe=Data source name assign-datasource.translator-name.describe=translator name assign-datasource.model-name.describe=Model Name +assign-datasource.reply=void cache-statistics.describe=Get the cache statistics for the given cache type cache-statistics.cache-type.describe=cache type (PREPARED_PLAN_CACHE, QUERY_SERVICE_RESULT_SET_CACHE) +cache-statistics.reply=cache statistics cache-types.describe=List the available cache types +cache-types.cache-type.describe=Cache type +cache-types.reply=list of cache types cancel-request.describe=Cancel the execution of the actively running query cancel-request.session.describe=The session Identifier of the user cancel-request.execution-id.describe=The Execution Identifier of the query -cancel-request.reply.describe=True if successful; false otherwise. +cancel-request.reply=True if successful; false otherwise. change-vdb-connection-type.describe=Change the default VDB version selection change-vdb-connection-type.vdb-name.describe=VDB Name change-vdb-connection-type.vdb-version.describe=VDB Version change-vdb-connection-type.connection-type.describe=VDB Connection Type +change-vdb-connection-type.reply=void clear-cache.describe=Clear the caches in the system of the given type clear-cache.cache-type.describe=cache type to be cleared. (PREPARED_PLAN_CACHE, QUERY_SERVICE_RESULT_SET_CACHE) clear-cache.vdb-name.describe=VDB name clear-cache.vdb-version.describe=VDB version +clear-cache.reply=void execute-query.describe=Execute a sql query execute-query.vdb-name.describe=vdb name execute-query.vdb-version.describe=vdb version execute-query.sql-query.describe=sql query to execute execute-query.timeout-in-milli.describe=timeout +execute-query.reply=list of rows active-session-count.describe=Number of active sessions -active-session-count.reply.describe=Returns the count of active sessions +active-session-count.reply=Returns the count of active sessions long-running-queries.describe=Long running queries that exceeded the threshold set by the 'query-threshold-in-seconds' configuration property. +long-running-queries.reply=long running queries runtime-version.describe = Runtime version of the Teiid subsystem -runtime-version.reply.describe=Teiid runtime version +runtime-version.reply=Teiid runtime version get-translator.describe=retrieve translator get-translator.translator-name.describe=translator name get-translator.reply.describe=Returns translator if found with given name +get-translator.reply=translator get-vdb.describe=Get the VDB with the given name and version get-vdb.vdb-name.describe=name of the vdb get-vdb.vdb-version.describe=vdb version +get-vdb.reply=vdb list-requests.describe=List of active requests +list-requests.reply=list of requests list-sessions.describe=List of all the current active sessions in the Teiid subsystem. +list-sessions.reply=list of sessions list-transactions.describe=Active Transactions in the Query Engine +list-transactions.reply=list of transactions list-translators.describe=List of translators registered in the teiid container list-translators.reply.describe=List of translators registered in the teiid container +list-translators.reply=list of translators list-vdbs.describe=List the available virtual databases in the system +list-vdbs.reply=list of vdbs merge-vdbs.describe=Merge Two VDBs merge-vdbs.source-vdb-name.describe=Source VDB name merge-vdbs.source-vdb-version.describe=Source VDB version number merge-vdbs.target-vdb-name.describe=Target VDB name merge-vdbs.target-vdb-version.describe=Target VDB version number +merge-vdbs.reply=void remove-anyauthenticated-role.describe=remove any authenticated from the data role provided remove-anyauthenticated-role.vdb-name.describe=VDB Name remove-anyauthenticated-role.vdb-version.describe=VDB Version remove-anyauthenticated-role.data-role.describe=VDB Defined Data Role Name +remove-anyauthenticated-role.reply=void remove-data-role.describe=remove the JAAS based role mapping from VDB data role remove-data-role.vdb-name.describe=VDB Name remove-data-role.vdb-version.describe=VDB Version remove-data-role.data-role.describe=VDB Defined Data Role Name remove-data-role.mapped-role.describe=Security domain defined role name +remove-data-role.reply=void requests-per-session.describe=Current active requests in progress in the query engine for a given session identifier requests-per-session.session.describe=The session Identifier +requests-per-session.reply=requests for given session requests-per-vdb.describe=Current active requests in progress in the query engine for a given VDB name and its version. requests-per-vdb.vdb-name.describe=VDB Name requests-per-vdb.vdb-version.describe=VDB Version +requests-per-vdb.reply=list of requests on the given vdb terminate-session.describe=Terminate the session terminate-session.session.describe=The session Identifier of session to be terminated +terminate-session.reply=void terminate-transaction.describe=Terminate the XA transaction terminate-transaction.xid.describe=xid identifier of the XA transaction +terminate-transaction.reply=void workerpool-statistics.describe=Get thread statistics worker pool +workerpool-statistics.reply=Returns the worker pool statistics read-rar-description.describe=Describe the properties of the Resource Adapter -read-rar-description.rar-name.describe=resource adapter name \ No newline at end of file +read-rar-description.rar-name.describe=resource adapter name +read-rar-description.reply=returns all the attribute names and their properties + +mark-datasource-available.describe=Notify that the defined data source is now available +mark-datasource-available.ds-name.describe=Data Source name +mark-datasource-available.reply=void \ No newline at end of file Modified: trunk/jboss-integration/src/test/resources/teiid-model-config.txt =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-model-config.txt 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/test/resources/teiid-model-config.txt 2011-12-01 18:19:11 UTC (rev 3714) @@ -3,245 +3,209 @@ "type" => BOOLEAN, "description" => "Allow the execution of ENV function. (default false)", "required" => false, - "max-occurs" => 1, "default" => false }, "async-thread-pool" => { "type" => STRING, "description" => "Thread Pool to be used with Asynchronous operations in Teiid", - "required" => true, - "max-occurs" => 1 + "required" => true }, "max-threads" => { "type" => INT, "description" => "Process pool maximum thread count. (default 64)", "required" => false, - "max-occurs" => 1, "default" => 64 }, "max-active-plans" => { "type" => INT, "description" => "Max active plans (default 20). Increase this value on highly concurrent systems - but ensure that the underlying pools can handle the increased load without timeouts.", "required" => false, - "max-occurs" => 1, "default" => 20 }, "thread-count-for-source-concurrency" => { "type" => INT, "description" => "Max source query concurrency per user request (default 0). 0 indicates use the default calculated value based on max active plans and max threads - approximately 2*(max threads)/(max active plans). ", "required" => false, - "max-occurs" => 1, "default" => 0 }, "time-slice-in-millseconds" => { "type" => INT, "description" => "Query processor time slice, in milliseconds. (default 2000)", "required" => false, - "max-occurs" => 1, "default" => 2000 }, "max-row-fetch-size" => { "type" => INT, "description" => "Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20480)", "required" => false, - "max-occurs" => 1, "default" => 20480 }, "lob-chunk-size-in-kb" => { "type" => INT, "description" => "The max lob chunk size in KB transferred each time when processing blobs, clobs (100KB default)", "required" => false, - "max-occurs" => 1, "default" => 100 }, "query-threshold-in-seconds" => { "type" => INT, "description" => "Long running query threshold, after which a alert can be generated by tooling if configured", "required" => false, - "max-occurs" => 1, "default" => 600 }, "max-source-rows-allowed" => { "type" => INT, "description" => "Maximum rows allowed from a source query. -1 indicates no limit. (default -1)", "required" => false, - "max-occurs" => 1, "default" => -1 }, "exception-on-max-source-rows" => { "type" => BOOLEAN, "description" => "Indicates if an exception should be thrown if the specified value for Maximum Source Rows is exceeded; only up to the maximum rows will be consumed. (default true)", "required" => false, - "max-occurs" => 1, "default" => true }, "detect-change-events" => { "type" => BOOLEAN, "description" => "Set to true for the engine to detect local change events. Should be disabled if using external change data capture tools. (default true)", "required" => false, - "max-occurs" => 1, "default" => true }, "query-timeout" => { "type" => LONG, "description" => "Set the default query timeout for all queries in milliseconds. 0 indicates no timeout. Lesser timeout values may be set per VDB or by clients. (default 0)", "required" => false, - "max-occurs" => 1, "default" => 0L }, "workmanager" => { "type" => STRING, "description" => "WorkManager name to use in processing. (default name is \"default\")", "required" => false, - "max-occurs" => 1, "default" => "default" }, "authorization-validator-module" => { "type" => STRING, "description" => "Authorization Module; Implementation of org.teiid.dqp.internal.process.AuthorizationValidator class.", - "required" => false, - "max-occurs" => 1 + "required" => false }, "policy-decider-module" => { "type" => STRING, "description" => "Policy Module; Implementation of org.teiid.PolicyDecider class ", - "required" => false, - "max-occurs" => 1 + "required" => false }, "object-replicator-stack" => { "type" => STRING, "description" => "JGroups stack name for cache replication channel", - "required" => false, - "max-occurs" => 1 + "required" => false }, "object-replicator-cluster-name" => { "type" => STRING, "description" => "cache channel cluster name for cache replication", - "required" => false, - "max-occurs" => 1 + "required" => false }, "buffer-service-use-disk" => { "type" => BOOLEAN, "description" => "Use disk for buffer management", "required" => false, - "max-occurs" => 1, "default" => true }, "buffer-service-inline-lobs" => { "type" => BOOLEAN, "description" => "Set to true to allow inlining of memory based and small lobs into results. However inline lob values are not supported by pre-7.6 clients, so disable this property if using older clients utilizing lobs. (default true) ", "required" => false, - "max-occurs" => 1, "default" => true }, "buffer-service-processor-batch-size" => { "type" => INT, "description" => "The max row count of a batch sent internally within the query processor. Should be <= the 'connector-batch-size'. (default 256)", "required" => false, - "max-occurs" => 1, "default" => 256 }, "buffer-service-connector-batch-size" => { "type" => INT, "description" => "The max row count of a batch from a connector. Should be even multiple of 'processor-batch-size'. (default 512)", "required" => false, - "max-occurs" => 1, "default" => 512 }, "buffer-service-max-processing-kb" => { "type" => INT, "description" => "The approximate amount of buffer memory in kilobytes allowable for a single processing operation (sort, grouping, etc.) regardless of existing memory commitments. -1 means to automatically calculate a value (default -1)", "required" => false, - "max-occurs" => 1, "default" => -1 }, "buffer-service-max-reserve-kb" => { "type" => INT, "description" => "The approximate amount of memory in kilobytes allowed to be held by the buffer manager. -1 means to automatically calculate a value (default -1)", "required" => false, - "max-occurs" => 1, "default" => -1 }, "buffer-service-max-file-size" => { "type" => LONG, "description" => "Max File size in MB (default 2GB)", "required" => false, - "max-occurs" => 1, "default" => 2048L }, "buffer-service-max-buffer-space" => { "type" => LONG, "description" => "Max storage space, in MB, to be used for buffer files (default 50G)", "required" => false, - "max-occurs" => 1, "default" => 51200L }, "buffer-service-max-open-files" => { "type" => INT, "description" => "Max open buffer files (default 64)", "required" => false, - "max-occurs" => 1, "default" => 64 }, "buffer-service-memory-buffer-space" => { "type" => INT, "description" => "Memory buffer space used by the buffer manager in MB. -1 determines the setting automatically from the max-reserve-kb (default -1). This value cannot be smaller than max-storage-object-size", "required" => false, - "max-occurs" => 1, "default" => -1 }, "buffer-service-memory-buffer-off-heap" => { "type" => BOOLEAN, "description" => "Set to true to hold the memory buffer off-heap. If true you must ensure that the VM can allocate that much direct memory (default false).", "required" => false, - "max-occurs" => 1, "default" => false }, "buffer-service-max-storage-object-size" => { "type" => INT, "description" => "The maximum size of a buffer managed object (typically a table page or a results batch) in bytes (default 8388608 or 8MB). Setting this value too high will reduce the effectiveness of the memory buffer.", "required" => false, - "max-occurs" => 1, "default" => 8388608 }, "preparedplan-cache-max-entries" => { "type" => INT, "description" => "Max Entries allowed", "required" => false, - "max-occurs" => 1, "default" => 512 }, "preparedplan-cache-max-age-in-seconds" => { "type" => INT, "description" => "Max age in seconds", "required" => false, - "max-occurs" => 1, "default" => 28800 }, "resultset-cache-name" => { "type" => STRING, "description" => "Infinispan cache name for resultset", "required" => false, - "max-occurs" => 1, "default" => "resultset" }, "resultset-cache-container-name" => { "type" => STRING, "description" => "Infinispan cache container name", - "required" => false, - "max-occurs" => 1 + "required" => false }, "resultset-cache-max-staleness" => { "type" => INT, "description" => "Max staleness in seconds. Modifications are based upon data updates -1 indicates no max. (default 60 - 1 minute)", "required" => false, - "max-occurs" => 1, "default" => 60 }, "resultset-cache-enable" => { "type" => BOOLEAN, "description" => "Resultset cache enabled", - "required" => false, - "max-occurs" => 1 + "required" => false } }} \ No newline at end of file Modified: trunk/jboss-integration/src/test/resources/teiid-transport-config.txt =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2011-12-01 18:19:11 UTC (rev 3714) @@ -3,131 +3,111 @@ "type" => STRING, "description" => "Transport protocol (allowed=teiid, pg) ", "required" => false, - "max-occurs" => 1, "default" => "teiid" }, "socket-binding" => { "type" => STRING, "description" => "Socket binding to be used for the transport", - "required" => true, - "max-occurs" => 1 + "required" => true }, "max-socket-threads" => { "type" => INT, "description" => "Max number of threads dedicated to initial request processing. Zero indicates the system default of max available processors. (default 0) Setting this value above the max available processors is not recommended.", "required" => false, - "max-occurs" => 1, "default" => 0 }, "input-buffer-size" => { "type" => INT, "description" => "SO_RCVBUF size, 0 indicates that system default should be used (default 0)", "required" => false, - "max-occurs" => 1, "default" => 0 }, "output-buffer-size" => { "type" => INT, "description" => "SO_SNDBUF size, 0 indicates that system default should be used (default 0)", "required" => false, - "max-occurs" => 1, "default" => 0 }, "authentication-security-domain" => { "type" => STRING, "description" => "Security domain to be enforced with the transport", - "required" => false, - "max-occurs" => 1 + "required" => false }, "authentication-max-sessions-allowed" => { "type" => INT, "description" => "Maximum number of sessions allowed by the system (default 5000)", "required" => false, - "max-occurs" => 1, "default" => 5000 }, "authentication-sessions-expiration-timelimit" => { "type" => INT, "description" => "Max allowed time before the session is terminated by the system, 0 indicates unlimited (default 0)", "required" => false, - "max-occurs" => 1, "default" => 0 }, "authentication-krb5-domain" => { "type" => STRING, "description" => "KRB5 security domain name, if GSS API based single-sign-on is being used. Note security-domain still needed to define the roles for users. ", - "required" => false, - "max-occurs" => 1 + "required" => false }, "pg-max-lob-size-in-bytes" => { "type" => INT, "description" => "Max LOB size in Postgres protocol, as streaming is not supported", "required" => false, - "max-occurs" => 1, "default" => 5242880 }, "ssl-mode" => { "type" => STRING, "description" => "can be one of disabled, login, or enabled disabled = no transport or message level security will be used; login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. No other config values are needed in this mode; enabled = traffic will be secured using this configuration,if the client supports SSL", "required" => false, - "max-occurs" => 1, "default" => "login" }, "ssl-authentication-mode" => { "type" => STRING, "description" => "Authentication Mode (1-way, 2-way, anonymous) ", "required" => false, - "max-occurs" => 1, "default" => "anonymous" }, "ssl-ssl-protocol" => { "type" => STRING, "description" => "SSL protocol used", "required" => false, - "max-occurs" => 1, "default" => "SSLv3" }, "ssl-keymanagement-algorithm" => { "type" => STRING, "description" => "Use key management algorithm", - "required" => false, - "max-occurs" => 1 + "required" => false }, "enabled-cipher-suites" => { "type" => STRING, "description" => "Cipher suites that are allowed to be used for SSL. Use to restrict encryption strength(128 bit, 256 bit). Only provide encryption suites that are supported by both client and server JVM. ex:SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_KRB5_WITH_RC4_128_MD5,TLS_KRB5_WITH_RC4_128_SHA,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_KRB5_WITH_3DES_EDE_CBC_MD5,TLS_KRB5_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_DSS_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA", - "required" => false, - "max-occurs" => 1 + "required" => false }, "keystore-name" => { "type" => STRING, "description" => "Keystore File Name", - "required" => false, - "max-occurs" => 1 + "required" => false }, "keystore-password" => { "type" => STRING, "description" => "Keystore password", - "required" => false, - "max-occurs" => 1 + "required" => false }, "keystore-type" => { "type" => STRING, "description" => "Keystore type", "required" => false, - "max-occurs" => 1, "default" => "JKS" }, "truststore-name" => { "type" => STRING, "description" => "Truststore Name", - "required" => false, - "max-occurs" => 1 + "required" => false }, "truststore-password" => { "type" => STRING, "description" => "Truststore Password", - "required" => false, - "max-occurs" => 1 + "required" => false } }} \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/pom.xml 2011-12-01 18:19:11 UTC (rev 3714) @@ -10,7 +10,17 @@ <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> - <jbossas-version>7.1.0.Alpha2-SNAPSHOT</jbossas-version> + <jbossas-version>7.1.0.Beta1</jbossas-version> + <version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core> + <version.org.jboss.staxmapper>1.0.0.Final</version.org.jboss.staxmapper> + <version.org.jboss.jboss-dmr>1.0.0.Final</version.org.jboss.jboss-dmr> + <version.org.jboss.msc.jboss-msc>1.0.1.GA</version.org.jboss.msc.jboss-msc> + <version.org.jboss.modules.jboss-modules>1.1.0.CR3</version.org.jboss.modules.jboss-modules> + <version.org.jboss.jboss-vfs>3.1.0.CR1</version.org.jboss.jboss-vfs> + <version.org.picketbox>4.0.6.Beta1</version.org.picketbox> + <version.org.jboss.logging.jboss-logging>3.1.0.CR1</version.org.jboss.logging.jboss-logging> + <version.org.jboss.logging.jboss-logging-tools>1.0.0.CR4</version.org.jboss.logging.jboss-logging-tools> + <version.org.picketbox.jbosssx-client>3.0.0.CR2</version.org.picketbox.jbosssx-client> </properties> <scm> <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> @@ -375,7 +385,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.17.GA</version> + <version>${version.org.jboss.jboss-common-core}</version> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -396,29 +406,34 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>staxmapper</artifactId> - <version>1.0.0.Final</version> + <version>${version.org.jboss.staxmapper}</version> </dependency> + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <version>${version.org.picketbox.jbosssx-client}</version> + </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-dmr</artifactId> - <version>1.0.0.Final</version> + <version>${version.org.jboss.jboss-dmr}</version> </dependency> <dependency> <groupId>org.jboss.msc</groupId> <artifactId>jboss-msc</artifactId> - <version>1.0.0.GA</version> + <version>${version.org.jboss.msc.jboss-msc}</version> </dependency> <dependency> <groupId>org.jboss.modules</groupId> <artifactId>jboss-modules</artifactId> - <version>1.0.3.GA</version> + <version>${version.org.jboss.modules.jboss-modules}</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> - <version>3.0.1.GA</version> + <version>${version.org.jboss.jboss-vfs}</version> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -433,22 +448,48 @@ <dependency> <groupId>org.picketbox</groupId> <artifactId>picketbox</artifactId> - <version>4.0.1</version> + <version>${version.org.picketbox}</version> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-server</artifactId> <version>${jbossas-version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-connector</artifactId> <version>${jbossas-version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-security</artifactId> <version>${jbossas-version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.as</groupId> @@ -463,17 +504,23 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <version>3.0.0.GA</version> + <version>${version.org.jboss.logging.jboss-logging}</version> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-generator</artifactId> - <version>1.0.0.CR1</version> + <version>${version.org.jboss.logging.jboss-logging-tools}</version> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-clustering-infinispan</artifactId> <version>${jbossas-version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.logging</groupId> Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -357,11 +357,11 @@ } public void setAuthenticationType(AuthenticationType flag) { - this.authenticationType = flag; - LogManager.logInfo(LogConstants.CTX_SECURITY, "Authentication Type set to: "+flag); //$NON-NLS-1$ + this.authenticationType = flag; } public void start() { + LogManager.logInfo(LogConstants.CTX_SECURITY, RuntimePlugin.Util.getString("auth_type", authenticationType, securityDomainNames)); //$NON-NLS-1$ this.sessionMonitor.schedule(new TimerTask() { @Override public void run() { Modified: trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java 2011-12-01 18:19:11 UTC (rev 3714) @@ -70,7 +70,11 @@ final boolean encrypt = message.getContents() instanceof SealedObject; ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); try { - Thread.currentThread().setContextClassLoader(Module.getCallerModule().getClassLoader()); + try { + Thread.currentThread().setContextClassLoader(Module.getCallerModule().getClassLoader()); + } catch(Throwable t) { + // ignore + } message.setContents(this.socketClientInstance.getCryptor().unsealObject(message.getContents())); if (!(message.getContents() instanceof ServiceInvocationStruct)) { throw new AssertionError("unknown message contents"); //$NON-NLS-1$ Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 18:19:11 UTC (rev 3714) @@ -100,3 +100,4 @@ krb5_login_failed=Kerberos context login failed no_security_domains=No security domain configured for Kerberos authentication. Can not authenticate. krb5_user_not_found=GSS authentication is in use, however authenticated user not found in the context to proceed. +auth_type=Authentication Type set to {0} for security-domains {1}

14 years, 1 month

1
0
0 / 0

teiid SVN: r3713 - in trunk: adminshell/src/main/java/groovy and 226 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-12-01 12:33:11 -0500 (Thu, 01 Dec 2011) New Revision: 3713 Added: trunk/connectors/connector-ws/src/test/ trunk/connectors/connector-ws/src/test/java/ trunk/connectors/connector-ws/src/test/java/org/ trunk/connectors/connector-ws/src/test/java/org/teiid/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java Removed: trunk/connectors/connector-ws/src/test/java/ trunk/connectors/connector-ws/src/test/java/org/ trunk/connectors/connector-ws/src/test/java/org/teiid/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java Modified: trunk/ trunk/adminshell/src/main/java/groovy/ trunk/adminshell/src/main/java/groovy/sql/ trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java trunk/adminshell/src/main/java/org/teiid/adminshell/ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java trunk/adminshell/src/main/resources/org/ trunk/adminshell/src/main/resources/org/codehaus/ trunk/adminshell/src/main/resources/org/codehaus/groovy/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml trunk/adminshell/src/main/resources/org/teiid/ trunk/adminshell/src/main/resources/org/teiid/adminshell/ trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties trunk/adminshell/src/test/java/org/ trunk/adminshell/src/test/java/org/teiid/ trunk/adminshell/src/test/java/org/teiid/adminshell/ trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java trunk/adminshell/src/test/resources/foo/ trunk/adminshell/src/test/resources/foo/bar.txt trunk/api/src/main/java/org/teiid/events/ trunk/api/src/main/java/org/teiid/events/EventDistributor.java trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java trunk/build/kits/ trunk/build/kits/adminshell/ trunk/build/kits/jboss-container/ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat trunk/cache-jbosscache/pom.xml trunk/cache-jbosscache/src/main/java/org/ trunk/cache-jbosscache/src/main/java/org/teiid/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/events/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java trunk/cache-jbosscache/src/test/java/ trunk/client/src/main/java/org/teiid/client/util/ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java trunk/client/src/main/java/org/teiid/gss/MakeGSS.java trunk/client/src/main/java/org/teiid/jdbc/ trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java trunk/client/src/main/java/org/teiid/net/socket/ trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java trunk/client/src/main/java/org/teiid/net/socket/Handshake.java trunk/client/src/main/java/org/teiid/net/socket/Message.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java trunk/client/src/main/resources/org/ trunk/client/src/main/resources/org/teiid/ trunk/client/src/main/resources/org/teiid/jdbc/ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties trunk/client/src/main/resources/org/teiid/net/ trunk/client/src/test/java/org/teiid/client/plan/ trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java trunk/client/src/test/java/org/teiid/client/util/ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java trunk/client/src/test/java/org/teiid/jdbc/ trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java trunk/client/src/test/java/org/teiid/jdbc/util/ trunk/client/src/test/java/org/teiid/net/ trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java trunk/client/src/test/java/org/teiid/net/socket/ trunk/common-core/src/main/java/org/ trunk/common-core/src/main/java/org/teiid/ trunk/common-core/src/main/java/org/teiid/core/ trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java trunk/common-core/src/main/java/org/teiid/core/TeiidException.java trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java trunk/common-core/src/main/java/org/teiid/core/crypto/ trunk/common-core/src/main/java/org/teiid/core/types/ trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java trunk/common-core/src/main/java/org/teiid/core/types/NullType.java trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java trunk/common-core/src/main/java/org/teiid/core/types/Transform.java trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java trunk/common-core/src/main/java/org/teiid/core/types/basic/ trunk/common-core/src/main/java/org/teiid/core/util/ trunk/common-core/src/test/java/org/ trunk/common-core/src/test/java/org/teiid/ trunk/common-core/src/test/java/org/teiid/core/ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java trunk/common-core/src/test/java/org/teiid/core/crypto/ trunk/common-core/src/test/java/org/teiid/core/types/ trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java trunk/common-core/src/test/java/org/teiid/core/types/basic/ trunk/common-core/src/test/java/org/teiid/core/util/ trunk/common-core/src/test/java/org/teiid/query/ trunk/common-core/src/test/java/org/teiid/query/unittest/ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/ trunk/connectors/connector-file/src/main/resources/org/teiid/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties trunk/connectors/connector-file/src/test/java/org/ trunk/connectors/connector-file/src/test/java/org/teiid/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/ trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java trunk/connectors/connector-ws/src/main/resources/org/ trunk/connectors/connector-ws/src/main/resources/org/teiid/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java trunk/console/src/main/resources/META-INF/rhq-plugin.xml trunk/engine/src/main/java/org/teiid/api/ trunk/engine/src/main/java/org/teiid/api/exception/ trunk/engine/src/main/java/org/teiid/api/exception/query/ trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java trunk/engine/src/main/java/org/teiid/common/ trunk/engine/src/main/java/org/teiid/common/buffer/ trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java trunk/engine/src/main/java/org/teiid/common/buffer/STree.java trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/impl/ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java trunk/engine/src/main/java/org/teiid/core/ trunk/engine/src/main/java/org/teiid/core/id/ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java trunk/engine/src/main/java/org/teiid/query/ trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java trunk/engine/src/main/java/org/teiid/query/analysis/ trunk/engine/src/main/java/org/teiid/query/eval/ trunk/engine/src/main/java/org/teiid/query/function/ trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java trunk/engine/src/main/java/org/teiid/query/function/aggregate/ trunk/engine/src/main/java/org/teiid/query/function/metadata/ trunk/engine/src/main/java/org/teiid/query/function/source/ trunk/engine/src/main/java/org/teiid/query/mapping/ trunk/engine/src/main/java/org/teiid/query/mapping/relational/ trunk/engine/src/main/java/org/teiid/query/mapping/xml/ trunk/engine/src/main/java/org/teiid/query/metadata/ trunk/engine/src/main/java/org/teiid/query/optimizer/ trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ trunk/engine/src/main/java/org/teiid/query/parser/ trunk/engine/src/main/java/org/teiid/query/processor/ trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ trunk/engine/src/main/java/org/teiid/query/processor/relational/ trunk/engine/src/main/java/org/teiid/query/processor/xml/ trunk/engine/src/main/java/org/teiid/query/report/ trunk/engine/src/main/java/org/teiid/query/resolver/ trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/command/ trunk/engine/src/main/java/org/teiid/query/resolver/util/ trunk/engine/src/main/java/org/teiid/query/rewriter/ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java trunk/engine/src/main/java/org/teiid/query/sql/ trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java trunk/engine/src/main/java/org/teiid/query/sql/lang/ trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java trunk/engine/src/main/java/org/teiid/query/sql/navigator/ trunk/engine/src/main/java/org/teiid/query/sql/proc/ trunk/engine/src/main/java/org/teiid/query/sql/symbol/ trunk/engine/src/main/java/org/teiid/query/sql/util/ trunk/engine/src/main/java/org/teiid/query/sql/visitor/ trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java trunk/engine/src/main/java/org/teiid/query/tempdata/ trunk/engine/src/main/java/org/teiid/query/util/ trunk/engine/src/main/java/org/teiid/query/validator/ trunk/engine/src/main/java/org/teiid/query/xquery/ trunk/engine/src/main/java/org/teiid/query/xquery/saxon/ trunk/engine/src/main/java/org/teiid/vdb/ trunk/engine/src/main/java/org/teiid/vdb/runtime/ trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/cache/ trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java trunk/engine/src/test/java/org/teiid/common/ trunk/engine/src/test/java/org/teiid/common/buffer/ trunk/engine/src/test/java/org/teiid/common/queue/ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java trunk/engine/src/test/java/org/teiid/query/ trunk/engine/src/test/java/org/teiid/query/analysis/ trunk/engine/src/test/java/org/teiid/query/function/ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java trunk/engine/src/test/java/org/teiid/query/function/metadata/ trunk/engine/src/test/java/org/teiid/query/function/source/ trunk/engine/src/test/java/org/teiid/query/mapping/ trunk/engine/src/test/java/org/teiid/query/mapping/xml/ trunk/engine/src/test/java/org/teiid/query/metadata/ trunk/engine/src/test/java/org/teiid/query/optimizer/ trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/test/java/org/teiid/query/optimizer/proc/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/test/java/org/teiid/query/optimizer/xml/ trunk/engine/src/test/java/org/teiid/query/parser/ trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java trunk/engine/src/test/java/org/teiid/query/processor/ trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/eval/ trunk/engine/src/test/java/org/teiid/query/processor/proc/ trunk/engine/src/test/java/org/teiid/query/processor/relational/ trunk/engine/src/test/java/org/teiid/query/processor/xml/ trunk/engine/src/test/java/org/teiid/query/resolver/ trunk/engine/src/test/java/org/teiid/query/rewriter/ trunk/engine/src/test/java/org/teiid/query/sql/ trunk/engine/src/test/java/org/teiid/query/sql/lang/ trunk/engine/src/test/java/org/teiid/query/sql/proc/ trunk/engine/src/test/java/org/teiid/query/sql/symbol/ trunk/engine/src/test/java/org/teiid/query/sql/util/ trunk/engine/src/test/java/org/teiid/query/sql/visitor/ trunk/engine/src/test/java/org/teiid/query/unittest/ trunk/engine/src/test/java/org/teiid/query/util/ trunk/engine/src/test/java/org/teiid/query/validator/ trunk/engine/src/test/java/org/teiid/vdb/ trunk/engine/src/test/java/org/teiid/vdb/runtime/ trunk/engine/src/test/resources/text/ trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv trunk/engine/src/test/resources/text/cdm_dos.txt trunk/engine/src/test/resources/text/cdm_dos_win.txt trunk/engine/src/test/resources/text/test-file.txt.csv trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java trunk/metadata/src/test/java/org/teiid/cdk/ trunk/metadata/src/test/java/org/teiid/cdk/api/ trunk/metadata/src/test/java/org/teiid/cdk/unittest/ trunk/metadata/src/test/java/org/teiid/core/ trunk/metadata/src/test/java/org/teiid/core/util/ trunk/metadata/src/test/java/org/teiid/internal/ trunk/metadata/src/test/java/org/teiid/internal/core/ trunk/metadata/src/test/java/org/teiid/internal/core/index/ trunk/pom.xml trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java trunk/runtime/src/main/java/org/teiid/transport/pg/ trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties trunk/runtime/src/main/resources/org/teiid/transport/ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java trunk/runtime/src/test/java/org/teiid/dqp/ trunk/runtime/src/test/java/org/teiid/dqp/service/ trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java trunk/test-integration/common/src/test/java/org/teiid/cdk/ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/ trunk/test-integration/common/src/test/java/org/teiid/dqp/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java trunk/test-integration/common/src/test/java/org/teiid/transport/ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected trunk/test-integration/db/src/main/java/org/teiid/internal/ trunk/test-integration/db/src/main/java/org/teiid/internal/core/ trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/ trunk/test-integration/db/src/test/java/com/ trunk/test-integration/db/src/test/java/org/teiid/internal/ trunk/test-integration/db/src/test/java/org/teiid/internal/core/ Log: forward merge of 7.6.1 Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x:3535-3555 /trunk:3188-3450,3452-3666 + /branches/7.4.x:3535-3555 /branches/7.6.x:3673-3711 /trunk:3188-3450,3452-3666 Property changes on: trunk/adminshell/src/main/java/groovy ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555* /trunk/adminshell/src/main/java/groovy:3507-3666 + /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555* /branches/7.6.x/adminshell/src/main/java/groovy:3673-3711* /trunk/adminshell/src/main/java/groovy:3507-3666 Property changes on: trunk/adminshell/src/main/java/groovy/sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555* /trunk/adminshell/src/main/java/groovy/sql:3507-3666 + /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555* /branches/7.6.x/adminshell/src/main/java/groovy/sql:3673-3711* /trunk/adminshell/src/main/java/groovy/sql:3507-3666 Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555 /trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3673-3711 /trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555* /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell:3673-3711* /trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666 + /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3666 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666 + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555 /branches/7.6.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3673-3711 /trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org:3535-3555* /trunk/adminshell/src/main/resources/org:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org:3673-3711* /trunk/adminshell/src/main/resources/org:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/codehaus ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/codehaus:3673-3711* /trunk/adminshell/src/main/resources/org/codehaus:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy:3673-3711* /trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3673-3711* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3673-3711* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555 /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555 /branches/7.6.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3673-3711 /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555* /trunk/adminshell/src/main/resources/org/teiid:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/teiid:3673-3711* /trunk/adminshell/src/main/resources/org/teiid:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555* /branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell:3673-3711* /trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555 /trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555 /branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3673-3711 /trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3666 Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555 /trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666 + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555 /branches/7.6.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3673-3711 /trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3666 Property changes on: trunk/adminshell/src/test/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/java/org:3535-3555* /trunk/adminshell/src/test/java/org:3507-3666 + /branches/7.4.x/adminshell/src/test/java/org:3535-3555* /branches/7.6.x/adminshell/src/test/java/org:3673-3711* /trunk/adminshell/src/test/java/org:3507-3666 Property changes on: trunk/adminshell/src/test/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555* /trunk/adminshell/src/test/java/org/teiid:3507-3666 + /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555* /branches/7.6.x/adminshell/src/test/java/org/teiid:3673-3711* /trunk/adminshell/src/test/java/org/teiid:3507-3666 Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666 + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555* /branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell:3673-3711* /trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3666 Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555 /trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666 + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555 /branches/7.6.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3673-3711 /trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3666 Property changes on: trunk/adminshell/src/test/resources/foo ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555* /trunk/adminshell/src/test/resources/foo:3507-3666 + /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555* /branches/7.6.x/adminshell/src/test/resources/foo:3673-3711* /trunk/adminshell/src/test/resources/foo:3507-3666 Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555 /trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666 + /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555 /branches/7.6.x/adminshell/src/test/resources/foo/bar.txt:3673-3711 /trunk/adminshell/src/test/resources/foo/bar.txt:3507-3666 Property changes on: trunk/api/src/main/java/org/teiid/events ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555* /trunk/api/src/main/java/org/teiid/events:3507-3666 + /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555* /branches/7.6.x/api/src/main/java/org/teiid/events:3673-3711* /trunk/api/src/main/java/org/teiid/events:3507-3666 Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555 /trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666 + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555 /branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributor.java:3673-3711 /trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3666 Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555 /trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666 + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555 /branches/7.6.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3673-3711 /trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3666 Property changes on: trunk/build/kits ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits:3535-3555* /trunk/build/kits:3507-3666 + /branches/7.4.x/build/kits:3535-3555* /branches/7.6.x/build/kits:3673-3711* /trunk/build/kits:3507-3666 Property changes on: trunk/build/kits/adminshell ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits/adminshell:3535-3555 /trunk/build/kits/adminshell:3507-3666 + /branches/7.4.x/build/kits/adminshell:3535-3555 /branches/7.6.x/build/kits/adminshell:3673-3711 /trunk/build/kits/adminshell:3507-3666 Property changes on: trunk/build/kits/jboss-container ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/build/kits/jboss-container:3535-3555 /trunk/build/kits/jboss-container:3507-3666 + /branches/7.4.x/build/kits/jboss-container:3535-3555 /branches/7.6.x/build/kits/jboss-container:3673-3711 /trunk/build/kits/jboss-container:3507-3666 Modified: trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml =================================================================== --- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -88,6 +88,7 @@ <bean name="VDBStatusChecker" class="org.teiid.deployers.VDBStatusChecker"> <property name="VDBRepository"><inject bean="VDBRepository"/></property> <property name="threadPool"><inject bean="jboss.system:service=ThreadPool"/></property> + <property name="translatorRepository"><inject bean="translatorRepository"/></property> </bean>  Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3673-3711* /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt 2011-12-01 17:33:11 UTC (rev 3713) @@ -38,18 +38,20 @@ 2. SOAP11 RPC call providing all of the parameter values for the invoke procedure. With a SOAP invocation, the action is used to convey the SOAPAction header value if needed. Also note the use of the endpoint here with an absolute URL, which will be used instead of the default -on the datasource. +on the datasource. We are also using the DefaultServiceMode of MESSAGE (see the weather-vdb.xml file) +to use the full SOAP message request and response. select xmlserialize(document w.result as string) from - (call weather.invoke(action=>'http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl#LatLonList...', - endpoint=>'http://www.weather.gov/forecasts/xml/SOAP_server/ndfdXMLserver.php', + (call weather.invoke(action=>'http://graphical.weather.gov/xml/SOAP_server/ndfdXMLserver.php#LatLonList...', + endpoint=>'http://graphical.weather.gov/xml/SOAP_server/ndfdXMLserver.php', binding=>'SOAP11', request=>' - <ns1:LatLonListZipCode xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:ns1="http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl"> - <zipCodeList xsi:type="ns2:zipCodeListType" xmlns:ns2="http://www.weather.gov/forecasts/xml/DWMLgen/schema/DWML.xsd">63303</zipCodeList> - </ns1:LatLonListZipCode>')) as w + <SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"> + <SOAP-ENV:Body> + <ns8077:LatLonListZipCode xmlns:ns8077="uri:DWMLgen"> + <listZipCodeList xsi:type="xsd:string">20910 25414</listZipCodeList> + </ns8077:LatLonListZipCode> + </SOAP-ENV:Body> + </SOAP-ENV:Envelope>')) as w -See the DatabaseMetadata on the invoke procedure for a full description of the parameters. - +See the Reference or retrieve the JDBC DatabaseMetadata on the invoke procedure for a full description of the parameters. Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -7,7 +7,7 @@ <rar-name>teiid-connector-ws.rar</rar-name> <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition> - <config-property name="EndPoint">http://www.weather.gov/forecasts/xml/sample_products/browser_interface/nd...</config-property> + <config-property name="EndPoint">http://graphical.weather.gov/xml/sample_products/browser_interface/ndfdXM...</config-property> <max-pool-size>20</max-pool-size> Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -2,7 +2,7 @@ <vdb name="weather" version="1">  @@ -16,6 +16,7 @@ <translator name="MessageWeather" type="ws"> <property name="DefaultBinding" value="HTTP"/> + <property name="DefaultServiceMode" value="MESSAGE"/> </translator> </vdb> \ No newline at end of file Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3535-3555 /branches/7.6.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3673-3711 /trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3507-3666 Modified: trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/build/kits/jboss-container/teiid-examples/simpleclient/run.bat 2011-12-01 17:33:11 UTC (rev 3713) @@ -2,7 +2,7 @@ set CLIENT_PATH=. rem Second one adds the Teiid client -set TEIID_PATH=../lib/teiid-${pom.version}-client.jar +set TEIID_PATH=../../lib/teiid-${pom.version}-client.jar java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient %* Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/cache-jbosscache/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -34,6 +34,11 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-clustering-jgroups</artifactId> <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file Property changes on: trunk/cache-jbosscache/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* /trunk/cache-jbosscache/src/main/java/org:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org:3673-3711* /trunk/cache-jbosscache/src/main/java/org:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/events ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/events:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3673-3711* /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/AddressWrapper.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555 /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555 /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666 + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555 /branches/7.6.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3673-3711 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3666 Property changes on: trunk/cache-jbosscache/src/test/java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* /trunk/cache-jbosscache/src/test/java:3507-3666 + /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* /branches/7.6.x/cache-jbosscache/src/test/java:3673-3711* /trunk/cache-jbosscache/src/test/java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555* /trunk/client/src/main/java/org/teiid/client/util:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555* /branches/7.6.x/client/src/main/java/org/teiid/client/util:3673-3711* /trunk/client/src/main/java/org/teiid/client/util:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3673-3711 /trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3673-3711 /trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3673-3711 /trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3673-3711 /trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3666 Modified: trunk/client/src/main/java/org/teiid/gss/MakeGSS.java =================================================================== --- trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/client/src/main/java/org/teiid/gss/MakeGSS.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -67,8 +67,42 @@ Object result = null; - String jaasApplicationName = props.getProperty(TeiidURL.CONNECTION.JAAS_NAME, "teiid"); //$NON-NLS-1$ - String kerberosPrincipalName = props.getProperty(TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME, "teiid"); //$NON-NLS-1$ + StringBuilder errors = new StringBuilder(); + String jaasApplicationName = props.getProperty(TeiidURL.CONNECTION.JAAS_NAME); + String nl = System.getProperty("line.separator");//$NON-NLS-1$ + if (jaasApplicationName == null) { + errors.append(JDBCPlugin.Util.getString("client_prop_missing", TeiidURL.CONNECTION.JAAS_NAME)); //$NON-NLS-1$ + errors.append(nl); + } + + String kerberosPrincipalName = props.getProperty(TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME); + if (kerberosPrincipalName == null) { + errors.append(JDBCPlugin.Util.getString("client_prop_missing", TeiidURL.CONNECTION.KERBEROS_SERVICE_PRINCIPLE_NAME)); //$NON-NLS-1$ + errors.append(nl); + } + + String realm = System.getProperty("java.security.krb5.realm"); //$NON-NLS-1$ + if (realm == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.krb5.realm")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + String kdc = System.getProperty("java.security.krb5.kdc"); //$NON-NLS-1$ + if (kdc == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.krb5.kdc")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + String config = System.getProperty("java.security.auth.login.config"); //$NON-NLS-1$ + if (config == null) { + errors.append(JDBCPlugin.Util.getString("system_prop_missing", "java.security.auth.login.config")); //$NON-NLS-1$ //$NON-NLS-2$ + errors.append(nl); + } + + if (errors.length() > 0) { + throw new LogonException(errors.toString()); + } + String user = props.getProperty(TeiidURL.CONNECTION.USER_NAME); String password = props.getProperty(TeiidURL.CONNECTION.PASSWORD); Property changes on: trunk/client/src/main/java/org/teiid/jdbc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555* /trunk/client/src/main/java/org/teiid/jdbc:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555* /branches/7.6.x/client/src/main/java/org/teiid/jdbc:3673-3711* /trunk/client/src/main/java/org/teiid/jdbc:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666 + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/NonBlockingRowProcessor.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666 + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/StatementCallback.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666 + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidPreparedStatement.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666 + /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555* /trunk/client/src/main/java/org/teiid/net/socket:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555* /branches/7.6.x/client/src/main/java/org/teiid/net/socket:3673-3711* /trunk/client/src/main/java/org/teiid/net/socket:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666 + /branches/7.6.x/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/AuthenticationType.java:3598-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Message.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/Message.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3666 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555 /branches/7.6.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3673-3711 /trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3666 Property changes on: trunk/client/src/main/resources/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/resources/org:3535-3555* /trunk/client/src/main/resources/org:3507-3666 + /branches/7.4.x/client/src/main/resources/org:3535-3555* /branches/7.6.x/client/src/main/resources/org:3673-3711* /trunk/client/src/main/resources/org:3507-3666 Property changes on: trunk/client/src/main/resources/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555* /trunk/client/src/main/resources/org/teiid:3507-3666 + /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555* /branches/7.6.x/client/src/main/resources/org/teiid:3673-3711* /trunk/client/src/main/resources/org/teiid:3507-3666 Property changes on: trunk/client/src/main/resources/org/teiid/jdbc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555 /trunk/client/src/main/resources/org/teiid/jdbc:3507-3666 + /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555 /branches/7.6.x/client/src/main/resources/org/teiid/jdbc:3673-3711 /trunk/client/src/main/resources/org/teiid/jdbc:3507-3666 Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties =================================================================== --- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -155,3 +155,5 @@ no_krb_ticket=No cached kerberos ticket found and/or no password supplied gss_auth_failed=GSS Authentication failed setup_failed=Protocol error. Session setup failed. +client_prop_missing=Client URL connection property missing "{0}". Please add the property to connection URL. +system_prop_missing=System property "{0}" missing, please add using -D option on the VM startup script. \ No newline at end of file Property changes on: trunk/client/src/main/resources/org/teiid/net ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555* /trunk/client/src/main/resources/org/teiid/net:3507-3666 + /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555* /branches/7.6.x/client/src/main/resources/org/teiid/net:3673-3711* /trunk/client/src/main/resources/org/teiid/net:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/plan ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555* /trunk/client/src/test/java/org/teiid/client/plan:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555* /branches/7.6.x/client/src/test/java/org/teiid/client/plan:3673-3711* /trunk/client/src/test/java/org/teiid/client/plan:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3673-3711 /trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555* /trunk/client/src/test/java/org/teiid/client/util:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555* /branches/7.6.x/client/src/test/java/org/teiid/client/util:3673-3711* /trunk/client/src/test/java/org/teiid/client/util:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3673-3711 /trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3673-3711 /trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555* /trunk/client/src/test/java/org/teiid/jdbc:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555* /branches/7.6.x/client/src/test/java/org/teiid/jdbc:3673-3711* /trunk/client/src/test/java/org/teiid/jdbc:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/jdbc/util:3673-3711 /trunk/client/src/test/java/org/teiid/jdbc/util:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/net ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555* /trunk/client/src/test/java/org/teiid/net:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555* /branches/7.6.x/client/src/test/java/org/teiid/net:3673-3711* /trunk/client/src/test/java/org/teiid/net:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555 /trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3673-3711 /trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3666 Property changes on: trunk/client/src/test/java/org/teiid/net/socket ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555 /trunk/client/src/test/java/org/teiid/net/socket:3507-3666 + /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555 /branches/7.6.x/client/src/test/java/org/teiid/net/socket:3673-3711 /trunk/client/src/test/java/org/teiid/net/socket:3507-3666 Property changes on: trunk/common-core/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org:3535-3555* /trunk/common-core/src/main/java/org:3507-3666 + /branches/7.4.x/common-core/src/main/java/org:3535-3555* /branches/7.6.x/common-core/src/main/java/org:3673-3711* /trunk/common-core/src/main/java/org:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555* /trunk/common-core/src/main/java/org/teiid:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555* /branches/7.6.x/common-core/src/main/java/org/teiid:3673-3711* /trunk/common-core/src/main/java/org/teiid:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555* /trunk/common-core/src/main/java/org/teiid/core:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555* /branches/7.6.x/common-core/src/main/java/org/teiid/core:3673-3711* /trunk/common-core/src/main/java/org/teiid/core:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/crypto:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555* /trunk/common-core/src/main/java/org/teiid/core/types:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555* /branches/7.6.x/common-core/src/main/java/org/teiid/core/types:3673-3711* /trunk/common-core/src/main/java/org/teiid/core/types:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/NullType.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Transform.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/basic ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/types/basic:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3666 Property changes on: trunk/common-core/src/main/java/org/teiid/core/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/util:3507-3666 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555 /branches/7.6.x/common-core/src/main/java/org/teiid/core/util:3673-3711 /trunk/common-core/src/main/java/org/teiid/core/util:3507-3666 Property changes on: trunk/common-core/src/test/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org:3535-3555* /trunk/common-core/src/test/java/org:3507-3666 + /branches/7.4.x/common-core/src/test/java/org:3535-3555* /branches/7.6.x/common-core/src/test/java/org:3673-3711* /trunk/common-core/src/test/java/org:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555* /trunk/common-core/src/test/java/org/teiid:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555* /branches/7.6.x/common-core/src/test/java/org/teiid:3673-3711* /trunk/common-core/src/test/java/org/teiid:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555* /trunk/common-core/src/test/java/org/teiid/core:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555* /branches/7.6.x/common-core/src/test/java/org/teiid/core:3673-3711* /trunk/common-core/src/test/java/org/teiid/core:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/crypto:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555* /trunk/common-core/src/test/java/org/teiid/core/types:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555* /branches/7.6.x/common-core/src/test/java/org/teiid/core/types:3673-3711* /trunk/common-core/src/test/java/org/teiid/core/types:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/basic ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/types/basic:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/core/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/util:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/core/util:3673-3711 /trunk/common-core/src/test/java/org/teiid/core/util:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/query ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555* /trunk/common-core/src/test/java/org/teiid/query:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555* /branches/7.6.x/common-core/src/test/java/org/teiid/query:3673-3711* /trunk/common-core/src/test/java/org/teiid/query:3507-3666 Property changes on: trunk/common-core/src/test/java/org/teiid/query/unittest ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555 /trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666 + /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555 /branches/7.6.x/common-core/src/test/java/org/teiid/query/unittest:3673-3711 /trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3673-3711* /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555 /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555 /branches/7.6.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3673-3711 /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555* /trunk/connectors/connector-file/src/main/resources/org:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/resources/org:3673-3711* /trunk/connectors/connector-file/src/main/resources/org:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid:3673-3711* /trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource:3673-3711* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3673-3711* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555* /branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3673-3711* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3666 Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555 /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666 + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555 /branches/7.6.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3673-3711 /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555* /trunk/connectors/connector-file/src/test/java/org:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555* /branches/7.6.x/connectors/connector-file/src/test/java/org:3673-3711* /trunk/connectors/connector-file/src/test/java/org:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555* /branches/7.6.x/connectors/connector-file/src/test/java/org/teiid:3673-3711* /trunk/connectors/connector-file/src/test/java/org/teiid:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555* /branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource:3673-3711* /trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555* /branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3673-3711* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555* /branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3673-3711* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3666 Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555 /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666 + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555 /branches/7.6.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3673-3711 /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3666 Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666 + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555* /branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3673-3711* /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3666 Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555 /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666 + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555 /branches/7.6.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3673-3711 /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3666 Modified: trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java =================================================================== --- trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -1,3 +1,25 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + package org.teiid.resource.adapter.ws; import java.io.IOException; @@ -188,6 +210,9 @@ String defaultEndpoint = mcf.getEndPoint(); String defaultQueryString = null; String defaultFragment = null; + if (defaultEndpoint == null) { + throw new WebServiceException(WSManagedConnectionFactory.UTIL.getString("null_default_endpoint")); //$NON-NLS-1$ + } String[] parts = defaultEndpoint.split("\\?", 2); //$NON-NLS-1$ defaultEndpoint = parts[0]; if (parts.length > 1) { @@ -212,6 +237,9 @@ } } else { endpoint = mcf.getEndPoint(); + if (endpoint == null) { + throw new WebServiceException(WSManagedConnectionFactory.UTIL.getString("null_endpoint")); //$NON-NLS-1$ + } } Dispatch<T> dispatch = null; if (HTTPBinding.HTTP_BINDING.equals(binding) && type == DataSource.class) { Property changes on: trunk/connectors/connector-ws/src/main/resources/org ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555* /branches/7.6.x/connectors/connector-ws/src/main/resources/org:3673-3711* /trunk/connectors/connector-ws/src/main/resources/org:3507-3666 Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555* /branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid:3673-3711* /trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3666 Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555* /branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3673-3711* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3666 Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555* /branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3673-3711* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3666 Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555* /branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3673-3711* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3666 Modified: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties =================================================================== --- trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -20,3 +20,5 @@ # 02110-1301 USA. # +null_endpoint=An endpoint must be specified by the procedure call or have a default value set by the EndPoint datasource property. +null_default_endpoint=The use of a relative endpoint in a procedure call requires a a default endpoint on the datasource. \ No newline at end of file Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555 /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666 + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555 /branches/7.6.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3673-3711 /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3666 Deleted: trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java =================================================================== --- branches/7.6.x/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 02:03:44 UTC (rev 3711) +++ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.resource.adapter.ws; - -import javax.resource.ResourceException; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.http.HTTPBinding; - -import org.junit.Test; - -public class TestWSAdapter { - - @Test(expected=WebServiceException.class) public void testMissingEndpoint() throws ResourceException { - WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); - - WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); - conn.createDispatch(HTTPBinding.HTTP_BINDING, null, StreamSource.class, Mode.PAYLOAD); - } - - @Test(expected=WebServiceException.class) public void testMissingEndpoint1() throws ResourceException { - WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); - - WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); - conn.createDispatch(HTTPBinding.HTTP_BINDING, "/x", StreamSource.class, Mode.PAYLOAD); //$NON-NLS-1$ - } - -} Copied: trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java (from rev 3711, branches/7.6.x/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java) =================================================================== --- trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java (rev 0) +++ trunk/connectors/connector-ws/src/test/java/org/teiid/resource/adapter/ws/TestWSAdapter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.resource.adapter.ws; + +import javax.resource.ResourceException; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.http.HTTPBinding; + +import org.junit.Test; + +public class TestWSAdapter { + + @Test(expected=WebServiceException.class) public void testMissingEndpoint() throws ResourceException { + WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); + + WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); + conn.createDispatch(HTTPBinding.HTTP_BINDING, null, StreamSource.class, Mode.PAYLOAD); + } + + @Test(expected=WebServiceException.class) public void testMissingEndpoint1() throws ResourceException { + WSManagedConnectionFactory wsmcf = new WSManagedConnectionFactory(); + + WSConnectionImpl conn = (WSConnectionImpl)wsmcf.createConnectionFactory().getConnection(); + conn.createDispatch(HTTPBinding.HTTP_BINDING, "/x", StreamSource.class, Mode.PAYLOAD); //$NON-NLS-1$ + } + +} Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555 /trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666 + /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555 /branches/7.6.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3673-3711 /trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3598-3666 Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -211,9 +211,9 @@ if (obj.getArguments().get(i).getDirection() != Direction.IN) { throw new IllegalArgumentException(JDBCPlugin.Util.getString("SQLConversionVisitor.not_in_parameter", i+1)); //$NON-NLS-1$ } - visit(obj.getArguments().get(i)); + buffer.append('?'); if (this.prepared) { - this.preparedValues.add(obj.getArguments()); + this.preparedValues = obj.getArguments(); } } } Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -70,6 +70,7 @@ import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.JDBCPlugin; import org.teiid.translator.jdbc.LocateFunctionModifier; +import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TranslatedCommand; @@ -606,8 +607,8 @@ public List<?> translate(LanguageObject obj, ExecutionContext context) { if (oracleSuppliedDriver && obj instanceof Call) { Call call = (Call)obj; - //oracle returns the resultset as a parameter - if (call.getReturnType() == null) { + if (call.getReturnType() == null && call.getMetadataObject() != null && call.getMetadataObject().getProperties().get(SQLConversionVisitor.TEIID_NATIVE_QUERY) == null) { + //oracle returns the resultset as a parameter call.setReturnType(RefCursorType.class); } } Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555* /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666 + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555* /branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3673-3711* /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3666 Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666 + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555 /branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3673-3711 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3666 Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666 + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555 /branches/7.6.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3673-3711 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3666 Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -27,6 +27,7 @@ import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; +import java.sql.Types; import java.util.Arrays; import java.util.List; @@ -875,11 +876,30 @@ @Test public void testNativeQueryProc() throws Exception { String input = "call proc(2)"; //$NON-NLS-1$ - String output = "select x from y where z = 2"; //$NON-NLS-1$ + String output = "select x from y where z = ?"; //$NON-NLS-1$ QueryMetadataInterface metadata = getOracleSpecificMetadata(); helpTestVisitor(metadata, input, EMPTY_CONTEXT, null, output); } + + @Test public void testNativeQueryProcPreparedExecution() throws Exception { + CommandBuilder commandBuilder = new CommandBuilder(getOracleSpecificMetadata()); + Command command = commandBuilder.getCommand("call proc(2)"); + Connection connection = Mockito.mock(Connection.class); + CallableStatement cs = Mockito.mock(CallableStatement.class); + Mockito.stub(cs.getUpdateCount()).toReturn(-1); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.stub(cs.getObject(1)).toReturn(rs); + Mockito.stub(cs.getInt(3)).toReturn(4); + Mockito.stub(connection.prepareCall("select x from y where z = ?")).toReturn(cs); //$NON-NLS-1$ + OracleExecutionFactory ef = new OracleExecutionFactory(); + + JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), ef); + procedureExecution.execute(); + Mockito.verify(cs, Mockito.never()).registerOutParameter(1, OracleExecutionFactory.CURSOR_TYPE); + Mockito.verify(cs, Mockito.never()).getObject(1); + Mockito.verify(cs, Mockito.times(1)).setObject(1, 2, Types.INTEGER); + } } Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555* /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666 + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555* /branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3673-3711* /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3666 Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555 /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666 + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555 /branches/7.6.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3673-3711 /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3666 Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -167,5 +167,10 @@ public boolean supportsCompareCriteriaOrdered() { return true; } + + @Override + public boolean supportsIsNullCriteria() { + return true; + } } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,8 +21,8 @@ */ package org.teiid.translator.salesforce; -import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Date; import org.teiid.translator.TranslatorException; @@ -56,16 +56,14 @@ } } - public static SimpleDateFormat getSalesforceDateTimeFormat() { - return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); //$NON-NLS-1$ - } + private static String timeZone; - public static SimpleDateFormat getTimeZoneOffsetFormat() { - return new SimpleDateFormat("Z"); //$NON-NLS-1$ + public static String getDefaultTimeZoneString() { + if (timeZone == null) { + String s = new SimpleDateFormat("Z").format(new Date(0)); //$NON-NLS-1$ + timeZone = s.substring(0, 3) + ':' + s.substring(3, 5); + } + return timeZone; } - public static DateFormat getSalesforceDateFormat() { - return new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$ - } - } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,18 +21,23 @@ */ package org.teiid.translator.salesforce.execution; +import java.sql.Time; import java.sql.Timestamp; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.resource.ResourceException; +import org.teiid.core.util.TimestampWithTimezone; import org.teiid.language.AggregateFunction; import org.teiid.language.Join; import org.teiid.language.QueryExpression; @@ -51,7 +56,6 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.salesforce.SalesForcePlugin; import org.teiid.translator.salesforce.SalesforceConnection; -import org.teiid.translator.salesforce.Util; import org.teiid.translator.salesforce.execution.visitors.JoinQueryVisitor; import org.teiid.translator.salesforce.execution.visitors.SelectVisitor; import org.w3c.dom.Element; @@ -63,6 +67,8 @@ public class QueryExecutionImpl implements ResultSetExecution { + private static final Pattern dateTimePattern = Pattern.compile("^(?:(\\d{4}-\\d{2}-\\d{2})T)?(\\d{2}:\\d{2}:\\d{2}(?:.\\d+)?)(.*)"); //$NON-NLS-1$ + private static final String SF_ID = "sf:Id"; //$NON-NLS-1$ private static final String SF_TYPE = "sf:type"; //$NON-NLS-1$ @@ -78,7 +84,6 @@ private RuntimeMetadata metadata; private ExecutionContext context; - private SelectVisitor visitor; @@ -103,6 +108,8 @@ private int topResultIndex = 0; + private Calendar cal; + public QueryExecutionImpl(QueryExpression command, SalesforceConnection connection, RuntimeMetadata metadata, ExecutionContext context) { this.connection = connection; this.metadata = metadata; @@ -355,7 +362,7 @@ } } - private void logFields(String sObjectName, List<Object> fields) throws TranslatorException { + private void logFields(String sObjectName, List<Object> fields) { if (!LogManager.isMessageToBeRecorded(LogConstants.CTX_CONNECTOR, MessageLevel.DETAIL)) { return; } @@ -369,53 +376,75 @@ } + /** + * TODO: the logic here should be aware of xsi:type information and use a standard conversion + * library. Conversion to teiid types should then be a secondary effort - and will be automatically handled above here. + */ @SuppressWarnings("unchecked") private Object getCellDatum(Column element, Element elem) throws TranslatorException { if(!element.getNameInSource().equals(elem.getLocalName())) { throw new TranslatorException(SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.column.mismatch1") + element.getNameInSource() + SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.column.mismatch2") + elem.getLocalName()); //$NON-NLS-1$ //$NON-NLS-2$ } + if (Boolean.parseBoolean(elem.getAttribute(XSI_NIL))) { + return null; + } String value = elem.getTextContent(); - Object result = null; + Object result = value; Class type = element.getJavaType(); if(type.equals(String.class)) { result = value; - } - else if (type.equals(Boolean.class)) { - result = Boolean.valueOf(value); - } else if (type.equals(Double.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = Double.valueOf(value); + } else if (!value.isEmpty()) { + result = value; + if (type.equals(java.sql.Timestamp.class) || type.equals(java.sql.Time.class)) { + if (cal == null) { + cal = Calendar.getInstance(); } + result = parseDateTime(value, type, cal); } - } else if (type.equals(Integer.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = Integer.valueOf(value); + } + return result; + } + + static Object parseDateTime(String value, Class<?> type, Calendar cal) + throws TranslatorException { + try { + Matcher m = dateTimePattern.matcher(value); + if (m.matches()) { + String date = m.group(1); + String time = m.group(2); + String timeZone = m.group(3); + Date d = null; + if (date == null) { + //sql times don't care about fractional seconds + int milli = time.lastIndexOf('.'); + if (milli > 0) { + time = time.substring(0, milli); + } + d = Time.valueOf(time); + } else { + d = Timestamp.valueOf(date + " " + time); //$NON-NLS-1$ } - } - } else if (type.equals(java.sql.Date.class)) { - if (null != value) { - if(!value.isEmpty()) { - result = java.sql.Date.valueOf(value); - } - } - } else if (type.equals(java.sql.Timestamp.class)) { - if (null != value) { - if(!value.isEmpty()) { - try { - Date date = Util.getSalesforceDateTimeFormat().parse(value); - result = new Timestamp(date.getTime()); - } catch (ParseException e) { - throw new TranslatorException(e, SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ + TimeZone tz = null; + if (timeZone != null) { + if (timeZone.equals("Z")) { //$NON-NLS-1$ + tz = TimeZone.getTimeZone("GMT"); //$NON-NLS-1$ + } else if (timeZone.contains(":")) { //$NON-NLS-1$ + tz = TimeZone.getTimeZone("GMT" + timeZone); //$NON-NLS-1$ + } else { + //this is probably an exceptional case + tz = TimeZone.getTimeZone(timeZone); } + cal.setTimeZone(tz); + } else { + cal = null; } + return TimestampWithTimezone.create(d, TimeZone.getDefault(), cal, type); } - } else { - result = value; + throw new TranslatorException(SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { + throw new TranslatorException(e, SalesForcePlugin.Util.getString("SalesforceQueryExecutionImpl.datatime.parse") + value); //$NON-NLS-1$ } - return result; } private boolean isSObject(Element element) { Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/CriteriaVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -24,18 +24,21 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.teiid.core.util.TimestampWithTimezone; import org.teiid.language.AndOr; import org.teiid.language.ColumnReference; import org.teiid.language.Comparison; import org.teiid.language.Expression; import org.teiid.language.Function; import org.teiid.language.In; +import org.teiid.language.IsNull; import org.teiid.language.Like; import org.teiid.language.Literal; import org.teiid.language.NamedTable; @@ -80,7 +83,7 @@ protected Table table; boolean onlyIDCriteria; protected Boolean queryAll = Boolean.FALSE; - + // support for invoking a retrieve when possible. protected In idInCriteria = null; @@ -98,33 +101,28 @@ @Override public void visit( Comparison criteria ) { - super.visit(criteria); - try { - addCompareCriteria(criteriaList, criteria); - boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); - setHasCriteria(true, isAcceptableID); - if (isAcceptableID) { - this.idInCriteria = new In(criteria.getLeftExpression(), Arrays.asList(criteria.getRightExpression()), false); - } - } catch (TranslatorException e) { - exceptions.add(e); + addCompareCriteria(criteria); + boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); + setHasCriteria(true, isAcceptableID); + if (isAcceptableID) { + this.idInCriteria = new In(criteria.getLeftExpression(), Arrays.asList(criteria.getRightExpression()), false); } } - + + public void visit(IsNull obj) { + visit(new Comparison(obj.getExpression(), new Literal(null, obj.getExpression().getType()), obj.isNegated()?Comparison.Operator.NE:Comparison.Operator.EQ)); + } + @Override public void visit( Like criteria ) { - try { - if (isIdColumn(criteria.getLeftExpression())) { - TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.Id")); //$NON-NLS-1$ - exceptions.add(e); - } - if (isMultiSelectColumn(criteria.getLeftExpression())) { - TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); //$NON-NLS-1$ - exceptions.add(e); - } - } catch (TranslatorException e) { + if (isIdColumn(criteria.getLeftExpression())) { + TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.Id")); //$NON-NLS-1$ exceptions.add(e); } + if (isMultiSelectColumn(criteria.getLeftExpression())) { + TranslatorException e = new TranslatorException(SalesForcePlugin.Util.getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); //$NON-NLS-1$ + exceptions.add(e); + } boolean negated = criteria.isNegated(); criteria.setNegated(false); criteriaList.add(criteria.toString()); @@ -135,7 +133,7 @@ // don't check if it's ID, Id LIKE '123%' still requires a query setHasCriteria(true, false); } - + @Override public void visit(AndOr obj) { List<String> savedCriteria = new LinkedList<String>(); @@ -170,23 +168,19 @@ @Override public void visit( In criteria ) { - try { - Expression lExpr = criteria.getLeftExpression(); - if (lExpr instanceof ColumnReference) { - ColumnReference cr = (ColumnReference)lExpr; - Column column = cr.getMetadataObject(); - if (column != null && (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) || RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))) { - appendMultiselectIn(column, criteria); - } else { - appendCriteria(criteria); - } + Expression lExpr = criteria.getLeftExpression(); + if (lExpr instanceof ColumnReference) { + ColumnReference cr = (ColumnReference)lExpr; + Column column = cr.getMetadataObject(); + if (column != null && (MULTIPICKLIST.equalsIgnoreCase(column.getNativeType()) || RESTRICTEDMULTISELECTPICKLIST.equalsIgnoreCase(column.getNativeType()))) { + appendMultiselectIn(column, criteria); } else { - appendCriteria(criteria); + appendCriteria(criteria); } - setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); - } catch (TranslatorException e) { - exceptions.add(e); + } else { + appendCriteria(criteria); } + setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); } public void parseFunction( Function func ) { @@ -215,7 +209,7 @@ } private void appendMultiselectIn( Column column, - In criteria ) throws TranslatorException { + In criteria ) { StringBuffer result = new StringBuffer(); result.append(column.getNameInSource()).append(SPACE); if (criteria.isNegated()) { @@ -270,9 +264,8 @@ } criterion.append(CLOSE); } - - protected void addCompareCriteria( List criteriaList, - Comparison compCriteria ) throws TranslatorException { + + protected void addCompareCriteria(Comparison compCriteria ) { Expression lExpr = compCriteria.getLeftExpression(); if (lExpr instanceof Function) { parseFunction((Function)lExpr); @@ -280,38 +273,13 @@ ColumnReference left = (ColumnReference)lExpr; Column column = left.getMetadataObject(); String columnName = column.getNameInSource(); - StringBuffer queryString = new StringBuffer(); - queryString.append(column.getParent().getNameInSource()); - queryString.append('.'); - queryString.append(columnName).append(SPACE); + StringBuilder queryString = new StringBuilder(); + appendColumnReference(queryString, left); + queryString.append(SPACE); queryString.append(comparisonOperators.get(compCriteria.getOperator())); queryString.append(' '); Expression rExp = compCriteria.getRightExpression(); - if(rExp instanceof Literal) { - Literal literal = (Literal)rExp; - if (column.getJavaType().equals(Boolean.class)) { - queryString.append(((Boolean)literal.getValue()).toString()); - } else if (column.getJavaType().equals(java.sql.Timestamp.class)) { - Timestamp datetime = (java.sql.Timestamp)literal.getValue(); - String value = Util.getSalesforceDateTimeFormat().format(datetime); - String zoneValue = Util.getTimeZoneOffsetFormat().format(datetime); - queryString.append(value).append(zoneValue.subSequence(0, 3)).append(':').append(zoneValue.subSequence(3, 5)); - } else if (column.getJavaType().equals(java.sql.Time.class)) { - String value = Util.getSalesforceDateTimeFormat().format((java.sql.Time)literal.getValue()); - queryString.append(value); - } else if (column.getJavaType().equals(java.sql.Date.class)) { - String value = Util.getSalesforceDateFormat().format((java.sql.Date)literal.getValue()); - queryString.append(value); - } else { - queryString.append(compCriteria.getRightExpression().toString()); - } - } else if(rExp instanceof ColumnReference) { - ColumnReference right = (ColumnReference)lExpr; - column = left.getMetadataObject(); - columnName = column.getNameInSource(); - queryString.append(columnName); - } - + queryString.append(getValue(rExp, false)); criteriaList.add(queryString.toString()); if (columnName.equals("IsDeleted")) { //$NON-NLS-1$ @@ -324,56 +292,86 @@ } } - private void appendCriteria( In criteria ) throws TranslatorException { + private void appendColumnReference(StringBuilder queryString, + ColumnReference ref) { + queryString.append(ref.getMetadataObject().getParent().getNameInSource()); + queryString.append('.'); + queryString.append(ref.getMetadataObject().getNameInSource()); + } + + private void appendCriteria( In criteria ) { StringBuffer queryString = new StringBuffer(); Expression leftExp = criteria.getLeftExpression(); if(isIdColumn(leftExp)) { idInCriteria = criteria; } - queryString.append(getValue(leftExp)); + queryString.append(getValue(leftExp, false)); queryString.append(' '); if (criteria.isNegated()) { queryString.append("NOT "); //$NON-NLS-1$ } queryString.append("IN"); //$NON-NLS-1$ queryString.append('('); - Column column = ((ColumnReference)criteria.getLeftExpression()).getMetadataObject(); - boolean timeColumn = isTimeColumn(column); - boolean first = true; - Iterator iter = criteria.getRightExpressions().iterator(); + Iterator<Expression> iter = criteria.getRightExpressions().iterator(); while (iter.hasNext()) { - if (!first) queryString.append(','); - if (!timeColumn) queryString.append('\''); - queryString.append(getValue((Expression)iter.next())); - if (!timeColumn) queryString.append('\''); - first = false; + queryString.append(getValue(iter.next(), false)); + if (iter.hasNext()) { + queryString.append(','); + } } queryString.append(')'); criteriaList.add(queryString.toString()); } - - private boolean isTimeColumn( Column column ) throws TranslatorException { - boolean result = false; - if (column.getJavaType().equals(java.sql.Timestamp.class) || column.getJavaType().equals(java.sql.Time.class) - || column.getJavaType().equals(java.sql.Date.class)) { - result = true; - } - return result; - } - - protected String getValue( Expression expr ) throws TranslatorException { - String result; + + protected String getValue( Expression expr, boolean raw) { + StringBuilder result = new StringBuilder(); if (expr instanceof ColumnReference) { - ColumnReference element = (ColumnReference)expr; - Column element2 = element.getMetadataObject(); - result = element2.getNameInSource(); + appendColumnReference(result, (ColumnReference)expr); } else if (expr instanceof Literal) { - Literal literal = (Literal)expr; - result = literal.getValue().toString(); + Literal literal = (Literal)expr; + if (literal.getValue() == null) { + if (raw) { + return null; + } + return "NULL"; //$NON-NLS-1$ + } + if (raw) { + return literal.getValue().toString(); + } + if (literal.getValue().getClass().equals(Boolean.class)) { + result.append(((Boolean)literal.getValue()).toString()); + } else if (literal.getValue().getClass().equals(java.sql.Timestamp.class)) { + Timestamp datetime = (java.sql.Timestamp)literal.getValue(); + String value = datetime.toString(); + int fractionalPlace = value.lastIndexOf('.'); + int fractionalLength = value.length() - fractionalPlace - 1; + if (fractionalLength > 3) { + value = value.substring(0, fractionalPlace + 3); + } else if (fractionalLength < 3) { + value += "00".substring(fractionalLength - 1); //$NON-NLS-1$ + } + result.append(value).setCharAt(result.length()-value.length()+10, 'T'); + Calendar c = TimestampWithTimezone.getCalendar(); + c.setTime(datetime); + int minutes = (c.get(Calendar.ZONE_OFFSET) + + c.get(Calendar.DST_OFFSET)) / 60000; + int val = minutes/60; + result.append(String.format("%1$+03d", val)); //$NON-NLS-1$ + result.append(':'); + val = minutes%60; + result.append(val/10); + result.append(val%10); + } else if (literal.getValue().getClass().equals(java.sql.Time.class)) { + result.append(literal.getValue()).append(".000").append(Util.getDefaultTimeZoneString()); //$NON-NLS-1$ + } else if (literal.getValue().getClass().equals(java.sql.Date.class)) { + result.append(literal.getValue()); + } else { + result.append(expr.toString()); + } } else { throw new RuntimeException("unknown type in SalesforceQueryExecution.getValue(): " + expr.toString()); //$NON-NLS-1$ } - return result; + return result.toString(); } protected void loadColumnMetadata( NamedTable group ) throws TranslatorException { @@ -394,7 +392,7 @@ } } - protected boolean isIdColumn( Expression expression ) throws TranslatorException { + protected boolean isIdColumn( Expression expression ) { boolean result = false; if (expression instanceof ColumnReference) { Column element = ((ColumnReference)expression).getMetadataObject(); @@ -406,7 +404,7 @@ return result; } - protected boolean isMultiSelectColumn( Expression expression ) throws TranslatorException { + protected boolean isMultiSelectColumn( Expression expression ) { boolean result = false; if (expression instanceof ColumnReference) { Column element = ((ColumnReference)expression).getMetadataObject(); Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -63,39 +63,34 @@ @Override public void visit(Comparison criteria) { - // Find the criteria that joins the two tables - try { - Expression rExp = criteria.getRightExpression(); - if (rExp instanceof ColumnReference) { - Expression lExp = criteria.getLeftExpression(); - if (isIdColumn(rExp) || isIdColumn(lExp)) { + Expression rExp = criteria.getRightExpression(); + if (rExp instanceof ColumnReference) { + Expression lExp = criteria.getLeftExpression(); + if (isIdColumn(rExp) || isIdColumn(lExp)) { - Column rColumn = ((ColumnReference) rExp).getMetadataObject(); - String rTableName = rColumn.getParent().getNameInSource(); + Column rColumn = ((ColumnReference) rExp).getMetadataObject(); + String rTableName = rColumn.getParent().getNameInSource(); - Column lColumn = ((ColumnReference) lExp).getMetadataObject(); - String lTableName = lColumn.getParent().getNameInSource(); + Column lColumn = ((ColumnReference) lExp).getMetadataObject(); + String lTableName = lColumn.getParent().getNameInSource(); - if (leftTableInJoin.getNameInSource().equals(rTableName) - || leftTableInJoin.getNameInSource().equals(lTableName) - && rightTableInJoin.getNameInSource().equals(rTableName) - || rightTableInJoin.getNameInSource().equals(lTableName) - && !rTableName.equals(lTableName)) { - // This is the join criteria, the one that is the ID is the parent. - Expression fKey = !isIdColumn(lExp) ? lExp : rExp; - table = childTable = (Table)((ColumnReference) fKey).getMetadataObject().getParent(); - } else { - // Only add the criteria to the query if it is not the join criteria. - // The join criteria is implicit in the salesforce syntax. - super.visit(criteria); - } + if (leftTableInJoin.getNameInSource().equals(rTableName) + || leftTableInJoin.getNameInSource().equals(lTableName) + && rightTableInJoin.getNameInSource().equals(rTableName) + || rightTableInJoin.getNameInSource().equals(lTableName) + && !rTableName.equals(lTableName)) { + // This is the join criteria, the one that is the ID is the parent. + Expression fKey = !isIdColumn(lExp) ? lExp : rExp; + table = childTable = (Table)((ColumnReference) fKey).getMetadataObject().getParent(); + } else { + // Only add the criteria to the query if it is not the join criteria. + // The join criteria is implicit in the salesforce syntax. + super.visit(criteria); } - } else { - super.visit(criteria); } - } catch (TranslatorException e) { - exceptions.add(e); + } else { + super.visit(criteria); } } Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/SelectVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -61,7 +61,7 @@ public void visit(Select query) { super.visit(query); if (query.isDistinct()) { - exceptions.add(new TranslatorException(SalesForcePlugin.Util.getString("SelectVisitor.distinct.not.supported"))); + exceptions.add(new TranslatorException(SalesForcePlugin.Util.getString("SelectVisitor.distinct.not.supported"))); //$NON-NLS-1$ } selectSymbols = query.getDerivedColumns(); selectSymbolCount = selectSymbols.size(); @@ -78,10 +78,10 @@ selectSymbolNameToIndex .put(qualifiedName, index); String nameInSource = element.getNameInSource(); if (null == nameInSource || nameInSource.length() == 0) { - exceptions.add(new TranslatorException("name in source is null or empty for column "+ symbol.toString())); + exceptions.add(new TranslatorException("name in source is null or empty for column "+ symbol.toString())); //$NON-NLS-1$ continue; } - if (nameInSource.equalsIgnoreCase("id")) { + if (nameInSource.equalsIgnoreCase("id")) { //$NON-NLS-1$ idIndex = index; } } @@ -96,7 +96,7 @@ String supportsQuery = table.getProperties().get(Constants.SUPPORTS_QUERY); objectSupportsRetrieve = Boolean.valueOf(table.getProperties().get(Constants.SUPPORTS_RETRIEVE)); if (!Boolean.valueOf(supportsQuery)) { - throw new TranslatorException(table.getNameInSource() + " " + SalesForcePlugin.Util.getString("CriteriaVisitor.query.not.supported")); + throw new TranslatorException(table.getNameInSource() + " " + SalesForcePlugin.Util.getString("CriteriaVisitor.query.not.supported")); //$NON-NLS-1$ //$NON-NLS-2$ } loadColumnMetadata(obj); } catch (TranslatorException ce) { @@ -118,7 +118,7 @@ public String getQuery() throws TranslatorException { if (!exceptions.isEmpty()) { - throw ((TranslatorException) exceptions.get(0)); + throw exceptions.get(0); } StringBuffer result = new StringBuffer(); result.append(SELECT).append(SPACE); @@ -137,9 +137,9 @@ boolean firstTime = true; for (DerivedColumn symbol : selectSymbols) { if (!firstTime) { - result.append(", "); + result.append(", "); //$NON-NLS-1$ } else { - firstTime = false; + firstTime = false; } Expression expression = symbol.getExpression(); if (expression instanceof ColumnReference) { @@ -153,7 +153,7 @@ if(parent instanceof Table) { table = (Table)parent; } else { - throw new TranslatorException("Could not resolve Table for column " + element.getName()); + throw new TranslatorException("Could not resolve Table for column " + element.getName()); //$NON-NLS-1$ } } result.append(table.getNameInSource()); @@ -209,19 +209,19 @@ } - public List<String> getIdInCriteria() throws TranslatorException { + public List<String> getIdInCriteria() { assertRetrieveValidated(); List<Expression> expressions = this.idInCriteria.getRightExpressions(); List<String> result = new ArrayList<String>(expressions.size()); for(int i = 0; i < expressions.size(); i++) { - result.add(getValue(expressions.get(i))); + result.add(getValue(expressions.get(i), true)); } return result; } private void assertRetrieveValidated() throws AssertionError { if(!hasOnlyIDCriteria()) { - throw new AssertionError("Must call hasOnlyIdInCriteria() before this method"); + throw new AssertionError("Must call hasOnlyIdInCriteria() before this method"); //$NON-NLS-1$ } } Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java =================================================================== --- trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -24,11 +24,19 @@ import static org.junit.Assert.*; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.TimeZone; + +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.teiid.cdk.api.TranslationUtility; import org.teiid.language.Select; import org.teiid.metadata.RuntimeMetadata; +import org.teiid.query.unittest.TimestampUtil; import org.teiid.translator.ExecutionContext; import org.teiid.translator.salesforce.SalesforceConnection; import org.teiid.translator.salesforce.execution.visitors.TestVisitors; @@ -66,4 +74,20 @@ assertNull(qei.next()); } + @BeforeClass static public void oneTimeSetup() { + TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); + } + + @AfterClass static public void oneTimeTearDown() { + TimeZone.setDefault(null); + } + + @Test public void testValueParsing() throws Exception { + assertEquals(TimestampUtil.createTime(2, 0, 0), QueryExecutionImpl.parseDateTime("08:00:00.000Z", Time.class, Calendar.getInstance())); + } + + @Test public void testValueParsing1() throws Exception { + assertEquals(TimestampUtil.createTimestamp(101, 0, 1, 2, 0, 0, 1000000), QueryExecutionImpl.parseDateTime("2001-01-01T08:00:00.001Z", Timestamp.class, Calendar.getInstance())); + } + } Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java =================================================================== --- trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -28,6 +28,8 @@ import java.util.List; import java.util.TimeZone; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.teiid.cdk.api.TranslationUtility; @@ -90,16 +92,16 @@ contactTable.setProperty("Supports Query", Boolean.TRUE.toString()); //$NON-NLS-1$ // Create Contact Columns String[] elemNames = new String[] { - "ContactID", "Name", "AccountId", "InitialContact" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "ContactID", "Name", "AccountId", "InitialContact", "LastTime" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; String[] elemTypes = new String[] { - DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.TIMESTAMP + DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.TIMESTAMP, DataTypeManager.DefaultDataTypes.TIME }; List<Column> contactCols = RealMetadataFactory.createElements(contactTable, elemNames, elemTypes); // Set name in source on each column String[] contactNameInSource = new String[] { - "id", "ContactName", "accountid", "InitialContact" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "id", "ContactName", "accountid", "InitialContact", "LastTime" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; for(int i=0; i<2; i++) { Column obj = contactCols.get(i); @@ -154,7 +156,7 @@ SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); visitor.visit(command); assertFalse(visitor.hasOnlyIDCriteria()); - assertEquals("SELECT Account.id, Account.AccountName, Account.Stuff, Account.Industry FROM Account WHERE Industry IN('1','2','3')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + assertEquals("SELECT Account.id, Account.AccountName, Account.Stuff, Account.Industry FROM Account WHERE Account.Industry IN('1','2','3')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ } @@ -194,9 +196,23 @@ Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name in ('x', 'y')"); //$NON-NLS-1$ SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); visitor.visit(command); - assertEquals("SELECT Contact.ContactName FROM Contact WHERE ContactName IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName IN('x','y')", visitor.getQuery().toString().trim()); //$NON-NLS-1$ } + @Test public void testEqualsElement() throws Exception { + Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name = Contacts.AccountId"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName = Contact.AccountId", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testIsNull() throws Exception { + Select command = (Select)translationUtility.parseCommand("SELECT Contacts.Name FROM Contacts WHERE Contacts.Name is not null"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.ContactName != NULL", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + @Test public void testIDCriteria() throws Exception { Select command = (Select)translationUtility.parseCommand("select id, name from Account where id = 'bar'"); //$NON-NLS-1$ SalesforceConnection sfc = Mockito.mock(SalesforceConnection.class); @@ -205,16 +221,33 @@ Mockito.verify(sfc).retrieve("Account.id, Account.AccountName", "Account", Arrays.asList("bar")); } - @Test public void testDateTimeFormating() throws Exception { + @BeforeClass static public void oneTimeSetup() { TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); - try { - Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact = {ts'2003-03-11 11:42:10.5'}"); //$NON-NLS-1$ - SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); - visitor.visit(command); - assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact = 2003-03-11T11:42:10.500-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ - } finally { - TimeZone.setDefault(null); - } } + + @AfterClass static public void oneTimeTearDown() { + TimeZone.setDefault(null); + } + + @Test public void testDateTimeFormating() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact = {ts'2003-03-11 11:42:10.5'}"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact = 2003-03-11T11:42:10.500-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testDateTimeFormating1() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where initialcontact in ({ts'2003-03-11 11:42:10.506'}, {ts'2003-03-11 11:42:10.8088'})"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.InitialContact IN(2003-03-11T11:42:10.506-06:00,2003-03-11T11:42:10.80-06:00)", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } + + @Test public void testTimeFormatting() throws Exception { + Select command = (Select)translationUtility.parseCommand("select name from contacts where lasttime = {t'11:42:10'}"); //$NON-NLS-1$ + SelectVisitor visitor = new SelectVisitor(translationUtility.createRuntimeMetadata()); + visitor.visit(command); + assertEquals("SELECT Contact.ContactName FROM Contact WHERE Contact.LastTime = 11:42:10.000-06:00", visitor.getQuery().toString().trim()); //$NON-NLS-1$ + } } Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -394,7 +394,7 @@ <c:simple-property name="JdbcSocketConfiguration.enabled" displayName="Enable" description="Enable Socket based JDBC access" required="false" readOnly="false" /> <c:simple-property name="JdbcSocketConfiguration.hostName" displayName="Host Name" - description="Host Name" required="false" readOnly="false" /> + description="Host Name" required="false" readOnly="true" /> <c:simple-property name="JdbcSocketConfiguration.portNumber" displayName="Port Number" description="Port Number" required="false" readOnly="false" /> <c:simple-property name="JdbcSocketConfiguration.sslEnabled" displayName="SSL Enabled" Property changes on: trunk/engine/src/main/java/org/teiid/api ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555* /trunk/engine/src/main/java/org/teiid/api:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/api:3673-3711* /trunk/engine/src/main/java/org/teiid/api:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555* /trunk/engine/src/main/java/org/teiid/api/exception:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/api/exception:3673-3711* /trunk/engine/src/main/java/org/teiid/api/exception:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555* /trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query:3673-3711* /trunk/engine/src/main/java/org/teiid/api/exception/query:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555 /trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3673-3711 /trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555* /trunk/engine/src/main/java/org/teiid/common:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/common:3673-3711* /trunk/engine/src/main/java/org/teiid/common:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555* /trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer:3673-3711* /trunk/engine/src/main/java/org/teiid/common/buffer:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STree.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/STree.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555 /trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/common/buffer/impl:3673-3711 /trunk/engine/src/main/java/org/teiid/common/buffer/impl:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -193,7 +193,7 @@ position = BYTES_PER_BLOCK_ADDRESS*index; } if (mode == Mode.ALLOCATE) { - dataBlock = nextBlock(true); + dataBlock = nextBlock(info, true); info.putInt(position, dataBlock); if (mode == Mode.ALLOCATE && position + BYTES_PER_BLOCK_ADDRESS < info.limit()) { //maintain the invariant that the next pointer is empty @@ -212,7 +212,7 @@ int sib_index = buf.getInt(position); if (index == cutOff) { if (mode == Mode.ALLOCATE) { - sib_index = nextBlock(false); + sib_index = nextBlock(buf, false); buf.putInt(position, sib_index); } else if (mode == Mode.UPDATE && value == EMPTY_ADDRESS) { freeDataBlock(sib_index); @@ -225,9 +225,12 @@ /** * Get the next dataBlock. When the memory buffer is full we have some * book keeping to do. + * @param reading * @return */ - private int nextBlock(boolean data) { + private int nextBlock(ByteBuffer reading, boolean data) { + int limit = reading.limit(); + int position = reading.position(); int next = EMPTY_ADDRESS; memoryEvictionLock.readLock().lock(); boolean readLocked = true; @@ -245,6 +248,12 @@ if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, "Allocating", data?"data":"index", "block", next, "to", gid, oid); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } + //restore the reading buffer + if (reading.limit() != limit) { + reading.rewind(); + reading.limit(limit); + reading.position(position); + } return next; } Property changes on: trunk/engine/src/main/java/org/teiid/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555* /trunk/engine/src/main/java/org/teiid/core:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/core:3673-3711* /trunk/engine/src/main/java/org/teiid/core:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/core/id ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555 /trunk/engine/src/main/java/org/teiid/core/id:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/core/id:3673-3711 /trunk/engine/src/main/java/org/teiid/core/id:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -232,7 +232,7 @@ * Get the <code>Translator</code> object managed by this manager. * @return the <code>ExecutionFactory</code>. */ - protected ExecutionFactory<Object, Object> getExecutionFactory() { + public ExecutionFactory<Object, Object> getExecutionFactory() { return this.executionFactory; } Property changes on: trunk/engine/src/main/java/org/teiid/query ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555* /trunk/engine/src/main/java/org/teiid/query:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query:3673-3711* /trunk/engine/src/main/java/org/teiid/query:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555 /trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/analysis:3673-3711 /trunk/engine/src/main/java/org/teiid/query/analysis:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/eval ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555 /trunk/engine/src/main/java/org/teiid/query/eval:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/eval:3673-3711 /trunk/engine/src/main/java/org/teiid/query/eval:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555* /trunk/engine/src/main/java/org/teiid/query/function:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/function:3673-3711* /trunk/engine/src/main/java/org/teiid/query/function:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/aggregate ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/aggregate:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/aggregate:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/metadata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/metadata:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/metadata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/source ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555 /trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/function/source:3673-3711 /trunk/engine/src/main/java/org/teiid/query/function/source:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555* /trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/mapping:3673-3711* /trunk/engine/src/main/java/org/teiid/query/mapping:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/relational ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555 /trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/relational:3673-3711 /trunk/engine/src/main/java/org/teiid/query/mapping/relational:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555 /trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/mapping/xml:3673-3711 /trunk/engine/src/main/java/org/teiid/query/mapping/xml:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555 /trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/metadata:3673-3711 /trunk/engine/src/main/java/org/teiid/query/metadata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555* /trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer:3673-3711* /trunk/engine/src/main/java/org/teiid/query/optimizer:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555* /trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational:3673-3711* /trunk/engine/src/main/java/org/teiid/query/optimizer/relational:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3188-3450,3452-3666 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -109,6 +109,11 @@ private PlanHints hints = new PlanHints(); private Option option; private SourceHint sourceHint; + private static ThreadLocal<Boolean> planningLoop = new ThreadLocal<Boolean>() { + protected Boolean initialValue() { + return Boolean.FALSE; + } + }; public ProcessorPlan optimize( Command command) @@ -264,18 +269,23 @@ CorrelatedReferenceCollectorVisitor.collectReferences(subCommand, localGroupSymbols, correlatedReferences); ProcessorPlan procPlan = QueryOptimizer.optimizePlan(subCommand, metadata, idGenerator, capFinder, analysisRecord, context); container.getCommand().setProcessorPlan(procPlan); - if (!correlatedReferences.isEmpty()) { - SymbolMap map = new SymbolMap(); - for (Reference reference : correlatedReferences) { - map.addMapping(reference.getExpression(), reference.getExpression()); - } - container.getCommand().setCorrelatedReferences(map); - } + setCorrelatedReferences(container, correlatedReferences); } node.addGroups(GroupsUsedByElementsVisitor.getGroups(node.getCorrelatedReferenceElements())); } } + private void setCorrelatedReferences(SubqueryContainer<?> container, + List<Reference> correlatedReferences) { + if (!correlatedReferences.isEmpty()) { + SymbolMap map = new SymbolMap(); + for (Reference reference : correlatedReferences) { + map.addMapping(reference.getExpression(), reference.getExpression()); + } + container.getCommand().setCorrelatedReferences(map); + } + } + private static Set<GroupSymbol> getGroupSymbols(PlanNode plan) { Set<GroupSymbol> groupSymbols = new HashSet<GroupSymbol>(); for (PlanNode source : NodeEditor.findAllNodes(plan, NodeConstants.Types.SOURCE)) { @@ -538,6 +548,14 @@ context.accessedPlanningObject(sp.getProcedureID()); } } + for (SubqueryContainer<?> subqueryContainer : ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(container)) { + if (subqueryContainer.getCommand().getCorrelatedReferences() != null) { + continue; + } + List<Reference> correlatedReferences = new ArrayList<Reference>(); + CorrelatedReferenceCollectorVisitor.collectReferences(subqueryContainer.getCommand(), Arrays.asList(container.getGroup()), correlatedReferences); + setCorrelatedReferences(subqueryContainer, correlatedReferences); + } String cacheString = "transformation/" + container.getClass().getSimpleName().toUpperCase(); //$NON-NLS-1$ Command c = (Command)metadata.getFromMetadataCache(metadataId, cacheString); if (c == null) { @@ -588,13 +606,22 @@ throw new QueryPlannerException(QueryPlugin.Util.getString("RelationalPlanner.nonpushdown_command", container)); //$NON-NLS-1$ } - //treat this as an update procedure - if (container instanceof Update) { - c = QueryRewriter.createUpdateProcedure((Update)container, metadata, context); - } else { - c = QueryRewriter.createDeleteProcedure((Delete)container, metadata, context); + try { + if (planningLoop.get()) { + throw new QueryPlannerException(QueryPlugin.Util.getString("RelationalPlanner.nonpushdown_expression", container)); //$NON-NLS-1$ + } + planningLoop.set(Boolean.TRUE); + + //treat this as an update procedure + if (container instanceof Update) { + c = QueryRewriter.createUpdateProcedure((Update)container, metadata, context); + } else { + c = QueryRewriter.createDeleteProcedure((Delete)container, metadata, context); + } + addNestedCommand(sourceNode, container.getGroup(), container, c, false); + } finally { + planningLoop.set(Boolean.FALSE); } - addNestedCommand(sourceNode, container.getGroup(), container, c, false); return false; } Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555 /trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/optimizer/xml:3673-3711 /trunk/engine/src/main/java/org/teiid/query/optimizer/xml:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/parser ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555 /trunk/engine/src/main/java/org/teiid/query/parser:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/parser:3673-3711 /trunk/engine/src/main/java/org/teiid/query/parser:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555* /trunk/engine/src/main/java/org/teiid/query/processor:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/processor:3673-3711* /trunk/engine/src/main/java/org/teiid/query/processor:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/proc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/proc:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/proc:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/relational ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/relational:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555 /trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/processor/xml:3673-3711 /trunk/engine/src/main/java/org/teiid/query/processor/xml:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/report ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555 /trunk/engine/src/main/java/org/teiid/query/report:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/report:3673-3711 /trunk/engine/src/main/java/org/teiid/query/report:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555* /trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver:3673-3711* /trunk/engine/src/main/java/org/teiid/query/resolver:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/command ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/command:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555 /trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/util:3673-3711 /trunk/engine/src/main/java/org/teiid/query/resolver/util:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555 /trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/rewriter:3673-3711 /trunk/engine/src/main/java/org/teiid/query/rewriter:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -800,7 +800,7 @@ } else if (criteria instanceof DependentSetCriteria) { criteria = rewriteDependentSetCriteria((DependentSetCriteria)criteria); } else if (criteria instanceof ExpressionCriteria) { - return new CompareCriteria(((ExpressionCriteria) criteria).getExpression(), CompareCriteria.EQ, new Constant(Boolean.TRUE)); + return rewriteCriteria(new CompareCriteria(((ExpressionCriteria) criteria).getExpression(), CompareCriteria.EQ, new Constant(Boolean.TRUE))); } return evaluateCriteria(criteria); Property changes on: trunk/engine/src/main/java/org/teiid/query/sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555* /trunk/engine/src/main/java/org/teiid/query/sql:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/sql:3673-3711* /trunk/engine/src/main/java/org/teiid/query/sql:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/lang:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/lang:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/Command.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -344,7 +344,6 @@ protected boolean sameOptionAndHint(Command cmd) { return EquivalenceUtil.areEqual(this.cacheHint, cmd.cacheHint) && - EquivalenceUtil.areEqual(this.cacheHint, cmd.cacheHint) && EquivalenceUtil.areEqual(this.option, cmd.option); } Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigator ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/navigator:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/navigator:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/proc:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/proc:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/symbol:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/symbol:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/util:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/util:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555 /trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor:3673-3711 /trunk/engine/src/main/java/org/teiid/query/sql/visitor:3507-3666 Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -1374,6 +1374,7 @@ } public void visit( CreateProcedureCommand obj ) { + addCacheHint(obj.getCacheHint()); append(CREATE); append(SPACE); append(VIRTUAL); Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555 /trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata:3673-3711 /trunk/engine/src/main/java/org/teiid/query/tempdata:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555 /trunk/engine/src/main/java/org/teiid/query/util:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/util:3673-3711 /trunk/engine/src/main/java/org/teiid/query/util:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/validator ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555 /trunk/engine/src/main/java/org/teiid/query/validator:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/validator:3673-3711 /trunk/engine/src/main/java/org/teiid/query/validator:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555* /trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/query/xquery:3673-3711* /trunk/engine/src/main/java/org/teiid/query/xquery:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555 /trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/query/xquery/saxon:3673-3711 /trunk/engine/src/main/java/org/teiid/query/xquery/saxon:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/vdb ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555* /trunk/engine/src/main/java/org/teiid/vdb:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555* /branches/7.6.x/engine/src/main/java/org/teiid/vdb:3673-3711* /trunk/engine/src/main/java/org/teiid/vdb:3507-3666 Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555 /trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666 + /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555 /branches/7.6.x/engine/src/main/java/org/teiid/vdb/runtime:3673-3711 /trunk/engine/src/main/java/org/teiid/vdb/runtime:3507-3666 Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -920,6 +920,7 @@ connection_factory_not_found=Failed to find the Connection Factory with JNDI name {0}. Please check the name or deploy the Connection Factory with specified name. RelationalPlanner.nonpushdown_command=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates. +RelationalPlanner.nonpushdown_expression=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs that cannot be simplified into a compensating action. Translate.error=Cannot translate criteria "{0}", it is not matched by selector "{1}" Property changes on: trunk/engine/src/test/java/org/teiid/cache ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555* /trunk/engine/src/test/java/org/teiid/cache:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/cache:3673-3711* /trunk/engine/src/test/java/org/teiid/cache:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555 /trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3673-3711 /trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/common ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555* /trunk/engine/src/test/java/org/teiid/common:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/common:3673-3711* /trunk/engine/src/test/java/org/teiid/common:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555 /trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/common/buffer:3673-3711 /trunk/engine/src/test/java/org/teiid/common/buffer:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/common/queue ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555 /trunk/engine/src/test/java/org/teiid/common/queue:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/common/queue:3673-3711 /trunk/engine/src/test/java/org/teiid/common/queue:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorManager.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -46,7 +46,7 @@ static ConnectorManager getConnectorManager() throws Exception { final FakeConnector c = new FakeConnector(); ConnectorManager cm = new ConnectorManager("FakeConnector","FakeConnector") { //$NON-NLS-1$ //$NON-NLS-2$ - protected ExecutionFactory getExecutionFactory() { + public ExecutionFactory getExecutionFactory() { return c; } protected Object getConnectionFactory(){ Property changes on: trunk/engine/src/test/java/org/teiid/query ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555* /trunk/engine/src/test/java/org/teiid/query:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query:3673-3711* /trunk/engine/src/test/java/org/teiid/query:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555 /trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/analysis:3673-3711 /trunk/engine/src/test/java/org/teiid/query/analysis:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555* /trunk/engine/src/test/java/org/teiid/query/function:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/function:3673-3711* /trunk/engine/src/test/java/org/teiid/query/function:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/metadata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/metadata:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/metadata:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/source ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555 /trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/function/source:3673-3711 /trunk/engine/src/test/java/org/teiid/query/function/source:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555* /trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/mapping:3673-3711* /trunk/engine/src/test/java/org/teiid/query/mapping:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555 /trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/mapping/xml:3673-3711 /trunk/engine/src/test/java/org/teiid/query/mapping/xml:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555 /trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/metadata:3673-3711 /trunk/engine/src/test/java/org/teiid/query/metadata:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555* /trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer:3673-3711* /trunk/engine/src/test/java/org/teiid/query/optimizer:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555,3558-3585 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/proc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/proc:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/proc:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555* /trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational:3673-3711* /trunk/engine/src/test/java/org/teiid/query/optimizer/relational:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555 /trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/optimizer/xml:3673-3711 /trunk/engine/src/test/java/org/teiid/query/optimizer/xml:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/parser ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555 /trunk/engine/src/test/java/org/teiid/query/parser:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/parser:3673-3711 /trunk/engine/src/test/java/org/teiid/query/parser:3507-3666 Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -30,26 +30,10 @@ import org.junit.Test; import org.teiid.api.exception.query.QueryParserException; -import org.teiid.query.sql.lang.AbstractCompareCriteria; -import org.teiid.query.sql.lang.CacheHint; -import org.teiid.query.sql.lang.CompareCriteria; -import org.teiid.query.sql.lang.Criteria; -import org.teiid.query.sql.lang.Delete; -import org.teiid.query.sql.lang.From; -import org.teiid.query.sql.lang.FromClause; -import org.teiid.query.sql.lang.Insert; -import org.teiid.query.sql.lang.JoinPredicate; -import org.teiid.query.sql.lang.JoinType; -import org.teiid.query.sql.lang.Option; -import org.teiid.query.sql.lang.Query; -import org.teiid.query.sql.lang.SPParameter; -import org.teiid.query.sql.lang.Select; -import org.teiid.query.sql.lang.SetQuery; -import org.teiid.query.sql.lang.StoredProcedure; -import org.teiid.query.sql.lang.SubqueryFromClause; -import org.teiid.query.sql.lang.UnaryFromClause; -import org.teiid.query.sql.lang.Update; +import org.teiid.query.sql.lang.*; import org.teiid.query.sql.lang.SetQuery.Operation; +import org.teiid.query.sql.proc.Block; +import org.teiid.query.sql.proc.CreateProcedureCommand; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.Function; @@ -962,6 +946,13 @@ TestParser.helpTest(sql, "/*+ cache */ SELECT * FROM t1", query); //$NON-NLS-1$ } + @Test public void testCacheProc() { + String sql = "/*+ cache */ CREATE VIRTUAL PROCEDURE BEGIN END"; //$NON-NLS-1$ + CreateProcedureCommand command = new CreateProcedureCommand(new Block()); + command.setCacheHint(new CacheHint()); + TestParser.helpTest(sql, "/*+ cache */ CREATE VIRTUAL PROCEDURE\nBEGIN\nEND", command); //$NON-NLS-1$ + } + @Test public void testCacheScope() { String sql = "/*+ cache(pref_mem scope:session) */ SELECT * FROM t1"; //$NON-NLS-1$ Property changes on: trunk/engine/src/test/java/org/teiid/query/processor ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555* /trunk/engine/src/test/java/org/teiid/query/processor:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/processor:3673-3711* /trunk/engine/src/test/java/org/teiid/query/processor:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585 /trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555,3558-3585 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3188-3450,3452-3666 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -32,6 +32,7 @@ import java.util.*; import org.junit.Test; +import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.client.metadata.ParameterInfo; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.BufferManager; @@ -7543,6 +7544,17 @@ helpProcess(plan, dataManager, expected); } + @Test(expected=QueryPlannerException.class) public void testUpdateCompensationNotPossible() throws Exception { + String sql = "update pm1.g1 set e4 = (select e4 from pm1.g2 where pm1.g2.e2 = pm1.g1.e2) where e1 = 'a'"; //$NON-NLS-1$ + + FakeDataManager dataManager = new FakeDataManager(); + sampleData1(dataManager); + + BasicSourceCapabilities caps = getTypicalCapabilities(); + caps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, false); + helpGetPlan(helpParse(sql), RealMetadataFactory.example4(), new DefaultCapabilitiesFinder(caps), createCommandContext()); + } + @Test public void testDupSelect() throws Exception { String sql = "select e1, e1 from pm1.g1"; Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666 + /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestSourceHints.java:3598-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3188-3450,3452-3666 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -124,6 +124,27 @@ assertEquals("UPDATE pm1.g1 SET e2 = 5 WHERE e2 = 2", dm.getQueries().get(0)); } + @Test public void testUpdateWithChanging() throws Exception { + TransformationMetadata metadata = TestUpdateValidator.example1(); + TestUpdateValidator.createView("select 1 as x, 2 as y", metadata, GX); + Table t = metadata.getMetadataStore().getSchemas().get(VM1).getTables().get(GX); + t.setDeletePlan(""); + t.setUpdatePlan("FOR EACH ROW BEGIN update pm1.g1 set e2 = case when changing.y then new.y end where e2 = old.y; END"); + t.setInsertPlan(""); + + String sql = "update gx set y = 5"; + + FakeDataManager dm = new FakeDataManager(); + FakeDataStore.addTable("pm1.g1", dm, metadata); + + CommandContext context = createCommandContext(); + BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities(); + ProcessorPlan plan = TestProcessor.helpGetPlan(TestResolver.helpResolve(sql, metadata), metadata, new DefaultCapabilitiesFinder(caps), context); + List<?>[] expected = new List[] {Arrays.asList(1)}; + helpProcess(plan, context, dm, expected); + assertEquals("UPDATE pm1.g1 SET e2 = 5 WHERE e2 = 2", dm.getQueries().get(0)); + } + @Test public void testUpdateWithNonConstant() throws Exception { TransformationMetadata metadata = TestUpdateValidator.example1(); TestUpdateValidator.createView("select 1 as x, 2 as y", metadata, GX); Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/eval ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/eval:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/eval:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/proc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/proc:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/proc:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/relational ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/relational:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/relational:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555 /trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/processor/xml:3673-3711 /trunk/engine/src/test/java/org/teiid/query/processor/xml:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555 /trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/resolver:3673-3711 /trunk/engine/src/test/java/org/teiid/query/resolver:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555 /trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/rewriter:3673-3711 /trunk/engine/src/test/java/org/teiid/query/rewriter:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555* /trunk/engine/src/test/java/org/teiid/query/sql:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/query/sql:3673-3711* /trunk/engine/src/test/java/org/teiid/query/sql:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555 /trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/sql/lang:3673-3711 /trunk/engine/src/test/java/org/teiid/query/sql/lang:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555 /trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/sql/proc:3673-3711 /trunk/engine/src/test/java/org/teiid/query/sql/proc:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555 /trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/sql/symbol:3673-3711 /trunk/engine/src/test/java/org/teiid/query/sql/symbol:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555 /trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/sql/util:3673-3711 /trunk/engine/src/test/java/org/teiid/query/sql/util:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555 /trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/sql/visitor:3673-3711 /trunk/engine/src/test/java/org/teiid/query/sql/visitor:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555 /trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/unittest:3673-3711 /trunk/engine/src/test/java/org/teiid/query/unittest:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555 /trunk/engine/src/test/java/org/teiid/query/util:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/util:3673-3711 /trunk/engine/src/test/java/org/teiid/query/util:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/query/validator ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555 /trunk/engine/src/test/java/org/teiid/query/validator:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/query/validator:3673-3711 /trunk/engine/src/test/java/org/teiid/query/validator:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/vdb ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555* /trunk/engine/src/test/java/org/teiid/vdb:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555* /branches/7.6.x/engine/src/test/java/org/teiid/vdb:3673-3711* /trunk/engine/src/test/java/org/teiid/vdb:3507-3666 Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555 /trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666 + /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555 /branches/7.6.x/engine/src/test/java/org/teiid/vdb/runtime:3673-3711 /trunk/engine/src/test/java/org/teiid/vdb/runtime:3507-3666 Property changes on: trunk/engine/src/test/resources/text ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text:3535-3555* /trunk/engine/src/test/resources/text:3507-3666 + /branches/7.4.x/engine/src/test/resources/text:3535-3555* /branches/7.6.x/engine/src/test/resources/text:3673-3711* /trunk/engine/src/test/resources/text:3507-3666 Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555 /trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666 + /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555 /branches/7.6.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3673-3711 /trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3507-3666 Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555 /trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666 + /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555 /branches/7.6.x/engine/src/test/resources/text/cdm_dos.txt:3673-3711 /trunk/engine/src/test/resources/text/cdm_dos.txt:3507-3666 Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555 /trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666 + /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3164,3172-3217,3535-3555 /branches/7.6.x/engine/src/test/resources/text/cdm_dos_win.txt:3673-3711 /trunk/engine/src/test/resources/text/cdm_dos_win.txt:3188-3450,3452-3666 Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555 /trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666 + /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555 /branches/7.6.x/engine/src/test/resources/text/test-file.txt.csv:3673-3711 /trunk/engine/src/test/resources/text/test-file.txt.csv:3507-3666 Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -208,6 +208,7 @@ // VDB Status manager final VDBStatusCheckerExecutorService statusChecker = new VDBStatusCheckerExecutorService(vdbRepository); + statusChecker.setTranslatorRepository(translatorRepo); ValueService<VDBStatusChecker> statusService = new ValueService<VDBStatusChecker>(new org.jboss.msc.value.Value<VDBStatusChecker>() { @Override public VDBStatusChecker getValue() throws IllegalStateException, IllegalArgumentException { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -21,14 +21,7 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOWED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEFAULT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ONLY; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; import java.io.IOException; import java.math.BigDecimal; @@ -1190,6 +1183,10 @@ source.setTranslatorName(translatorName); source.setConnectionJndiName(dsName); save(vdb); + ServiceController<?> sc = context.getServiceRegistry(false).getRequiredService(TeiidServiceNames.VDB_STATUS_CHECKER); + VDBStatusChecker vsc = VDBStatusChecker.class.cast(sc.getValue()); + // enforce the changes in the engine. + vsc.dataSourceReplaced(vdb.getName(), vdb.getVersion(), modelName, sourceName, translatorName, dsName); } catch (AdminProcessingException e) { throw new OperationFailedException(new ModelNode().set(e.getMessage())); } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -96,7 +96,7 @@ public void start(StartContext context) throws StartException { ConnectorManagerRepository cmr = new ConnectorManagerRepository(); TranslatorRepository repo = new TranslatorRepository(); - + this.vdb.addAttchment(TranslatorRepository.class, repo); // check if this is a VDB with index files, if there are then build the TransformationMetadata UDFMetaData udf = this.vdb.getAttachment(UDFMetaData.class); IndexMetadataFactory indexFactory = this.vdb.getAttachment(IndexMetadataFactory.class); Property changes on: trunk/metadata/src/test/java/org/teiid/cdk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555* /trunk/metadata/src/test/java/org/teiid/cdk:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555* /branches/7.6.x/metadata/src/test/java/org/teiid/cdk:3673-3711* /trunk/metadata/src/test/java/org/teiid/cdk:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555 /trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555 /branches/7.6.x/metadata/src/test/java/org/teiid/cdk/api:3673-3711 /trunk/metadata/src/test/java/org/teiid/cdk/api:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555 /trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555 /branches/7.6.x/metadata/src/test/java/org/teiid/cdk/unittest:3673-3711 /trunk/metadata/src/test/java/org/teiid/cdk/unittest:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555* /trunk/metadata/src/test/java/org/teiid/core:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555* /branches/7.6.x/metadata/src/test/java/org/teiid/core:3673-3711* /trunk/metadata/src/test/java/org/teiid/core:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/core/util ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555 /trunk/metadata/src/test/java/org/teiid/core/util:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555 /branches/7.6.x/metadata/src/test/java/org/teiid/core/util:3673-3711 /trunk/metadata/src/test/java/org/teiid/core/util:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/internal ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555* /trunk/metadata/src/test/java/org/teiid/internal:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555* /branches/7.6.x/metadata/src/test/java/org/teiid/internal:3673-3711* /trunk/metadata/src/test/java/org/teiid/internal:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555* /trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555* /branches/7.6.x/metadata/src/test/java/org/teiid/internal/core:3673-3711* /trunk/metadata/src/test/java/org/teiid/internal/core:3507-3666 Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/index ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555 /trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666 + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555 /branches/7.6.x/metadata/src/test/java/org/teiid/internal/core/index:3673-3711 /trunk/metadata/src/test/java/org/teiid/internal/core/index:3507-3666 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/pom.xml 2011-12-01 17:33:11 UTC (rev 3713) @@ -486,6 +486,11 @@ <version>${jbossas-version}</version> </dependency> <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>3.0.0.Final</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-subsystem-test</artifactId> <version>${jbossas-version}</version> Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -23,24 +23,27 @@ import java.util.LinkedList; import java.util.concurrent.Executor; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.Model; import org.teiid.adminapi.VDB; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.adminapi.impl.VDBTranslatorMetaData; +import org.teiid.core.TeiidException; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; +import org.teiid.dqp.internal.datamgr.TranslatorRepository; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.runtime.RuntimePlugin; +import org.teiid.translator.ExecutionFactory; -public class VDBStatusChecker { +public abstract class VDBStatusChecker { private static final String JAVA_CONTEXT = "java:/"; //$NON-NLS-1$ private VDBRepository vdbRepository; + private TranslatorRepository translatorRepository; public VDBStatusChecker(VDBRepository vdbRepository) { this.vdbRepository = vdbRepository; @@ -67,7 +70,64 @@ } resourceremoved(dataSourceName, false); } + + public void dataSourceReplaced(String vdbName, int vdbVersion, + String modelName, String sourceName, String translatorName, + String dsName) throws AdminProcessingException { + if (dsName.startsWith(JAVA_CONTEXT)) { + dsName = dsName.substring(5); + } + + VDBMetaData vdb = this.vdbRepository.getVDB(vdbName, vdbVersion); + ModelMetaData model = vdb.getModel(modelName); + + synchronized (vdb) { + ConnectorManagerRepository cmr = vdb.getAttachment(ConnectorManagerRepository.class); + ConnectorManager cm = cmr.getConnectorManager(sourceName); + ExecutionFactory<Object, Object> ef = cm.getExecutionFactory(); + + boolean dsReplaced = false; + if (!cm.getConnectionName().equals(dsName)){ + vdb.setStatus(VDB.Status.INACTIVE); + String msg = RuntimePlugin.Util.getString("datasource_replaced", vdb.getName(), vdb.getVersion(), model.getSourceTranslatorName(sourceName), dsName); //$NON-NLS-1$ + model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), msg); + cm = new ConnectorManager(translatorName, dsName); + cm.setExecutionFactory(ef); + cm.setModelName(modelName); + cmr.addConnectorManager(sourceName, cm); + dsReplaced = true; + } + + if (!cm.getTranslatorName().equals(translatorName)) { + try { + TranslatorRepository repo = vdb.getAttachment(TranslatorRepository.class); + VDBTranslatorMetaData t = null; + if (repo != null) { + t = repo.getTranslatorMetaData(translatorName); + } + if (t == null) { + t = this.translatorRepository.getTranslatorMetaData(translatorName); + } + if (t == null) { + throw new AdminProcessingException(RuntimePlugin.Util.getString("translator_not_found", vdb.getName(), vdb.getVersion(), translatorName)); //$NON-NLS-1$ + } + ef = TranslatorUtil.buildExecutionFactory(t, Thread.currentThread().getContextClassLoader()); + cm.setExecutionFactory(ef); + } catch (TeiidException e) { + throw new AdminProcessingException(e.getCause()); + } + } + + if (dsReplaced) { + resourceAdded(dsName, false); + } + } + } + public void setVDBRepository(VDBRepository repo) { + this.vdbRepository = repo; + } + public void resourceAdded(String resourceName, boolean translator) { for (VDBMetaData vdb:this.vdbRepository.getVDBs()) { if (vdb.getStatus() == VDB.Status.ACTIVE || vdb.isPreview()) { @@ -172,8 +232,9 @@ return null; } + public abstract Executor getExecutor(); - public Executor getExecutor() { - return new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new SynchronousQueue<Runnable>()); + public void setTranslatorRepository(TranslatorRepository repo) { + this.translatorRepository = repo; } } Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -201,7 +201,6 @@ info.put("user", user); //$NON-NLS-1$ String password = null; - String passthroughAuthentication = ""; //$NON-NLS-1$ if (authType.equals(AuthenticationType.CLEARTEXT)) { password = data.readString(); } @@ -210,7 +209,6 @@ LogonResult result = this.logon.neogitiateGssLogin(this.props, serviceToken, false); serviceToken = (byte[])result.getProperty(ILogon.KRB5TOKEN); if (Boolean.TRUE.equals(result.getProperty(ILogon.KRB5_ESTABLISHED))) { - passthroughAuthentication = ";PassthroughAuthentication=true;authenticationType=KRB5"; //$NON-NLS-1$ info.put(ILogon.KRB5TOKEN, serviceToken); } else { @@ -220,7 +218,7 @@ } // this is local connection - String url = "jdbc:teiid:"+databaseName+";ApplicationName=ODBC"+passthroughAuthentication; //$NON-NLS-1$ //$NON-NLS-2$ + String url = "jdbc:teiid:"+databaseName+";ApplicationName=ODBC"; //$NON-NLS-1$ //$NON-NLS-2$ if (password != null) { info.put("password", password); //$NON-NLS-1$ Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -151,7 +151,7 @@ this.enabledCipherSuites = enabledCipherSuites.split(","); //$NON-NLS-1$ } - public String[] getEnabledCipherSuites() { + public String[] getEnabledCipherSuitesAsArray() { return enabledCipherSuites; } } Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555 /trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666 + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555 /branches/7.6.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3673-3711 /trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3598-3666 Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555* /trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666 + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555* /branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg:3673-3711* /trunk/runtime/src/main/java/org/teiid/transport/pg:3507-3666 Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555 /trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666 + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555 /branches/7.6.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3673-3711 /trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3507-3666 Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-01 17:33:11 UTC (rev 3713) @@ -70,6 +70,7 @@ translator_not_found=For {0}.{1} VDB, Translator "{2}" not found. recursive_delegation=For {0}.{1} VDB, recursive delegation {2} found. datasource_not_found=For {0}.{1} VDB, Data Source "{2}" not found. +datasource_replaced=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}" vdb_activated={0}.{1} status has been changed to active vdb_inactivated={0}.{1} status has been changed to inactive. Check the required translators and data sources! translator_added=Teiid translator "{0}" has been added. Property changes on: trunk/runtime/src/main/resources/org/teiid/transport ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555* /trunk/runtime/src/main/resources/org/teiid/transport:3507-3666 + /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555* /branches/7.6.x/runtime/src/main/resources/org/teiid/transport:3673-3711* /trunk/runtime/src/main/resources/org/teiid/transport:3507-3666 Modified: trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -78,7 +78,7 @@ Mockito.stub(ef.getPushDownFunctions()).toReturn(funcs); ConnectorManager cm = new ConnectorManager(translatorName,connectionName) { - protected ExecutionFactory getExecutionFactory() { + public ExecutionFactory getExecutionFactory() { return ef; } }; Property changes on: trunk/runtime/src/test/java/org/teiid/dqp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555* /trunk/runtime/src/test/java/org/teiid/dqp:3507-3666 + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555* /branches/7.6.x/runtime/src/test/java/org/teiid/dqp:3673-3711* /trunk/runtime/src/test/java/org/teiid/dqp:3507-3666 Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555* /trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666 + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555* /branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service:3673-3711* /trunk/runtime/src/test/java/org/teiid/dqp/service:3507-3666 Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555 /trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666 + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555 /branches/7.6.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3673-3711 /trunk/runtime/src/test/java/org/teiid/dqp/service/buffer:3507-3666 Modified: trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -259,7 +259,7 @@ @Test public void testEnableCipherSuites() throws Exception { SSLConfiguration config = new SSLConfiguration(); config.setEnabledCipherSuites("x,y,z"); - assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuites()); + assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuitesAsArray()); } } Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555* /trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555* /branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk:3673-3711* /trunk/test-integration/common/src/test/java/org/teiid/cdk:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk/api ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555 /trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555 /branches/7.6.x/test-integration/common/src/test/java/org/teiid/cdk/api:3673-3711 /trunk/test-integration/common/src/test/java/org/teiid/cdk/api:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555* /trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555* /branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp:3673-3711* /trunk/test-integration/common/src/test/java/org/teiid/dqp:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555* /trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555* /branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3673-3711* /trunk/test-integration/common/src/test/java/org/teiid/dqp/internal:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555 /trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555 /branches/7.6.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3673-3711 /trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3507-3666 Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2011-12-01 17:18:20 UTC (rev 3712) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2011-12-01 17:33:11 UTC (rev 3713) @@ -103,7 +103,7 @@ public ConnectorManager getConnectorManager(String connectorName) { return new ConnectorManager(connectorName, connectorName) { @Override - protected ExecutionFactory<Object, Object> getExecutionFactory() { + public ExecutionFactory<Object, Object> getExecutionFactory() { return new ExecutionFactory<Object, Object>() { @Override public Execution createExecution(Command command, Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555* /trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555* /branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport:3673-3711* /trunk/test-integration/common/src/test/java/org/teiid/transport:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555 /trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555 /branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3673-3711 /trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3507-3666 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555 /trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555 /branches/7.6.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3673-3711 /trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555* /trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555* /branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3673-3711* /trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555* /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555* /branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3673-3711* /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555* /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555* /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3673-3711* /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3188-3450,3452-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3507-3666 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555 /branches/7.6.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3673-3711 /trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3507-3666 Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555* /trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666 + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555* /branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal:3673-3711* /trunk/test-integration/db/src/main/java/org/teiid/internal:3507-3666 Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555* /trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666 + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555* /branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core:3673-3711* /trunk/test-integration/db/src/main/java/org/teiid/internal/core:3507-3666 Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555 /trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666 + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555 /branches/7.6.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3673-3711 /trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml:3507-3666 Property changes on: trunk/test-integration/db/src/test/java/com ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555* /trunk/test-integration/db/src/test/java/com:3507-3666 + /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555* /branches/7.6.x/test-integration/db/src/test/java/com:3673-3711* /trunk/test-integration/db/src/test/java/com:3507-3666 Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555* /trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666 + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555* /branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal:3673-3711* /trunk/test-integration/db/src/test/java/org/teiid/internal:3507-3666 Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal/core ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555* /trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666 + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555* /branches/7.6.x/test-integration/db/src/test/java/org/teiid/internal/core:3673-3711* /trunk/test-integration/db/src/test/java/org/teiid/internal/core:3507-3666

14 years, 1 month

1
0
0 / 0

teiid SVN: r3712 - branches/7.6.x/runtime/src/main/java/org/teiid/deployers.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-12-01 12:18:20 -0500 (Thu, 01 Dec 2011) New Revision: 3712 Modified: branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java Log: TEIID-1832 allowing vdb specific translators to be assigned as well Modified: branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2011-12-01 02:03:44 UTC (rev 3711) +++ branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2011-12-01 17:18:20 UTC (rev 3712) @@ -79,7 +79,7 @@ TranslatorRepository repo = new TranslatorRepository(); ConnectorManagerRepository cmr = new ConnectorManagerRepository(); - + deployment.addAttchment(TranslatorRepository.class, repo); boolean preview = deployment.isPreview(); if (!preview) { Modified: branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java =================================================================== --- branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 02:03:44 UTC (rev 3711) +++ branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2011-12-01 17:18:20 UTC (rev 3712) @@ -98,7 +98,17 @@ if (!cm.getTranslatorName().equals(translatorName)) { try { - Translator t = this.translatorRepository.getTranslatorMetaData(translatorName); + TranslatorRepository repo = vdb.getAttachment(TranslatorRepository.class); + Translator t = null; + if (repo != null) { + t = repo.getTranslatorMetaData(translatorName); + } + if (t == null) { + t = this.translatorRepository.getTranslatorMetaData(translatorName); + } + if (t == null) { + throw new DeploymentException(RuntimePlugin.Util.getString("translator_not_found", vdb.getName(), vdb.getVersion(), translatorName)); //$NON-NLS-1$ + } ef = TranslatorUtil.buildExecutionFactory(t); cm.setExecutionFactory(ef); } catch (DeploymentException e) {

14 years, 1 month

1
0
0 / 0

Teiid-NightlyBuild - Build # 1357 - Still Failing!

by jboss-qa-internal＠redhat.com

Teiid-NightlyBuild - Build # 1357 - Still Failing: Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/1357/ to view the results.

14 years, 1 month

1
2
0 / 0

teiid SVN: r3711 - in trunk: documentation/admin-guide/src/main/docbook/en-US/content and 3 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-30 21:03:44 -0500 (Wed, 30 Nov 2011) New Revision: 3711 Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html trunk/documentation/admin-guide/src/main/docbook/en-US/content/appendix-c.xml trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj Log: TEIID-1600 allowing backward compatibility to work with avg as well Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-11-30 22:17:23 UTC (rev 3710) +++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-12-01 02:03:44 UTC (rev 3711) @@ -41,8 +41,8 @@ <li>7.x or earlier VDBs with table cardinalities set the old unknown value 0 will now report that value as -1 via the metadata API or SYS.TABLES. <li>Exact fixed point literals, e.g. 1.0, are now parsed as decimal/BigDecimal values as per the ANSI specification, rather than as double values. Also the AVG aggregate function will return an exact numeric (BigDecimal) value for integral types rather than returning a double value. - Views that were projecting doubles from exact numeric literals or using AVG will need to be updated. There is also a new system property org.teiid.parseDecimalAsDouble to - enable the pre-8.0 parsing of exact fixed point literals as doubles. The BigDecimal form of the AVG function now uses the same precision and scale logic as the division system function, rather than using a + Views that were projecting doubles from exact numeric literals or using AVG will need to be updated. There is also a new system property org.teiid.decimalAsDouble to + enable the pre-8.0 behavior. The BigDecimal form of the AVG function now uses the same precision and scale logic as the division system function, rather than using a fixed scale of 9. <li>BigDecimal division that returns a quotient that is equal to zero will have a scale of zero as well. Prior releases would typically return a zero value with a scale of 16. </ul> Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/appendix-c.xml =================================================================== --- trunk/documentation/admin-guide/src/main/docbook/en-US/content/appendix-c.xml 2011-11-30 22:17:23 UTC (rev 3710) +++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/appendix-c.xml 2011-12-01 02:03:44 UTC (rev 3711) @@ -41,8 +41,8 @@ </para> </listitem> <listitem> - <para><emphasis>org.teiid.parseDecimalAsDouble</emphasis> - defaults to false. - Set to true to parse exact fixed point literals, e.g. 1.0, as double values rather than as decimal/BigDecimal values in the same way as releases earlier than 8.0. + <para><emphasis>org.teiid.decimalAsDouble</emphasis> - defaults to false. + Set to true to parse exact fixed point literals, e.g. 1.0, as double values rather than as decimal/BigDecimal values and to return a double value from the AVG function for integral values in the same way as releases earlier than 8.0. </para> </listitem> </itemizedlist> Modified: trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2011-11-30 22:17:23 UTC (rev 3710) +++ trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2011-12-01 02:03:44 UTC (rev 3711) @@ -50,7 +50,7 @@ public class SQLParserUtil { - public static final boolean PARSE_DECIMAL_AS_DOUBLE = PropertiesUtils.getBooleanProperty(System.getProperties(), "org.teiid.parseDecimalAsDouble", false); //$NON-NLS-1$ + public static final boolean DECIMAL_AS_DOUBLE = PropertiesUtils.getBooleanProperty(System.getProperties(), "org.teiid.decimalAsDouble", false); //$NON-NLS-1$ String matchesAny(String arg, String ... expected) { for (String string : expected) { Modified: trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java 2011-11-30 22:17:23 UTC (rev 3710) +++ trunk/engine/src/main/java/org/teiid/query/sql/symbol/AggregateSymbol.java 2011-12-01 02:03:44 UTC (rev 3711) @@ -29,6 +29,7 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.EquivalenceUtil; import org.teiid.core.util.HashCodeUtil; +import org.teiid.query.parser.SQLParserUtil; import org.teiid.query.sql.LanguageVisitor; import org.teiid.query.sql.lang.OrderBy; @@ -90,10 +91,10 @@ SUM_TYPES.put(DataTypeManager.DefaultDataClasses.BIG_DECIMAL, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); AVG_TYPES = new HashMap<Class<?>, Class<?>>(); - AVG_TYPES.put(DataTypeManager.DefaultDataClasses.BYTE, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); - AVG_TYPES.put(DataTypeManager.DefaultDataClasses.SHORT, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); - AVG_TYPES.put(DataTypeManager.DefaultDataClasses.INTEGER, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); - AVG_TYPES.put(DataTypeManager.DefaultDataClasses.LONG, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); + AVG_TYPES.put(DataTypeManager.DefaultDataClasses.BYTE, SQLParserUtil.DECIMAL_AS_DOUBLE?DataTypeManager.DefaultDataClasses.DOUBLE:DataTypeManager.DefaultDataClasses.BIG_DECIMAL); + AVG_TYPES.put(DataTypeManager.DefaultDataClasses.SHORT, SQLParserUtil.DECIMAL_AS_DOUBLE?DataTypeManager.DefaultDataClasses.DOUBLE:DataTypeManager.DefaultDataClasses.BIG_DECIMAL); + AVG_TYPES.put(DataTypeManager.DefaultDataClasses.INTEGER, SQLParserUtil.DECIMAL_AS_DOUBLE?DataTypeManager.DefaultDataClasses.DOUBLE:DataTypeManager.DefaultDataClasses.BIG_DECIMAL); + AVG_TYPES.put(DataTypeManager.DefaultDataClasses.LONG, SQLParserUtil.DECIMAL_AS_DOUBLE?DataTypeManager.DefaultDataClasses.DOUBLE:DataTypeManager.DefaultDataClasses.BIG_DECIMAL); AVG_TYPES.put(DataTypeManager.DefaultDataClasses.BIG_INTEGER, DataTypeManager.DefaultDataClasses.BIG_DECIMAL); AVG_TYPES.put(DataTypeManager.DefaultDataClasses.FLOAT, DataTypeManager.DefaultDataClasses.DOUBLE); AVG_TYPES.put(DataTypeManager.DefaultDataClasses.DOUBLE, DataTypeManager.DefaultDataClasses.DOUBLE); Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2011-11-30 22:17:23 UTC (rev 3710) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2011-12-01 02:03:44 UTC (rev 3711) @@ -4004,7 +4004,7 @@ } | t=<DECIMALVAL> { try { - if (PARSE_DECIMAL_AS_DOUBLE) { + if (DECIMAL_AS_DOUBLE) { constant = new Constant(Double.valueOf(t.image), DataTypeManager.DefaultDataClasses.DOUBLE); } else { constant = new Constant(new java.math.BigDecimal(t.image), DataTypeManager.DefaultDataClasses.BIG_DECIMAL);

14 years, 1 month

1
0
0 / 0

← Newer
1
2
3
4
5
6
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits December 2011