Branch: refs/heads/master Home: https://github.com/Teiid-Designer/teiid-designer Commit: 17f50a8ac2685374eb7df4f6a4f29825a29b2e15 https://github.com/Teiid-Designer/teiid-designer/commit/17f50a8ac2685374e... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/jobs/CreatePreviewVdbJob.java M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/wizards/NewVdbWizard.java M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/Vdb.java M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbModelEntry.java M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbUtil.java M tests/org.teiid.designer.vdb.test/src/org/teiid/designer/vdb/VdbModelEntryTest.java Log Message: ----------- TEIIDDES-2120: Addresses shortcomings of adding imported xsd files * Closes loopholes with addition of xsd files to a Vdb in the VdbEditor * VdbUtil * canAddModelToVdb checks for duplicate models already in Vdb. However, the model resource references includes Xsd files which although are resources are included in the 'Other Files' section and a model can have the same name as an Xsd file. * Vdb * Avoids further loopholes by making a single addEntry method which both model and file entries are added through. Consequently, only one function path to determine how the given resource should be added. * NewVdbWizard * Stop Xsd files from being displayed in the Add Models chooser dialog Commit: ec31942d94325cdbdf0b96cc9b99932f42f781af https://github.com/Teiid-Designer/teiid-designer/commit/ec31942d94325cdbd... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbEntry.java M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbFileEntry.java R tests/org.teiid.designer.vdb.test/src/org/teiid/designer/vdb/VdbEntryTest.java A tests/org.teiid.designer.vdb.test/src/org/teiid/designer/vdb/VdbFileEntryTest.java M tests/org.teiid.designer.vdb.test/src/org/teiid/designer/vdb/test/AllTests.java Log Message: ----------- TEIIDDES-2120: Fixes failing unit tests * VdbEntry * Should be abstract since only ModelEntry and FileEntry are applicable to Vdbs * VdbFileEntry * Fixes possibility of the entry name being null in circumstances where the FileEntryType could be null. Only cropped up in unit tests * VdbEntryTest -> VdbFileEntryTest * Crazy to be testing the abstract VdbEntry being added to a Vdb when no such entries are ever added. * Use of VdbFileEntries has meant slight differences in how the tests are implemented. Compare: https://github.com/Teiid-Designer/teiid-designer/compare/6ed340c96a52...e...