Branch: refs/heads/master Home: https://github.com/Teiid-Designer/teiid-designer Commit: adcf0ffe0e49cdd5ef34d142c9ecf3d690776295 https://github.com/Teiid-Designer/teiid-designer/commit/adcf0ffe0e49cdd5e... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.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/VdbEntry.java Log Message: ----------- TEIIDDES-2120: Fixes for Vdb and VdbEditor * VdbEditor * Fixes when user files are added to a vdb. Formerly, the absolute path of the file was supplied to the VdbEntry even if it was in the project. Consequently, these files would never synchronize as they were not model resources and their paths could not be found in the workspace. * VdbEntry * Makes the findFileInWorkspace method work a little harder to try and locate a resource for the given filename by navigating the files container in the vdb's project. This improves the chances that such files can be synchronized. * Vdb * Stops udf jar files appearing in both the UDF and Other Files panels in the VdbEditor. Only user files should appear in the userFileEntries set. Conflicts: plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbEntry.java