[teiid-designer-dev] [Teiid-Designer/teiid-designer] 4e3652: TEIIDDES-2120: Stop relocating xsd files
Barry LaFond
blafond at redhat.com
Fri Jun 13 07:42:13 EDT 2014
Branch: refs/heads/8.3.x
Home: https://github.com/Teiid-Designer/teiid-designer
Commit: 4e365273cc0c1ea17deb36c44a228f1ab4b0344e
https://github.com/Teiid-Designer/teiid-designer/commit/4e365273cc0c1ea17deb36c44a228f1ab4b0344e
Author: Paul Richardson <p.g.richardson at redhat.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/FileUtil.java
A plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/mime.types
M plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/VdbHelper.java
M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileFromWorkspaceDialog.java
A plugins/org.teiid.designer.vdb.ui/icons/full/ctool16/add-schema.png
A plugins/org.teiid.designer.vdb.ui/icons/full/ctool16/remove-schema.png
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/VdbUiConstants.java
M 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/editor/panels/ModelDetailsPanel.java
M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/i18n.properties
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
A plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbIndexedEntry.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbModelEntry.java
A plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbSchemaEntry.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/EntryElement.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/ModelElement.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/ProblemElement.java
A tests/org.teiid.designer.core.test.framework/src/org/teiid/designer/core/workspace/MockFileBuilder.java
Log Message:
-----------
TEIIDDES-2120: Stop relocating xsd files
* FileUtil
* mime.types
* Function for guessing the file type of a file
* VdbMigrateXsdFilesMarkerResolution
* No need to migrate xsd files anymore. Just need to open the vdb and
resave it in order to fix a vdb
* VdbEditor
* Adds a tab panel for displaying schema files since they are now
separate from both the models and other files
* Vdb
* Splits the entries into 3 sets, file, udf jar and schema
* Automatically detect whether xsds are contained in the model entries of
the vdb manifest or entries and deal with them separately.
* This essentially fixes a vdb if it is the 'old' type
* No longer need migrate method since the xsd files are not actually
being relocated.
* VdbEntry
* If the file has no contents and a null stream is produced then return
-1 for the checksum rather than allowing a NPE
* VdbIndexedEntry
* Abstract parent class for both VdbModelEntry and VdbSchemaEntry that
is concerned with managing the indexes of these types of entry
* VdbSchemaEntry
* Own class explicitly for schemas delineating from both model and file
entries.
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/Vdb.java
Commit: 0fb9fb893dea7a95e7764ac0ddf31720790e86ff
https://github.com/Teiid-Designer/teiid-designer/commit/0fb9fb893dea7a95e7764ac0ddf31720790e86ff
Author: Paul Richardson <p.g.richardson at redhat.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/Vdb.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbConstants.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbUtil.java
M tests/org.teiid.designer.core.test.framework/src/org/teiid/designer/core/workspace/MockFileBuilder.java
M tests/org.teiid.designer.vdb.test/build.properties
M 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/VdbTest.java
A tests/org.teiid.designer.vdb.test/testdata/books.vdb
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/META-INF/vdb.xml
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/BookDatatypes.xsd
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/Books.xmi
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/Books.xsd
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/BooksXML.xmi
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/books.vdb
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/2000970593.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/2177535116.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/3418690534.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/3719569411.INDEX
Log Message:
-----------
TEIIDDES-2120: Fix and add VDB unit tests
* Vdb
* Utilise VdbConstants
* Ensures that the full path of the vdb's file does not duplicate the
path of the tmp folder when saving occurs
* MockFileBuilder
* 1-stop class for mocking a path, its related IFile and underpinned by a
real file
* VdbFileEntryTest
* VdbTest
* Fixes tests to cope with more calls to the mocked paths
* New tests for exploring the functionality of the vdb
Commit: bc41d1c52740a85c9fa4092b64248d81dd2200ca
https://github.com/Teiid-Designer/teiid-designer/commit/bc41d1c52740a85c9fa4092b64248d81dd2200ca
Author: Paul Richardson <p.g.richardson at redhat.com>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/Vdb.java
Log Message:
-----------
TEIIDDES-2120: Erroneous relativising of path value
* Seems making the path relative to the tmp folder is not a good idea
since it adds a ../ to its beginning. This causes the createTempFile
method to fail.
* Causes preview vdbs creation to fail with a "no such file or directory"
error
* Originally added to stop path being a full duplication of tmpFolder,
which occurred in some unit tests. However, this does not seem to be
repeated so removing.
Commit: 7451393ac191c14bfd8f6c3cb906eec0988a3bcb
https://github.com/Teiid-Designer/teiid-designer/commit/7451393ac191c14bfd8f6c3cb906eec0988a3bcb
Author: Barry LaFond <blafond at redhat.com>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/FileUtil.java
A plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/mime.types
M plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/VdbHelper.java
M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/extension/ChooseVdbFileFromWorkspaceDialog.java
A plugins/org.teiid.designer.vdb.ui/icons/full/ctool16/add-schema.png
A plugins/org.teiid.designer.vdb.ui/icons/full/ctool16/remove-schema.png
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/VdbUiConstants.java
M 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/editor/panels/ModelDetailsPanel.java
M plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/i18n.properties
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/VdbConstants.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
A plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbIndexedEntry.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbModelEntry.java
A plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbSchemaEntry.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbUtil.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/EntryElement.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/ModelElement.java
M plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/manifest/ProblemElement.java
A tests/org.teiid.designer.core.test.framework/src/org/teiid/designer/core/workspace/MockFileBuilder.java
M tests/org.teiid.designer.vdb.test/build.properties
M 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/VdbTest.java
A tests/org.teiid.designer.vdb.test/testdata/books.vdb
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/META-INF/vdb.xml
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/BookDatatypes.xsd
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/Books.xmi
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/Books.xsd
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/Test_TEIIDDES_2120/BooksXML.xmi
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/books.vdb
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/2000970593.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/2177535116.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/3418690534.INDEX
A tests/org.teiid.designer.vdb.test/testdata/books.vdb.project/runtime-inf/3719569411.INDEX
Log Message:
-----------
Merge pull request #376 from phantomjinx/8.3.x
8.3.x
Compare: https://github.com/Teiid-Designer/teiid-designer/compare/caefc7700065...7451393ac191
More information about the teiid-designer-dev
mailing list