TEIIDDES-1518: Create an spi plugin

* Refactor out interfaces into their own spi plugin. Allows teiid client plugins to depend on the spi. * Avoids causing circular dependencies
Teiid-Designer · Nov 15, 2012 · 4fc7fe6 · 4fc7fe6
1 parent 0807d48
commit 4fc7fe6
Show file tree

Hide file tree

Showing 112 changed files with 336 additions and 222 deletions.
diff --git a/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
  org.teiid.datatools.connectivity.model;bundle-version="[8.0.0,9.0.0)",
  org.eclipse.debug.core;bundle-version="[3.7.100,4.0.0)",
  org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.2,2.0.0)",
- org.eclipse.datatools.sqltools.routineeditor;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.datatools.sqltools.routineeditor;bundle-version="[1.0.0,2.0.0)",
+ org.teiid.designer.spi;bundle-version="8.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.xerces.parsers;version="2.9.0",

diff --git a/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
  org.eclipse.datatools.sqltools.parsers.sql;bundle-version="[1.0.2,2.0.0)",
  org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[1.1.100,2.0.0)",
  org.teiid.datatools.connectivity.model;bundle-version="[8.0.0,9.0.0)",
- org.eclipse.equinox.security;bundle-version="1.1.100"
+ org.eclipse.equinox.security;bundle-version="1.1.100",
+ org.teiid.designer.spi;bundle-version="8.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.datatools.modelbase.dbdefinition,
@@ -23,5 +24,4 @@ Import-Package: org.eclipse.datatools.modelbase.dbdefinition,
  org.eclipse.emf.ecore.xmi.impl
 Bundle-Localization: plugin
 Export-Package: org.teiid.datatools.connectivity,
- org.teiid.datatools.connectivity.security,
  org.teiid.datatools.connectivity.sql
diff --git a/...g.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/ConnectivityUtil.java b/...g.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/ConnectivityUtil.java
@@ -22,8 +22,8 @@
 import org.eclipse.datatools.connectivity.drivers.PropertySetImpl;
 import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCConnectionProfileConstants;
 import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
-import org.teiid.datatools.connectivity.security.ISecureStorageProvider;
 import org.teiid.datatools.connectivity.security.impl.EquinoxSecureStorageProvider;
+import org.teiid.datatools.connectivity.spi.ISecureStorageProvider;
 
 /**
  * 

diff --git a/...vity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java b/...vity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java
@@ -12,7 +12,7 @@
 import org.eclipse.equinox.security.storage.EncodingUtils;
 import org.eclipse.equinox.security.storage.ISecurePreferences;
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
-import org.teiid.datatools.connectivity.security.ISecureStorageProvider;
+import org.teiid.datatools.connectivity.spi.ISecureStorageProvider;
 
 /**
  * Implementation of {@link ISecureStorageProvider} which uses Eclipse's Equinox

diff --git a/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
  org.teiid.designer.transformation.ui;bundle-version="[8.0.0,9.0.0)",
  org.teiid.designer.vdb.ui;bundle-version="[8.0.0,9.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
+ org.teiid.designer.spi;bundle-version="8.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/...d.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java b/...d.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
@@ -42,7 +42,7 @@
 import org.teiid.designer.datatools.ui.dialogs.NewTeiidFilteredCPWizard;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.actions.DeployVdbAction;
 import org.teiid.designer.runtime.ui.actions.EditVdbAction;
 import org.teiid.designer.runtime.ui.connection.CreateDataSourceAction;

diff --git a/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
@@ -71,6 +71,7 @@ Require-Bundle: org.eclipse.ui.views;bundle-version="[3.6.100,4.0.0)",
  org.eclipse.wst.server.core;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.wst.server.ui;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.5.200,4.0.0)",
- org.jboss.ide.eclipse.as.ui;bundle-version="2.4.0"
+ org.jboss.ide.eclipse.as.ui;bundle-version="2.4.0",
+ org.teiid.designer.spi;bundle-version="8.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.teiid.designer.dqp.ui/plugin.xml b/plugins/org.teiid.designer.dqp.ui/plugin.xml
@@ -321,7 +321,7 @@
             adaptableType="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode"
             class="org.teiid.designer.runtime.ui.views.content.adapter.TeiidServerContainerNodeAdapterFactory">
          <adapter
-               type="org.teiid.designer.runtime.ITeiidServer">
+               type="org.teiid.designer.runtime.spi.ITeiidServer">
          </adapter>
          <adapter
                type="org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode">
@@ -331,7 +331,7 @@
             adaptableType="org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode"
             class="org.teiid.designer.runtime.ui.views.content.adapter.TeiidResourceNodeAdapterFactory">
          <adapter
-               type="org.teiid.designer.runtime.ITeiidServer">
+               type="org.teiid.designer.runtime.spi.ITeiidServer">
          </adapter>
          <adapter
                type="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode">
@@ -347,7 +347,7 @@
                type="org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode">
          </adapter>
          <adapter
-               type="org.teiid.designer.runtime.ITeiidServer">
+               type="org.teiid.designer.runtime.spi.ITeiidServer">
          </adapter>
       </factory>
       <factory
@@ -357,13 +357,13 @@
                type="org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode">
          </adapter>
          <adapter
-               type="org.teiid.designer.runtime.ITeiidDataSource">
+               type="org.teiid.designer.runtime.spi.ITeiidDataSource">
          </adapter>
          <adapter
-               type="org.teiid.designer.runtime.ITeiidTranslator">
+               type="org.teiid.designer.runtime.spi.ITeiidTranslator">
          </adapter>
          <adapter
-               type="org.teiid.designer.runtime.ITeiidVdb">
+               type="org.teiid.designer.runtime.spi.ITeiidVdb">
          </adapter>
       </factory>
    </extension>

diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiPlugin.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiPlugin.java
@@ -27,11 +27,11 @@
 import org.teiid.core.designer.util.I18nUtil;
 import org.teiid.core.designer.util.PluginUtilImpl;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
-import org.teiid.designer.runtime.connection.IPasswordProvider;
+import org.teiid.designer.runtime.connection.spi.IPasswordProvider;
 import org.teiid.designer.runtime.preview.jobs.TeiidPreviewVdbCleanupJob;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.connection.PreviewMissingPasswordDialog;
 import org.teiid.designer.runtime.ui.server.editor.TeiidServerEditor;
 import org.teiid.designer.runtime.ui.server.editor.TeiidServerEditorInput;
@@ -215,7 +215,7 @@ class PasswordProvider implements IPasswordProvider {
         /**
          * {@inheritDoc}
          *
-         * @see org.teiid.designer.runtime.connection.IPasswordProvider#getPassword(java.lang.String, java.lang.String)
+         * @see org.teiid.designer.runtime.connection.spi.IPasswordProvider#getPassword(java.lang.String, java.lang.String)
          */
         @Override
         public String getPassword( final String modelName,

diff --git a/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/DeployVdbAction.java b/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/DeployVdbAction.java
@@ -30,9 +30,9 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.teiid.core.designer.util.I18nUtil;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.PreferenceConstants;
 import org.teiid.designer.runtime.TeiidServerManager;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.runtime.ui.vdb.DeployVdbDialog;
@@ -42,6 +42,7 @@
 import org.teiid.designer.ui.common.eventsupport.SelectionUtilities;
 import org.teiid.designer.ui.common.util.UiUtil;
 import org.teiid.designer.vdb.Vdb;
+import org.teiid.designer.vdb.Vdb;
 
 
 /**

diff --git a/...org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/ExecuteVDBAction.java b/...org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/ExecuteVDBAction.java
@@ -13,7 +13,7 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.ui.IWorkbenchPart;
 import org.teiid.core.designer.util.I18nUtil;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.runtime.ui.vdb.ExecuteVdbDialog;

diff --git a/...eiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/GenerateRestWarAction.java b/...eiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/GenerateRestWarAction.java
@@ -55,6 +55,7 @@
 import org.teiid.designer.ui.common.eventsupport.SelectionUtilities;
 import org.teiid.designer.ui.viewsupport.ModelIdentifier;
 import org.teiid.designer.vdb.Vdb;
+import org.teiid.designer.vdb.Vdb;
 import org.teiid.designer.vdb.VdbModelEntry;
 
 

diff --git a/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceAction.java b/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceAction.java
@@ -23,7 +23,7 @@
 import org.teiid.designer.datatools.connection.ConnectionInfoProviderFactory;
 import org.teiid.designer.datatools.connection.IConnectionInfoProvider;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.actions.SortableSelectionAction;

diff --git a/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java b/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java
@@ -51,7 +51,7 @@
 import org.teiid.designer.datatools.connection.IConnectionInfoProvider;
 import org.teiid.designer.datatools.ui.dialogs.ConnectionProfileWorker;
 import org.teiid.designer.datatools.ui.dialogs.IProfileChangedListener;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.common.graphics.GlobalUiColorManager;

diff --git a/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/DeleteDataSourceAction.java b/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/DeleteDataSourceAction.java
@@ -18,7 +18,7 @@
 import org.teiid.designer.datatools.connection.ConnectionInfoHelper;
 import org.teiid.designer.datatools.connection.IConnectionInfoHelper;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.actions.SortableSelectionAction;

diff --git a/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectJndiDataSourceDialog.java b/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectJndiDataSourceDialog.java
@@ -19,8 +19,8 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidDataSource;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidDataSource;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
 import org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider;

diff --git a/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectTranslatorDialog.java b/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectTranslatorDialog.java
@@ -19,8 +19,8 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
-import org.teiid.designer.runtime.ITeiidTranslator;
+import org.teiid.designer.runtime.spi.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidTranslator;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
 import org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider;

diff --git a/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbSourceConnectionHandler.java b/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbSourceConnectionHandler.java
@@ -26,11 +26,12 @@
 import org.teiid.designer.core.workspace.ModelWorkspaceException;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidDataSource;
-import org.teiid.designer.runtime.ITeiidServer;
-import org.teiid.designer.runtime.ITeiidTranslator;
-import org.teiid.designer.runtime.TeiidPropertyDefinition;
+import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.connection.ModelConnectionMapper;
+import org.teiid.designer.runtime.spi.ITeiidDataSource;
+import org.teiid.designer.runtime.spi.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidTranslator;
+import org.teiid.designer.runtime.spi.TeiidPropertyDefinition;
 import org.teiid.designer.vdb.VdbModelEntry;
 import org.teiid.designer.vdb.connections.SourceHandler;
 import org.teiid.designer.vdb.connections.VdbSourceConnection;

diff --git a/...rg.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/preview/PreviewDataWorker.java b/...rg.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/preview/PreviewDataWorker.java
@@ -71,15 +71,15 @@
 import org.teiid.designer.metamodels.relational.ProcedureParameter;
 import org.teiid.designer.metamodels.webservice.Operation;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidJdbcInfo;
-import org.teiid.designer.runtime.ITeiidServer;
-import org.teiid.designer.runtime.ITeiidTranslator;
-import org.teiid.designer.runtime.ITeiidVdb;
 import org.teiid.designer.runtime.TeiidJdbcInfo;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.preview.PreviewManager;
 import org.teiid.designer.runtime.preview.jobs.TeiidPreviewVdbJob;
 import org.teiid.designer.runtime.preview.jobs.WorkspacePreviewVdbJob;
+import org.teiid.designer.runtime.spi.ITeiidJdbcInfo;
+import org.teiid.designer.runtime.spi.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidTranslator;
+import org.teiid.designer.runtime.spi.ITeiidVdb;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.dialogs.AccessPatternColumnsDialog;
 import org.teiid.designer.runtime.ui.dialogs.ParameterInputDialog;
@@ -92,7 +92,6 @@
 import org.teiid.designer.ui.viewsupport.ModelUtilities;
 import org.teiid.designer.webservice.util.WebServiceUtil;
 
-
 /**
  * @since 8.0
  */

diff --git a/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/DisconnectFromServerAction.java b/....designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/DisconnectFromServerAction.java
@@ -4,8 +4,8 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.common.viewsupport.UiBusyIndicator;

diff --git a/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/EditServerAction.java b/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/EditServerAction.java
@@ -12,9 +12,8 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
-import org.teiid.designer.runtime.ITeiidServer;
-import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 
 

diff --git a/...g.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/RefreshServerAction.java b/...g.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/RefreshServerAction.java
@@ -11,8 +11,8 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode;

diff --git a/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/RuntimeAssistant.java b/.../org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/RuntimeAssistant.java
@@ -17,9 +17,9 @@
 import org.osgi.service.prefs.BackingStoreException;
 import org.teiid.core.designer.util.I18nUtil;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.PreferenceConstants;
 import org.teiid.designer.runtime.TeiidServerManager;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 
 
 /**

diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/ServerPage.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/ServerPage.java
@@ -35,10 +35,10 @@
 import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
 import org.teiid.designer.core.util.StringUtilities;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidJdbcInfo;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.adapter.TeiidServerAdapterFactory;
+import org.teiid.designer.runtime.spi.ITeiidJdbcInfo;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.common.util.WidgetFactory;

diff --git a/...teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/ServerSelectionDialog.java b/...teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/ServerSelectionDialog.java
@@ -24,7 +24,7 @@
 import org.teiid.core.designer.event.IChangeNotifier;
 import org.teiid.core.designer.util.I18nUtil;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.ui.common.util.WidgetUtil;
 

diff --git a/...eiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/SetDefaultServerAction.java b/...eiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/SetDefaultServerAction.java
@@ -15,8 +15,8 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
 import org.teiid.core.designer.util.CoreArgCheck;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.common.util.WidgetUtil;

diff --git a/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java b/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
@@ -31,14 +32,13 @@
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.part.EditorPart;
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ExecutionConfigurationEvent;
-import org.teiid.designer.runtime.ExecutionConfigurationEvent.TargetType;
-import org.teiid.designer.runtime.IExecutionConfigurationListener;
-import org.teiid.designer.runtime.ITeiidJdbcInfo;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
+import org.teiid.designer.runtime.spi.ExecutionConfigurationEvent;
+import org.teiid.designer.runtime.spi.ExecutionConfigurationEvent.TargetType;
+import org.teiid.designer.runtime.spi.IExecutionConfigurationListener;
+import org.teiid.designer.runtime.spi.ITeiidJdbcInfo;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.ui.common.util.WidgetFactory;
 
 /**

diff --git a/...signer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInput.java b/...signer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditorInput.java
@@ -13,7 +13,7 @@
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IPersistableElement;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidServer;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 
 /**
  *

diff --git a/...ins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/vdb/ExecuteVdbWorker.java b/...ins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/vdb/ExecuteVdbWorker.java
@@ -22,9 +22,9 @@
 import org.teiid.designer.datatools.ui.dialogs.NewTeiidFilteredCPWizard;
 import org.teiid.designer.datatools.ui.dialogs.TeiidCPWizardDialog;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.ITeiidJdbcInfo;
-import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.TeiidJdbcInfo;
+import org.teiid.designer.runtime.spi.ITeiidJdbcInfo;
+import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.runtime.ui.actions.DeployVdbAction;