Branch: refs/heads/master Home: https://github.com/Teiid-Designer/teiid-designer Commit: db195c8b21ebff13c63a9a6ef5e029df45670d4a https://github.com/Teiid-Designer/teiid-designer/commit/db195c8b21ebff13c... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2013-06-10 (Mon, 10 Jun 2013) Changed paths: A plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/KeyInValueHashMap.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiPlugin.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInput.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInputFactory.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServerManager.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/runtime/spi/ITeiidServer.java R plugins/org.teiid.designer.ui.common/src/org/teiid/designer/ui/common/util/KeyInValueHashMap.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/refactor/AbstractResourcesRefactoring.java M tests/org.teiid.designer.dqp.test/src/org/teiid/designer/runtime/ServerManagerTest.java R tests/org.teiid.designer.dqp.test/testdata/oldregistrydata/serverRegistry.xml M tests/org.teiid.designer.dqp.test/testdata/serverRegistry.xml Log Message: ----------- TEIIDDES-1699: Assign Teiid Server unique id * Allows servers residing on the same box, with the same host and port to be configured in the Servers View * Move KeyInValueHashMap to a more useful location * ITeiidServer * Provide a getId() method that returns the unique identifier for the server * TeiidServer * Generate the unique id from the url, version and parent id * TeiidServerManager * Cache the servers in a map keyed on the server id rather than a list * Get servers using their id rather than their url since the latter is not unique * Remove the 'old' xml state restoration since it makes little sense and would never produce a working teiid server due to a lack of associated parent server. * DqpUiPlugin * TeiidServerEditorInput[Factory] * Use the server's id rather than the url * ServerManagerTest * Fixes tests in light of API and functional changes to server manager * Remove testing of old registry xml syntax since it is no longer used * Fixes syntax of second server in test registry data xml Commit: 60d85be446f4f649aa8fcdacf5986752bc8816fd https://github.com/Teiid-Designer/teiid-designer/commit/60d85be446f4f649a... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2013-06-11 (Tue, 11 Jun 2013) Changed paths: A plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/KeyInValueHashMap.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiPlugin.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInput.java M plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInputFactory.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServerManager.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/runtime/spi/ITeiidServer.java R plugins/org.teiid.designer.ui.common/src/org/teiid/designer/ui/common/util/KeyInValueHashMap.java M plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/refactor/AbstractResourcesRefactoring.java M tests/org.teiid.designer.dqp.test/src/org/teiid/designer/runtime/ServerManagerTest.java R tests/org.teiid.designer.dqp.test/testdata/oldregistrydata/serverRegistry.xml M tests/org.teiid.designer.dqp.test/testdata/serverRegistry.xml Log Message: ----------- Merge pull request #180 from phantomjinx/TEIIDDES-1699 TEIIDDES-1699: Assign Teiid Server unique id Compare: https://github.com/Teiid-Designer/teiid-designer/compare/aaec718217aa...6...