Author: shawkins Date: 2011-05-23 15:33:57 -0400 (Mon, 23 May 2011) New Revision: 3189 Modified: branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java branches/7.4.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java Log: TEIID-1592 changes to ensure that the metadata repository is correctly initialized Modified: branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2011-05-23 19:32:30 UTC (rev 3188) +++ branches/7.4.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2011-05-23 19:33:57 UTC (rev 3189) @@ -25,7 +25,6 @@ import org.teiid.cache.CacheConfiguration; import org.teiid.client.RequestMessage; import org.teiid.core.util.ApplicationInfo; -import org.teiid.metadata.MetadataRepository; public class DQPConfiguration{ @@ -228,10 +227,6 @@ this.authorizationValidator = authorizationValidator; } - public MetadataRepository getMetadataRepository() { - return null; - } - public CacheConfiguration getPreparedPlanCacheConfig() { return preparedPlanCacheConfig; } Modified: branches/7.4.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java =================================================================== --- branches/7.4.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-05-23 19:32:30 UTC (rev 3188) +++ branches/7.4.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-05-23 19:33:57 UTC (rev 3189) @@ -105,7 +105,6 @@ import org.teiid.metadata.AbstractMetadataRecord; import org.teiid.metadata.Column; import org.teiid.metadata.ColumnStats; -import org.teiid.metadata.MetadataRepository; import org.teiid.metadata.Procedure; import org.teiid.metadata.Schema; import org.teiid.metadata.Table; @@ -181,6 +180,7 @@ LogManager.logDetail(LogConstants.CTX_RUNTIME, ne, IntegrationPlugin.Util.getString("jndi_failed", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$ } } + this.dqpCore.setMetadataRepository(this.vdbRepository.getMetadataRepository()); this.dqpCore.setEventDistributor(this.eventDistributor); this.dqpCore.start(this); // create the necessary services @@ -805,8 +805,4 @@ return this; } - @Override - public MetadataRepository getMetadataRepository() { - return this.vdbRepository.getMetadataRepository(); - } }