TEIIDDES-2246 removed limitation to prevent importing via Teiid

connection importer for ldap, mongodb and modeshape DS types
Teiid-Designer · Aug 22, 2014 · abcc423 · abcc423
1 parent 58b55db
commit abcc423
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/...org.teiid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/Messages.java b/...org.teiid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/Messages.java
@@ -92,9 +92,6 @@ public class Messages extends NLS {
     public static String selectDataSourcePage_dataSourceGroupText;
     public static String selectDataSourcePage_dataSourcePropertiesGroupText;
     public static String selectDataSourcePage_NoSourceSelectedMsg;
-    public static String selectDataSourcePage_CannotImportSourceTypeMsg;
-    public static String selectDataSourcePage_CannotImportModeshapeTypeMsg;
-    public static String selectDataSourcePage_CannotImportLdapTypeMsg;
     public static String selectDataSourcePage_ConsiderJDBCImporterForSourceTypeMsg;
 
     public static String SelectTargetPage_title;

diff --git a/...iid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/messages.properties b/...iid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/messages.properties
@@ -84,9 +84,6 @@ selectDataSourcePage_help=This importer utilizes a Teiid runtime data source con
 selectDataSourcePage_dataSourceGroupText=Data Sources
 selectDataSourcePage_dataSourcePropertiesGroupText=Data Source Properties
 selectDataSourcePage_NoSourceSelectedMsg=Please select a DataSource from the available list
-selectDataSourcePage_CannotImportSourceTypeMsg=Sources of type "{0}" cannot be imported with this wizard.  Please consult the Teiid documentation for manual modeling instructions. 
-selectDataSourcePage_CannotImportModeshapeTypeMsg=Sources of type "{0}" cannot be imported with this wizard.  Please use the JDBC Importer for ModeShape imports.
-selectDataSourcePage_CannotImportLdapTypeMsg=Sources of type "{0}" cannot be imported with this wizard.  Please use the LDAP Importer.
 selectDataSourcePage_ConsiderJDBCImporterForSourceTypeMsg=If the selected source is of type JDBC it is recommended to use the JDBC Importer, if possible. \n If you proceed, please consult the teiid docs for optional source import properties.
 
 SelectTranslatorPage_title=Select the translator for the import

diff --git a/...teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/wizard/SelectDataSourcePage.java b/...teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/wizard/SelectDataSourcePage.java
@@ -203,16 +203,6 @@ private boolean validatePage() {
         String selectedDataSourceDriverName = getSelectedDataSourceDriverName();
         if(!CoreStringUtil.isEmpty(selectedDataSourceDriverName)) {
         	String driverNameLC = selectedDataSourceDriverName.toLowerCase();
-        	if(DISALLOWED_SOURCES.contains(driverNameLC)) {  
-        		if(driverNameLC.equals("modeshape")) {  //$NON-NLS-1$
-        			setThisPageComplete( NLS.bind(Messages.selectDataSourcePage_CannotImportModeshapeTypeMsg, driverNameLC) , ERROR);
-        		} else if(driverNameLC.equals("ldap")) { //$NON-NLS-1$
-        			setThisPageComplete( NLS.bind(Messages.selectDataSourcePage_CannotImportLdapTypeMsg, driverNameLC) , ERROR);
-        		}  else {
-        			setThisPageComplete( NLS.bind(Messages.selectDataSourcePage_CannotImportSourceTypeMsg, driverNameLC) , ERROR);
-        		}
-                return false;        		
-        	}
         	if(!BUILTIN_TYPES.contains(driverNameLC)) {
     			setThisPageComplete( NLS.bind(Messages.selectDataSourcePage_ConsiderJDBCImporterForSourceTypeMsg, driverNameLC) , WARNING);
     			return true;