Merge branch 'master' into 8.6.x.kepler

Conflicts: documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml documentation/guides/Teiid_Designer_User_Guide/pom.xml features/org.teiid.datatools.connectivity.feature/feature.xml features/org.teiid.datatools.connectivity.feature/pom.xml features/org.teiid.designer.feature/feature.xml features/org.teiid.designer.feature/pom.xml features/org.teiid.designer.runtime.feature/feature.xml features/org.teiid.designer.runtime.feature/pom.xml features/org.teiid.designer.teiid.client.feature/feature.xml features/org.teiid.designer.teiid.client.feature/pom.xml features/org.teiid.designer.test.feature/feature.xml features/org.teiid.designer.test.feature/pom.xml plugins/org.teiid.core.designer/META-INF/MANIFEST.MF plugins/org.teiid.core.designer/pom.xml plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF plugins/org.teiid.datatools.connectivity.model/pom.xml plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF plugins/org.teiid.datatools.connectivity.ui/pom.xml plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF plugins/org.teiid.datatools.connectivity/pom.xml plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.advisor.ui/pom.xml plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.compare.ui/pom.xml plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF plugins/org.teiid.designer.compare/pom.xml plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF plugins/org.teiid.designer.core.xslt/pom.xml plugins/org.teiid.designer.core/META-INF/MANIFEST.MF plugins/org.teiid.designer.core/pom.xml plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.datatools.ui/pom.xml plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF plugins/org.teiid.designer.datatools/pom.xml plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.ddl.importer.ui/pom.xml plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF plugins/org.teiid.designer.ddl.importer/pom.xml plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF plugins/org.teiid.designer.ddl.spi/pom.xml plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF plugins/org.teiid.designer.ddl/pom.xml plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.diagram.ui/pom.xml plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.dqp.ui/pom.xml plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF plugins/org.teiid.designer.dqp/pom.xml plugins/org.teiid.designer.dsp.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.extension.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.extension.ui/pom.xml plugins/org.teiid.designer.extension/META-INF/MANIFEST.MF plugins/org.teiid.designer.extension/pom.xml plugins/org.teiid.designer.jdbc.relational/META-INF/MANIFEST.MF plugins/org.teiid.designer.jdbc.relational/pom.xml plugins/org.teiid.designer.jdbc.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.jdbc.ui/pom.xml plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF plugins/org.teiid.designer.jdbc/pom.xml plugins/org.teiid.designer.json.lib/META-INF/MANIFEST.MF plugins/org.teiid.designer.json.lib/pom.xml plugins/org.teiid.designer.legacy/META-INF/MANIFEST.MF plugins/org.teiid.designer.legacy/pom.xml plugins/org.teiid.designer.mapping.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.mapping.ui/pom.xml plugins/org.teiid.designer.mapping/META-INF/MANIFEST.MF plugins/org.teiid.designer.mapping/pom.xml plugins/org.teiid.designer.metamodels.builder.execution/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.builder.execution/pom.xml plugins/org.teiid.designer.metamodels.builder/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.builder/pom.xml plugins/org.teiid.designer.metamodels.core/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.core/pom.xml plugins/org.teiid.designer.metamodels.dependency/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.dependency/pom.xml plugins/org.teiid.designer.metamodels.diagram/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.diagram/pom.xml plugins/org.teiid.designer.metamodels.function/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.function/pom.xml plugins/org.teiid.designer.metamodels.relational/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.relational/pom.xml plugins/org.teiid.designer.metamodels.transformation/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.transformation/pom.xml plugins/org.teiid.designer.metamodels.webservice/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.webservice/pom.xml plugins/org.teiid.designer.metamodels.wsdl/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.wsdl/pom.xml plugins/org.teiid.designer.metamodels.xml/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.xml/pom.xml plugins/org.teiid.designer.metamodels.xsd.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.xsd.ui/pom.xml plugins/org.teiid.designer.metamodels.xsd/META-INF/MANIFEST.MF plugins/org.teiid.designer.metamodels.xsd/pom.xml plugins/org.teiid.designer.modelgenerator.ldap.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.ldap.ui/pom.xml plugins/org.teiid.designer.modelgenerator.salesforce.lib/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.salesforce.lib/pom.xml plugins/org.teiid.designer.modelgenerator.salesforce.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.salesforce.ui/pom.xml plugins/org.teiid.designer.modelgenerator.salesforce/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.salesforce/pom.xml plugins/org.teiid.designer.modelgenerator.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.ui/pom.xml plugins/org.teiid.designer.modelgenerator.wsdl.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.wsdl.ui/pom.xml plugins/org.teiid.designer.modelgenerator.wsdl/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.wsdl/pom.xml plugins/org.teiid.designer.modelgenerator.xml/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator.xml/pom.xml plugins/org.teiid.designer.modelgenerator/META-INF/MANIFEST.MF plugins/org.teiid.designer.modelgenerator/pom.xml plugins/org.teiid.designer.modeshape/META-INF/MANIFEST.MF plugins/org.teiid.designer.modeshape/pom.xml plugins/org.teiid.designer.query.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.query.ui/pom.xml plugins/org.teiid.designer.relational.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.relational.ui/pom.xml plugins/org.teiid.designer.relational/META-INF/MANIFEST.MF plugins/org.teiid.designer.relational/pom.xml plugins/org.teiid.designer.roles.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.roles.ui/pom.xml plugins/org.teiid.designer.roles/META-INF/MANIFEST.MF plugins/org.teiid.designer.roles/pom.xml plugins/org.teiid.designer.schema.tools/META-INF/MANIFEST.MF plugins/org.teiid.designer.schema.tools/pom.xml plugins/org.teiid.designer.sdt/META-INF/MANIFEST.MF plugins/org.teiid.designer.sdt/pom.xml plugins/org.teiid.designer.spi/META-INF/MANIFEST.MF plugins/org.teiid.designer.spi/pom.xml plugins/org.teiid.designer.teiidimporter.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.teiidimporter.ui/pom.xml plugins/org.teiid.designer.tools.textimport.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.tools.textimport.ui/pom.xml plugins/org.teiid.designer.transformation.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.transformation.ui/pom.xml plugins/org.teiid.designer.transformation/META-INF/MANIFEST.MF plugins/org.teiid.designer.transformation/pom.xml plugins/org.teiid.designer.udf.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.udf.ui/pom.xml plugins/org.teiid.designer.udf/META-INF/MANIFEST.MF plugins/org.teiid.designer.udf/pom.xml plugins/org.teiid.designer.ui.common/META-INF/MANIFEST.MF plugins/org.teiid.designer.ui.common/pom.xml plugins/org.teiid.designer.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.ui/pom.xml plugins/org.teiid.designer.vdb.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.vdb.ui/pom.xml plugins/org.teiid.designer.vdb/META-INF/MANIFEST.MF plugins/org.teiid.designer.vdb/pom.xml plugins/org.teiid.designer.webservice.lib/META-INF/MANIFEST.MF plugins/org.teiid.designer.webservice.lib/pom.xml plugins/org.teiid.designer.webservice.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.webservice.ui/pom.xml plugins/org.teiid.designer.webservice/META-INF/MANIFEST.MF plugins/org.teiid.designer.webservice/pom.xml plugins/org.teiid.designer.xml.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.xml.ui/pom.xml plugins/org.teiid.designer.xml/META-INF/MANIFEST.MF plugins/org.teiid.designer.xml/pom.xml plugins/org.teiid.designer.xsd.ui/META-INF/MANIFEST.MF plugins/org.teiid.designer.xsd.ui/pom.xml plugins/org.teiid.designer.xsd/META-INF/MANIFEST.MF plugins/org.teiid.designer.xsd/pom.xml plugins/org.teiid.designer/META-INF/MANIFEST.MF plugins/org.teiid.designer/about.properties plugins/org.teiid.designer/pom.xml plugins/techpreview.designer.ui/META-INF/MANIFEST.MF plugins/techpreview.designer.ui/pom.xml plugins/teiid/org.teiid.runtime.client/META-INF/MANIFEST.MF plugins/teiid/org.teiid.runtime.client/pom.xml site/pom.xml test-aggregate/org.teiid.designer.aggregate.test/META-INF/MANIFEST.MF test-aggregate/org.teiid.designer.aggregate.test/pom.xml tests/org.teiid.core.designer.test.framework/META-INF/MANIFEST.MF tests/org.teiid.core.designer.test.framework/pom.xml tests/org.teiid.core.designer.test/META-INF/MANIFEST.MF tests/org.teiid.core.designer.test/pom.xml tests/org.teiid.designer.compare.test/META-INF/MANIFEST.MF tests/org.teiid.designer.compare.test/pom.xml tests/org.teiid.designer.core.test.framework/META-INF/MANIFEST.MF tests/org.teiid.designer.core.test.framework/pom.xml tests/org.teiid.designer.core.test/META-INF/MANIFEST.MF tests/org.teiid.designer.core.test/pom.xml tests/org.teiid.designer.core.xslt.test/META-INF/MANIFEST.MF tests/org.teiid.designer.core.xslt.test/pom.xml tests/org.teiid.designer.ddl.importer.test/META-INF/MANIFEST.MF tests/org.teiid.designer.ddl.importer.test/pom.xml tests/org.teiid.designer.dqp.test/META-INF/MANIFEST.MF tests/org.teiid.designer.dqp.test/pom.xml tests/org.teiid.designer.extension.test/META-INF/MANIFEST.MF tests/org.teiid.designer.extension.test/pom.xml tests/org.teiid.designer.jdbc.relational.test/META-INF/MANIFEST.MF tests/org.teiid.designer.jdbc.relational.test/pom.xml tests/org.teiid.designer.jdbc.test.framework/META-INF/MANIFEST.MF tests/org.teiid.designer.jdbc.test.framework/pom.xml tests/org.teiid.designer.jdbc.test/META-INF/MANIFEST.MF tests/org.teiid.designer.jdbc.test/pom.xml tests/org.teiid.designer.mapping.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.mapping.ui.test/pom.xml tests/org.teiid.designer.metamodels.core.test/META-INF/MANIFEST.MF tests/org.teiid.designer.metamodels.core.test/pom.xml tests/org.teiid.designer.metamodels.relational.test/META-INF/MANIFEST.MF tests/org.teiid.designer.metamodels.relational.test/pom.xml tests/org.teiid.designer.metamodels.transformation.test/META-INF/MANIFEST.MF tests/org.teiid.designer.metamodels.transformation.test/pom.xml tests/org.teiid.designer.metamodels.wsdl.test/META-INF/MANIFEST.MF tests/org.teiid.designer.metamodels.wsdl.test/pom.xml tests/org.teiid.designer.metamodels.xml.test/META-INF/MANIFEST.MF tests/org.teiid.designer.metamodels.xml.test/pom.xml tests/org.teiid.designer.modelgenerator.salesforce.test/META-INF/MANIFEST.MF tests/org.teiid.designer.modelgenerator.salesforce.test/pom.xml tests/org.teiid.designer.modelgenerator.test/META-INF/MANIFEST.MF tests/org.teiid.designer.modelgenerator.test/pom.xml tests/org.teiid.designer.modelgenerator.wsdl.test/META-INF/MANIFEST.MF tests/org.teiid.designer.modelgenerator.wsdl.test/pom.xml tests/org.teiid.designer.query.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.query.ui.test/pom.xml tests/org.teiid.designer.schema.tools.test/META-INF/MANIFEST.MF tests/org.teiid.designer.schema.tools.test/pom.xml tests/org.teiid.designer.sdt.test/META-INF/MANIFEST.MF tests/org.teiid.designer.sdt.test/pom.xml tests/org.teiid.designer.spi.test/META-INF/MANIFEST.MF tests/org.teiid.designer.spi.test/pom.xml tests/org.teiid.designer.transformation.test/META-INF/MANIFEST.MF tests/org.teiid.designer.transformation.test/pom.xml tests/org.teiid.designer.ui.common.test/META-INF/MANIFEST.MF tests/org.teiid.designer.ui.common.test/pom.xml tests/org.teiid.designer.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.ui.test/pom.xml tests/org.teiid.designer.vdb.test/META-INF/MANIFEST.MF tests/org.teiid.designer.vdb.test/pom.xml tests/org.teiid.designer.webservice.test/META-INF/MANIFEST.MF tests/org.teiid.designer.webservice.test/pom.xml tests/org.teiid.designer.webservice.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.webservice.ui.test/pom.xml tests/org.teiid.designer.xml.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.xml.ui.test/pom.xml tests/org.teiid.designer.xsd.ui.test/META-INF/MANIFEST.MF tests/org.teiid.designer.xsd.ui.test/pom.xml tests/org.teiid.runtime.client.test/META-INF/MANIFEST.MF tests/org.teiid.runtime.client.test/pom.xml
Teiid-Designer · Oct 7, 2014 · 7867129 · 7867129
2 parents 20edf7f + 6a73660
commit 7867129
Show file tree

Hide file tree

Showing 21 changed files with 252 additions and 66 deletions.
diff --git a/...gner.datatools/src/org/teiid/designer/datatools/profiles/ws/WSConnectionInfoProvider.java b/...gner.datatools/src/org/teiid/designer/datatools/profiles/ws/WSConnectionInfoProvider.java
@@ -34,7 +34,7 @@ public void setConnectionInfo(ModelResource modelResource,
         }
 
         String user = props.getProperty(ICredentialsCommon.USERNAME_PROP_ID);
-        if (null != user &! user.isEmpty()) {
+        if (null != user && user.isEmpty()) {
             connectionProps.setProperty(CONNECTION_NAMESPACE + ICredentialsCommon.USERNAME_PROP_ID, user);
         }
 

diff --git a/...eiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImporterPage.java b/...eiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImporterPage.java
@@ -185,7 +185,10 @@ boolean validFile( final IFile file ) {
                                                           });
         final IResource choice = showChooseDialog(dlg);
         if (choice == null) return;
-        ddlFileCombo.setText(choice.getFullPath().removeFileExtension().toString());
+
+        // Convert the IFile object to a File object
+        final File realFile = choice.getLocation().toFile();
+        ddlFileCombo.setText(realFile.toString());
         tabFromDdlFileCombo();
     }
 

diff --git a/...eiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java b/...eiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java
@@ -285,6 +285,18 @@ private void createConstraint(AstNode constraintNode, RelationalTable table, Rel
 				addProgressMessage(error.getMessage());
 			}
 		}
+
+		// Find all the Option properties
+		List<AstNode> optionNodes = new ArrayList<AstNode>();
+		List<AstNode> children = constraintNode.getChildren();
+		for(AstNode child: children) {
+			if(is(child, StandardDdlLexicon.TYPE_STATEMENT_OPTION)) {
+				optionNodes.add(child);
+			}
+		}
+
+		// process the Column Options
+		processOptions(optionNodes,key);
 	}
 
 	@Override

diff --git a/plugins/org.teiid.designer.dqp.ui/plugin.properties b/plugins/org.teiid.designer.dqp.ui/plugin.properties
@@ -92,6 +92,10 @@ deployVdbAction.name = Deploy
 deployVdbAction.label = Deploy
 deployVdbAction.tooltip = Deploy VDB to server
 
+deployDynamicVdbAction.name = Deploy
+deployDynamicVdbAction.label = Deploy
+deployDynamicVdbAction.tooltip = Deploy Dynamic VDB to server
+
 generateWarAction.name = Generate SOAP War
 generateWarAction.label = Generate SOAP War
 generateWarAction.tooltip = Generate SOAP War file

diff --git a/plugins/org.teiid.designer.dqp.ui/plugin.xml b/plugins/org.teiid.designer.dqp.ui/plugin.xml
@@ -78,14 +78,23 @@
          label="%previewTableDataContextAction.label">
       </specialAction>
    </extension>
-      <extension
+   <extension
         id="DeployVdbAction"
         name="%deployVdbAction.name"
         point="org.teiid.designer.ui.modelResourceAction">
       <resourceAction
          name="org.teiid.designer.runtime.ui.actions.DeployVdbAction"
          label="%deployVdbAction.label">
       </resourceAction>
+   </extension>
+   <extension
+        id="DeployDynamicVdbAction"
+        name="%deployVdbAction.name"
+        point="org.teiid.designer.ui.modelResourceAction">
+      <resourceAction
+         name="org.teiid.designer.runtime.ui.actions.DeployDynamicVdbAction"
+         label="%deployDynamicVdbAction.label">
+      </resourceAction>
    </extension>
      <extension
         id="ExecuteVdbAction"

diff --git a/plugins/org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/messages.properties b/plugins/org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/messages.properties
@@ -89,9 +89,9 @@ security=Security
 securityTooltip=Double-click to add or edit security condition or masking definition
 rowBasedSecurityHelpText=Filter out sensitive rows of results from table/view based condition provided for this data-role
 columnMaskingHelpText=Define condition and SQL expression to mask column results
-selectedTableViewOrProcedure=Selected Column, Table, View or Procedure
-rowBasedSecurityOkMessage=Valid column, table, view or procedure selected. Click OK to finish.
-invalidSelectionRowBasedSecurityMessage=Selected object is not a column, table, view or procedure
+selectedTableViewOrProcedure=Selected  Table, View or Procedure
+rowBasedSecurityOkMessage=Valid table, view or procedure selected. Click OK to finish.
+invalidSelectionRowBasedSecurityMessage=Selected object is not a table, view or procedure
 noTargetSelected=No target selected
 columnExpressionHelpText=Column Expression will be used in place of masked column in executed query
 selectedColumn=Selected Column

diff --git a/...esigner.roles.ui/src/org/teiid/designer/roles/ui/wizard/panels/RowBasedSecurityPanel.java b/...esigner.roles.ui/src/org/teiid/designer/roles/ui/wizard/panels/RowBasedSecurityPanel.java
@@ -814,8 +814,7 @@ private String getResourceName( Resource res ) {
         private boolean isValidSelection(Object obj ) {
         	return (obj instanceof org.teiid.designer.metamodels.relational.Table || 
         			obj instanceof org.teiid.designer.metamodels.relational.View ||
-        			obj instanceof org.teiid.designer.metamodels.relational.Procedure ||
-        			obj instanceof org.teiid.designer.metamodels.relational.Column);
+        			obj instanceof org.teiid.designer.metamodels.relational.Procedure);
         }
 
         private void updateOnSelection( Object selectedObject ) {

diff --git a/...teiid.designer.transformation.ui/src/org/teiid/designer/transformation/ui/i18n.properties b/...teiid.designer.transformation.ui/src/org/teiid/designer/transformation/ui/i18n.properties
@@ -838,7 +838,7 @@ TeiidMetadataImportSourcePage.selectedXmlFile=Selected Data File:
 TeiidMetadataImportSourcePage.selectedRestFile=Selected Response File:
 TeiidMetadataImportSourcePage.location=Location:
 TeiidMetadataImportSourcePage.browse=...
-TeiidMetadataImportSourcePage.name=Name:
+TeiidMetadataImportSourcePage.name=Name:fIn
 TeiidMetadataImportSourcePage.modelStatus=Model Status
 TeiidMetadataImportSourcePage.sourceModelUndefined=No source model is defined
 TeiidMetadataImportSourcePage.sourceModelWillBeCreated= NEW MODEL: Source model [ {0} ] does not exist.\nModel with required {1} procedure will be created on FINISH.
@@ -883,6 +883,10 @@ TeiidMetadataImportSourcePage.selectSourceModelMessage=Select source model and c
 TeiidMetadataImportSourcePage.invalidXmlConnectionProfileMessage=The selected connection profile does not contain a valid or current reference to an existing XML file.\n\n\
 	Edit the connection profile to enter valid info or select another valid profile to continue.
 TeiidMetadataImportSourcePage.invalidXmlConnectionProfileTitle=Invalid XML Connection Profile
+TeiidMetadataImportSourcePage.invalidRESTConnectionProfileMessage=The selected connection profile does not contain a valid or current reference to an existing REST service.\n\n\
+	Edit the connection profile to enter valid info or select another valid profile to continue.
+TeiidMetadataImportSourcePage.invalidRESTConnectionProfileTitle=Invalid REST Connection Profile
+TeiidMetadataImportSourcePage.invalidRESTResponseTypeMessage=The return type for the connection profile is {0}. An invalid response was returned.
 TeiidMetadataImportSourcePage.malformedUrlErrorTitle=Malformed URL Error
 TeiidMetadataImportSourcePage.malformedUrlErrorMessage=Error building URL:  
 TeiidMetadataImportSourcePage.protocolErrorTitle=Protocol Error

diff --git a/...src/org/teiid/designer/transformation/ui/wizards/file/FlatFileRelationalModelFactory.java b/...src/org/teiid/designer/transformation/ui/wizards/file/FlatFileRelationalModelFactory.java
@@ -7,9 +7,6 @@
  */
 package org.teiid.designer.transformation.ui.wizards.file;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -18,8 +15,6 @@
 import org.teiid.designer.core.types.DatatypeManager;
 import org.teiid.designer.core.workspace.ModelResource;
 import org.teiid.designer.core.workspace.ModelWorkspaceException;
-import org.teiid.designer.core.workspace.ModelWorkspaceItem;
-import org.teiid.designer.core.workspace.ModelWorkspaceManager;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.metamodels.relational.Column;
 import org.teiid.designer.metamodels.relational.DirectionKind;
@@ -52,6 +47,10 @@ public class FlatFileRelationalModelFactory implements UiConstants {
     public static final String ALL_INVOKE_PROCEDURES = "allInvokeProcedures"; //$NON-NLS-1$
 
     public static final int DEFAULT_STRING_LENGTH = 4000;
+    public static final int DEFAULT_PRECISION = 10;
+
+    public static final String INT_STR = "int";
+    public static final String INTEGER_STR = "integer";
 
     private static boolean isTransactionable = ModelerCore.getPlugin() != null;
 

diff --git a/...on.ui/src/org/teiid/designer/transformation/ui/wizards/file/FlatFileViewModelFactory.java b/...on.ui/src/org/teiid/designer/transformation/ui/wizards/file/FlatFileViewModelFactory.java
@@ -7,9 +7,6 @@
  */
 package org.teiid.designer.transformation.ui.wizards.file;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.ecore.EObject;
 import org.teiid.core.designer.ModelerCoreException;
@@ -19,8 +16,6 @@
 import org.teiid.designer.core.util.NewModelObjectHelperManager;
 import org.teiid.designer.core.workspace.ModelResource;
 import org.teiid.designer.core.workspace.ModelWorkspaceException;
-import org.teiid.designer.core.workspace.ModelWorkspaceItem;
-import org.teiid.designer.core.workspace.ModelWorkspaceManager;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.metamodels.relational.BaseTable;
 import org.teiid.designer.metamodels.relational.Column;
@@ -33,6 +28,7 @@
 import org.teiid.designer.transformation.util.TransformationHelper;
 import org.teiid.designer.transformation.util.TransformationMappingHelper;
 import org.teiid.designer.transformation.validation.TransformationValidator;
+import org.teiid.designer.ui.viewsupport.DatatypeUtilities;
 import org.teiid.designer.ui.viewsupport.ModelUtilities;
 
 
@@ -74,7 +70,15 @@ private void createColumns(ITeiidMetadataFileInfo info, BaseTable baseTable) thr
     		column.setDefaultValue(columnInfo.getDefaultValue());
     		column.setFixedLength(info.isFixedWidthColumns());
 
-    		EObject datatype = datatypeManager.findDatatype(columnInfo.getDatatype());
+    		// Datatype may be defined as "integer" here but we need to covert to "int" to insure that the SQL resolves
+    		// correctly
+
+    		String finalDType = columnInfo.getDatatype();
+    		if( INTEGER_STR.equalsIgnoreCase(finalDType) ) {
+    			finalDType = INT_STR;
+    		}
+
+    		EObject datatype = datatypeManager.findDatatype(finalDType);
     		if (datatype != null) {
     			column.setType(datatype);
     			if( stringType != null && stringType == datatype) {
@@ -83,7 +87,9 @@ private void createColumns(ITeiidMetadataFileInfo info, BaseTable baseTable) thr
     				} else {
     					column.setLength(DEFAULT_STRING_LENGTH);
     				}
-    			}
+    			} else if( DatatypeUtilities.isNumeric(finalDType)) {
+					column.setPrecision(DEFAULT_PRECISION);
+				}
     		}
 
     		baseTable.getColumns().add(column);

diff --git a/...ation.ui/src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataFileInfo.java b/...ation.ui/src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataFileInfo.java
@@ -15,6 +15,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.StringTokenizer;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.teiid.core.designer.util.CoreArgCheck;
@@ -155,6 +156,8 @@ private static String getString( final String id ) {
 
 	private String charset = "UTF-8";  //$NON-NLS-1$
 
+	private boolean includeTypeLine = false;
+
 	private boolean loaded = false;
 
 	/**
@@ -217,6 +220,7 @@ public void inject(TeiidMetadataFileInfo info) {
 		this.useHeaderForColumnNames = info.doUseHeaderForColumnNames();
 
 		this.firstDataRow = info.getFirstDataRow();
+		this.includeTypeLine = info.getIncludeTypeLine();
 
 		this.includeEscape = info.doIncludeEscape();
 		this.includeHeader = info.doIncludeHeader();
@@ -474,6 +478,19 @@ public String[] getCachedFirstLines() {
 		return this.cachedFirstLines;
 	}
 
+	private String getDataTypeString() {
+		if( this.includeTypeLine ) {
+			if( cachedFirstLines.length == 0 ) {
+				return null;
+			}
+			if( headerLineNumber <= this.cachedFirstLines.length) {
+				return this.cachedFirstLines[this.headerLineNumber];
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * 
 	 * @return columnInfoList the <code>TeiidColumnInfo[]</code> array parsed from the header in the data file
@@ -510,6 +527,10 @@ private void defineColumns() {
 		this.columnInfoList.clear();
 
 		if( this.useHeaderForColumnNames && getHeaderString() != null && getHeaderString().length() > 0 ) {
+			List<String> names = new ArrayList<String>();
+			List<String> datatypes = new ArrayList<String>();
+
+			// Parse Column Names
 			String delim = "" + getDelimiter(); //$NON-NLS-1$
 			StringTokenizer strTokeniser = new StringTokenizer(getHeaderString(), delim);
 			while( strTokeniser.hasMoreTokens() ) {
@@ -519,9 +540,39 @@ private void defineColumns() {
 					nextTok = nextTok.substring(1, nextTok.length()-1);
 				}
 				if( nextTok != null && nextTok.length() > 0 ) {
-					this.columnInfoList.add(new TeiidColumnInfo(nextTok));
+					names.add(nextTok);
+				}
+			}
+
+			if( this.includeTypeLine ) {
+				String dataTypeString = getDataTypeString();
+				if( dataTypeString != null ) {
+					int nextCol = 0;
+					StringTokenizer tokenizer = new StringTokenizer(dataTypeString, delim);
+					while( tokenizer.hasMoreTokens() ) {
+						String nextTok = tokenizer.nextToken().trim();
+
+						if( nextTok != null && nextTok.length() > 0 ) {
+							if( nextTok.equalsIgnoreCase("integer" )) {
+								nextTok = "int";
+							}
+							datatypes.add(nextTok);
+						}
+					}
+				}
+			}
+
+			int count = 0;
+			for( String name : names ) {
+				TeiidColumnInfo colInfo = new TeiidColumnInfo(name);
+
+				if( !datatypes.isEmpty() && datatypes.size() == names.size() ) {
+					colInfo.setDatatype(datatypes.get(count++));
 				}
+				this.columnInfoList.add(colInfo);
 			}
+
+			// Parse data type names
 		} else {
 //			for( int i=0; i<this.numberOfFixedWidthColumns; i++ ) {
 //				String colName = "col" + (i+1); //$NON-NLS-1$
@@ -976,5 +1027,13 @@ public void setCharSet(String theCharSet) {
     public String getCharSet() {
 		return this.charSet;
 	}
+
+	public boolean getIncludeTypeLine() {
+		return this.includeTypeLine;
+	}
+
+	public void setIncludeTypeLine(boolean value) {
+		this.includeTypeLine = value;
+	}
 
 }
diff --git a/.../src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportSourcePage.java b/.../src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportSourcePage.java
@@ -14,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Properties;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -457,7 +458,11 @@ public void widgetSelected(SelectionEvent e) {
 								TeiidMetadataFileInfo fileInfo = info.getCheckedFileInfo();
 								if( fileInfo != null ) {
 									if( profileInfo.columnsInFirstLine ) {
-										fileInfo.setFirstDataRow(1);
+										if( profileInfo.includeTypeLine ) {
+											fileInfo.setFirstDataRow(3);
+										} else {
+											fileInfo.setFirstDataRow(2);
+										}
 									}
 								}
 							}
@@ -561,7 +566,7 @@ void profileSelectionChanged() {
 					clearFileListViewer();
 					loadFileListViewer();
 
-					if( this.info.getFileInfos().isEmpty() ) {
+					if( !this.info.getFileInfos().isEmpty() ) {
 						// Check for FIRST LINE FOR COLUMNS
 						String firstLineHasColumns = (String) props.get(INCLCOLUMNNAME);
 						if( firstLineHasColumns != null ) {
@@ -575,7 +580,14 @@ void profileSelectionChanged() {
 						if( delimiterType != null ) {
 							this.profileInfo.delimiterType = delimiterType;
 						}
+
+						for( TeiidMetadataFileInfo nextInfo : this.info.getFileInfos() ) {
+							nextInfo.setCharSet(this.profileInfo.charset);
+							nextInfo.setIncludeTypeLine(this.profileInfo.includeTypeLine);
+						}
 					}
+
+
 					break;
 				}
 			}

diff --git a/...on.ui/src/org/teiid/designer/transformation/ui/wizards/rest/TeiidRestImportProcessor.java b/...on.ui/src/org/teiid/designer/transformation/ui/wizards/rest/TeiidRestImportProcessor.java
@@ -112,7 +112,7 @@ protected void addConnectionProfileInfoToModel(ModelResource sourceModel, IConne
     		IConnectionInfoProvider provider = null;
     		if( getInfo().isXmlLocalFileMode() ) {
     			provider = new XmlFileConnectionInfoProvider();
-    		} else if( getInfo().isXmlUrlFileMode() ) {
+    		} else if( getInfo().isRestUrlFileMode() ) {
     			if( IWSProfileConstants.TEIID_WS_CONNECTION_PROFILE_ID.equalsIgnoreCase(profile.getProviderId()) ) {
     				provider = new WSConnectionInfoProvider();
     			} else {