Author: shawkins Date: 2010-09-07 15:22:48 -0400 (Tue, 07 Sep 2010) New Revision: 2536 Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java Log: TEIID-1195 minor changes made reviewing the inactive issue Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-09-07 18:41:05 UTC (rev 2535) +++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-09-07 19:22:48 UTC (rev 2536) @@ -285,7 +285,7 @@ } public String toString() { - return getName()+VERSION_DELIM+getVersion()+ models.getMap().values(); //$NON-NLS-1$ + return getName()+VERSION_DELIM+getVersion()+ models.getMap().values(); } public ModelMetaData getModel(String modelName) { Modified: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-09-07 18:41:05 UTC (rev 2535) +++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-09-07 19:22:48 UTC (rev 2536) @@ -206,10 +206,10 @@ for(Model m:deployment.getModels()) { ModelMetaData model = (ModelMetaData)m; List<SourceMappingMetadata> mappings = model.getSourceMappings(); + if (model.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)) { + continue; + } for (SourceMappingMetadata mapping:mappings) { - if (mapping.getName().equals(CoreConstants.SYSTEM_MODEL) || model.getName().equals(CoreConstants.ODBC_MODEL)) { - continue; - } ConnectorManager cm = cmr.getConnectorManager(mapping.getName()); String msg = cm.getStausMessage(); if (msg != null && msg.length() > 0) { @@ -310,7 +310,7 @@ private void loadMetadata(VDBMetaData vdb, ModelMetaData model, boolean cache, File cacheFile, MetadataStoreGroup vdbStore, ConnectorManagerRepository cmr) { Exception exception = null; - boolean loaded = false;; + boolean loaded = false; for (String sourceName: model.getSourceNames()) { ConnectorManager cm = cmr.getConnectorManager(sourceName); if (cm == null) { Modified: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-07 18:41:05 UTC (rev 2535) +++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-07 19:22:48 UTC (rev 2536) @@ -44,7 +44,6 @@ import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.metadata.Datatype; -import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.MetadataStore; import org.teiid.query.metadata.TransformationMetadata.Resource; import org.teiid.runtime.RuntimePlugin;