[teiid-commits] teiid SVN: r4007 - in branches/8.0.x: engine/src/main/resources/org/teiid/query and 1 other directories.
Author: rareddy
Date: 2012-04-16 16:55:47 -0400 (Mon, 16 Apr 2012)
New Revision: 4007
Modified:
branches/8.0.x/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
Log:
TEIID-2001: added code to skip reading the models that are other than PHYSICAL and
VIRTUAL. Also added code to skip validation on the XML document models.
Modified:
branches/8.0.x/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
===================================================================
---
branches/8.0.x/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-04-16
20:27:12 UTC (rev 4006)
+++
branches/8.0.x/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-04-16
20:55:47 UTC (rev 4007)
@@ -145,6 +145,13 @@
ModelMetaData model = vdb.getModel(schema.getName());
for (Table t:schema.getTables().values()) {
+ // no need to verify the transformation of the xml mapping document,
+ // as this is very specific and designer already validates it.
+ if (t.getTableType() == Table.Type.Document
+ || t.getTableType() == Table.Type.XmlMappingClass
+ || t.getTableType() == Table.Type.XmlStagingTable) {
+ continue;
+ }
if (t.isVirtual()) {
if (t.getSelectTransformation() == null) {
log(report, model, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31079, t.getName(),
model.getName()));
Modified: branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties 2012-04-16
20:27:12 UTC (rev 4006)
+++ branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties 2012-04-16
20:55:47 UTC (rev 4007)
@@ -73,6 +73,7 @@
QueryParser.nullSqlCrit=Parser cannot parse a null sql criteria.
QueryParser.lexicalError=Lexical error: {0}
QueryParser.nullSqlExpr=Parser cannot parse a null sql expression.
+TEIID30378=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
TEIID30379=Direct usage of XQuery is no longer supported, use XMLQUERY instead.
# processor (006)
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
---
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-04-16
20:27:12 UTC (rev 4006)
+++
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-04-16
20:55:47 UTC (rev 4007)
@@ -170,8 +170,13 @@
throw new
StartException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50086,
model.getName(), vdb.getName(), vdb.getVersion()));
}
model.addAttchment(MetadataRepository.class, metadataRepository);
- loadMetadata(this.vdb, model, cmr, metadataRepository, store);
- LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(),
"in VDB ", vdb.getName(), " was being loaded from its repository in
separate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (model.getModelType() == Model.Type.PHYSICAL || model.getModelType() ==
Model.Type.VIRTUAL) {
+ loadMetadata(this.vdb, model, cmr, metadataRepository, store);
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(),
"in VDB ", vdb.getName(), " was being loaded from its repository in
separate thread"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ else {
+ LogManager.logTrace(LogConstants.CTX_RUNTIME, "Model ", model.getName(),
"in VDB ", vdb.getName(), " skipped being loaded because of its type
", model.getModelType()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
}
synchronized (this.vdb) {