Branch: refs/heads/8.3.x Home: https://github.com/Teiid-Designer/teiid-designer Commit: 57457618ae8c4e3b5b5abbb51124e37651ed53fb https://github.com/Teiid-Designer/teiid-designer/commit/57457618ae8c4e3b5... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/VdbHelper.java M plugins/org.teiid.designer.metamodels.function/src/org/teiid/designer/metamodels/function/aspects/validation/rules/ScalarFunctionRule.java M plugins/org.teiid.designer.metamodels.relational/src/org/teiid/designer/metamodels/relational/aspects/validation/rules/ProcedureFunctionRule.java M plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/edit/RelationalProcedureEditorPanel.java M plugins/org.teiid.designer.transformation.ui/src/org/teiid/designer/transformation/ui/editors/ViewProcedureEditorPanel.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileFromWorkspaceDialog.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileOptionsDialog.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/UdfJarDialogCellEditor.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/VdbFileDialogUtil.java M plugins/org.teiid.designer.vdb.ui/plugin.xml M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/Messages.java M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbBuilder.java A plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbDuplicateNamesMarkerResolutionGenerator.java A plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbMigrateXsdFilesMarkerResolution.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/messages.properties M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/Vdb.java M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbFileEntry.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/manifest/ModelElement.java M plugins/org.teiid.designer.vdb/vdb-deployer.xsd Log Message: ----------- TEIIDDES-2120: Move Xsd files from models to other files section of vdb * VdbHelper * Replace static strings with VdbFolder enum that also incorporates a file filter, read and write folders * getFolder() should be able to return the project as the 'root folder' given a suitable folderName, ie. ".". Does imply that the return object must be a container rather than a folder * Other Files enum only references otherFiles directory when creating and adding a file from the filesystem. When reading from the project it searches from the root of the project. Necessary since Xsd files can appear anywhere in the project. * VdbFileDialogUtil * Passes into methods VdbFolders enum value instead of vague boolean flag * plugin.xml * VdbBuilder * VdbDuplicateNamesMarkerResolutionGenerator * VdbMigrateXsdFilesMarkerResolution * Provides a quick fix to migrate Xsd files from the vdb's models collection to its otherFiles collection * VdbEditor * Refactor duplicate code into single addSelectionToVdb method * Vdb * Provides API for migrating Xsd files from the models collection to the other files collection and deleting the index file * VdbModelEntry * Broadens scope of imports collection to contain file entries as well as model entries * replaceImport method to replace import entry references * vdb-deployer.xsd * Comments out the constraint that stops vdbs from containing duplicate named models. This logic is already implemented in code and designer must support old vdbs that may contain such duplicate models and give the user the chance to fix them. Conflicts: plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringConstants.java plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/UdfJarDialogCellEditor.java plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbBuilder.java plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/Vdb.java Commit: 02386272b3c351e20478a5c70f3ac65384b2105b https://github.com/Teiid-Designer/teiid-designer/commit/02386272b3c351e20... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: A plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringConstants.java 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 Commit: fb77227a190e3cb0663e887a65b0fca7eddb3385 https://github.com/Teiid-Designer/teiid-designer/commit/fb77227a190e3cb06... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: A plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringConstants.java M plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/VdbHelper.java M plugins/org.teiid.designer.metamodels.function/src/org/teiid/designer/metamodels/function/aspects/validation/rules/ScalarFunctionRule.java M plugins/org.teiid.designer.metamodels.relational/src/org/teiid/designer/metamodels/relational/aspects/validation/rules/ProcedureFunctionRule.java M plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/edit/RelationalProcedureEditorPanel.java M plugins/org.teiid.designer.transformation.ui/src/org/teiid/designer/transformation/ui/editors/ViewProcedureEditorPanel.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileFromWorkspaceDialog.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileOptionsDialog.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/UdfJarDialogCellEditor.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/VdbFileDialogUtil.java M plugins/org.teiid.designer.vdb.ui/plugin.xml M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/Messages.java M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbBuilder.java A plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbDuplicateNamesMarkerResolutionGenerator.java A plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/build/VdbMigrateXsdFilesMarkerResolution.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/messages.properties 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 M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbFileEntry.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/manifest/ModelElement.java M plugins/org.teiid.designer.vdb/vdb-deployer.xsd Log Message: ----------- Merge pull request #350 from johnathonlee/TEIIDDES-2120 TEIIDDES-2120 Compare: https://github.com/Teiid-Designer/teiid-designer/compare/726c1ed06d2c...f...