Branch: refs/heads/teiid-8.x-upgrade Home: https://github.com/Teiid-Designer/teiid-designer Commit: 9598595df2593f38e4f3e3936238cf87218eb091 https://github.com/Teiid-Designer/teiid-designer/commit/9598595df2593f38e... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2012-10-24 (Wed, 24 Oct 2012) Changed paths: M plugins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelUtil.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/PreviewManager.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/jobs/CreatePreviewVdbJob.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/viewsupport/ModelObjectUtilities.java Log Message: ----------- TEIIDDES-1523 Re-worked the mergeVdb() method to specifically add importVDB entries for both preview VDBs and VDBs referenced in VDB source models