Merge pull request #21 from mdrillin/TEIIDDES-1490

TEIIDDES-1490

plugins/org.teiid.datatools.connectivity.ui/plugin.xml

@@ -74,7 +74,7 @@
             configurationClass="org.teiid.datatools.connectivity.ui.TeiidDBUIConfiguration"
             default="false"
             product="Teiid"
-            version="7.x">
+            version="8.x">
       </dbUIConfiguration>
    </extension>
    <extension
@@ -84,7 +84,7 @@
             default="false"
             product="Teiid"
             supportsDebugging="false"
-            version="7.x">
+            version="8.x">
       </dbConfiguration>
    </extension> 
    <extension

plugins/org.teiid.datatools.connectivity/plugin.xml

@@ -33,7 +33,7 @@
 					value="Teiid" required="true" visible="true" />
 				<property generated="false"
 					id="org.eclipse.datatools.connectivity.db.version" name="Version"
-					value="7.x" required="true" visible="true" />
+					value="8.x" required="true" visible="true" />
 				<property generated="false"
 					id="org.eclipse.datatools.connectivity.db.URL" name="Connection URL"
 					value="jdbc:teiid:vdb-name@mms://localhost:31000" required="false"
@@ -56,8 +56,8 @@
           file="src/org/teiid/datatools/connectivity/database/teiidDB.xmi"
           product="Teiid"
           productDisplayString="Teiid"
-          version="7.x"
-          versionDisplayString="7.x">
+          version="8.x"
+          versionDisplayString="8.x">
     </definition>
  </extension>
  <extension
@@ -93,7 +93,7 @@
             provider="org.teiid.datatools.connectivity.sql.TeiidSchemaLoader"
             eclass="org.eclipse.datatools.modelbase.sql.schema.Schema"
             product="Teiid"
-            version="7.x"/>
+            version="8.x"/>
    </extension>
 
       <extension

plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/ConnectivityUtil.java

@@ -41,7 +41,7 @@ public class ConnectivityUtil {
     public static final String TEIID_PREVIEW_DRIVER_DEFINITION_ID = "DriverDefn.org.teiid.datatools.connectivity.driver.serverDriverTemplate.Teiid Driver Default"; //$NON-NLS-1$
     public static final String TEIID_PREVIEW_DRIVER_NAME = "Teiid Driver (default)"; //$NON-NLS-1$
     public static final String TEIID_PREVIEW_DRIVER_DEFN_TYPE = "org.teiid.datatools.connectivity.driver.serverDriverTemplate"; //$NON-NLS-1$
-	public static final String TEIID_DATABASE_VERSION = "7.x"; //$NON-NLS-1$
+	public static final String TEIID_DATABASE_VERSION = "8.x"; //$NON-NLS-1$
 	public static final String TEIID_DRIVER_DEFINITION_ID_BASE = "DriverDefn.org.teiid.datatools.connectivity.driver.serverDriverTemplate."; //$NON-NLS-1$
 
     public static Properties createDriverProps( String jarList,

plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/database/teiidDB.xmi

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<DBDefinition:DatabaseVendorDefinition xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:DBDefinition="http:///org/eclipse/datatools/modelbase/dbdefinition/dbdefinition.ecore" vendor="Teiid" version="7.x" maximumIdentifierLength="64" triggerSupported="false" joinSupported="true" tablespacesSupported="false" maximumCommentLength="64" mQTSupported="true" aliasSupported="true" quotedDMLSupported="false" quotedDDLSupported="false" xmlSupported="true">
+<DBDefinition:DatabaseVendorDefinition xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:DBDefinition="http:///org/eclipse/datatools/modelbase/dbdefinition/dbdefinition.ecore" vendor="Teiid" version="8.x" maximumIdentifierLength="64" triggerSupported="false" joinSupported="true" tablespacesSupported="false" maximumCommentLength="64" mQTSupported="true" aliasSupported="true" quotedDMLSupported="false" quotedDDLSupported="false" xmlSupported="true">
   <predefinedDataTypeDefinitions xmi:id="STRING_1" lengthSupported="true" keyConstraintSupported="true" maximumLength="4000" jdbcEnumType="12" javaClassName="java.lang.String" lengthUnit="DOUBLE_BYTE" displayName="">
     <defaultValueTypes>CURRENT_USER</defaultValueTypes>
     <defaultValueTypes>NULL</defaultValueTypes>

plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/i18n.properties

@@ -533,7 +533,7 @@ DeployVdbAction.noTeiidInstance.message=There is no connected default Teiid inst
 DeployVdbAction.teiidNotConnected.message=The Teiid instance "{0}" is not currently connected.
 DeployVdbAction.createDataSourceFailed = Teiid was unable to create a data source from VDB "{0}." Checking the Teiid server log may provide more details.
 DeployVdbAction.vdbFailedToDeploy = Teiid was unable to deploy VDB "{0}." Checking the Teiid server log may provide more details.
-DeployVdbAction.translatorDoesNotExistOnServer = One or more models in VDB "{0}" are either a missing translator name or have a translator name that is not found on the current Teiid server.\n\nThese translator problems must be fixed before you can deploy this VDB.
+DeployVdbAction.translatorDoesNotExistOnServer = One or more models in VDB "{0}" are either missing a translator name or have a translator name that is not found on the current Teiid server.\n\nThese translator problems must be fixed before you can deploy this VDB.
 DeployVdbAction.unknownDeployError = There was an unknown error of {1} that occurred when trying to deploy VDB "{0}."
 DeployVdbAction.problemDeployingVdbToServer = There was a problem deploying VDB "{0}" to server "{1}."
 DeployVdbAction.selectionIsNotAVdb = <Selection is not a VDB!>

plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java

@@ -142,7 +142,7 @@ public VDB deployVdb( IFile vdbFile ) throws Exception {
         String vdbName = vdbFile.getFullPath().lastSegment();
         String vdbNameNoExt = vdbFile.getFullPath().removeFileExtension().lastSegment();
 
-        admin.undeploy(vdbName);
+        admin.deploy(vdbName, vdbFile.getContents());
 
         refreshVDBs();
 
@@ -153,7 +153,7 @@ public VDB deployVdb( IFile vdbFile ) throws Exception {
 
         return vdb;
     }
-
+    
     /**
      * Deploys the input Vdb archive file to the related Teiid server
      *