TEIIDDES-1518: Create interface for TeiidServer

* Makes the codebase more flexible and easier to create a common spi
Teiid-Designer · Dec 7, 2012 · d26c944 · d26c944
1 parent fc9961b
commit d26c944
Show file tree

Hide file tree

Showing 67 changed files with 455 additions and 307 deletions.
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.TeiidServer;
+import org.teiid.designer.runtime.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;
@@ -579,7 +579,7 @@ public static void executeAction(String id, Properties properties, boolean synch
             if (RuntimeAssistant.ensureServerConnection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), 
             		Messages.CreateDataSource_NoServerMessage)) {
             	try {
-					TeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
+					ITeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
 
 					CreateDataSourceAction action = new CreateDataSourceAction();
 					action.setTeiidServer(teiidServer);

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.TeiidServer">
+               type="org.teiid.designer.runtime.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.TeiidServer">
+               type="org.teiid.designer.runtime.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.TeiidServer">
+               type="org.teiid.designer.runtime.ITeiidServer">
          </adapter>
       </factory>
       <factory

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,6 +27,7 @@
 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;
@@ -246,11 +247,11 @@ public void run() {
     }
 
     /**
-     * Open the {@link TeiidServerEditor} for the given {@link TeiidServer}
+     * Open the {@link TeiidServerEditor} for the given {@link ITeiidServer}
      * 
      * @param server 
      */
-    public static void editTeiidServer(TeiidServer server) {
+    public static void editTeiidServer(ITeiidServer server) {
         IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
         IWorkbenchPage page = workbenchWindow.getActivePage();
 

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,8 +30,8 @@
 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.TeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
@@ -121,7 +121,7 @@ public boolean isApplicable( ISelection selection ) {
      */
     @Override
     public void run() {
-        TeiidServer teiidServer = getServerManager().getDefaultServer();
+        ITeiidServer teiidServer = getServerManager().getDefaultServer();
 
         for (IFile nextVDB : this.selectedVDBs) {
             boolean doDeploy = VdbRequiresSaveChecker.insureOpenVdbSaved(nextVDB);
@@ -144,7 +144,7 @@ public void run() {
      * Ask the user to select the vdb and deploy it
      */
     public void queryUserAndRun() {
-        TeiidServer teiidServer = getServerManager().getDefaultServer();
+        ITeiidServer teiidServer = getServerManager().getDefaultServer();
 
         DeployVdbDialog dialog = new DeployVdbDialog(DqpUiPlugin.getDefault().getCurrentWorkbenchWindow().getShell(), designerProperties);
 
@@ -204,7 +204,7 @@ private static TeiidServerManager getServerManager() {
      * @param teiidServer the teiidServer where the VDB is being deployed to (can be <code>null</code>)
      * @param vdbOrVdbFile the VDB being deployed
      */
-    public static void deployVdb( TeiidServer teiidServer,
+    public static void deployVdb( ITeiidServer teiidServer,
                                  final Object vdbOrVdbFile ) {
     	deployVdb(teiidServer, vdbOrVdbFile, shouldAutoCreateDataSource());
     }
@@ -216,7 +216,7 @@ public static void deployVdb( TeiidServer teiidServer,
 	 * @param vdbOrVdbFile
 	 * @param doCreateDataSource
 	 */
-	public static void deployVdb(TeiidServer teiidServer, final Object vdbOrVdbFile, final boolean doCreateDataSource) {
+	public static void deployVdb(ITeiidServer teiidServer, final Object vdbOrVdbFile, final boolean doCreateDataSource) {
 		Shell shell = UiUtil.getWorkbenchShellOnlyIfUiThread();
 
 		try {
@@ -323,7 +323,7 @@ static boolean shouldAutoCreateDataSource() {
 
     private static void createVdbDataSource(Object vdbOrVdbFile, String displayName, String jndiName) {
     	Vdb vdb = ((vdbOrVdbFile instanceof IFile) ? new Vdb((IFile) vdbOrVdbFile, null) : (Vdb) vdbOrVdbFile);
-    	TeiidServer teiidServer = getServerManager().getDefaultServer();
+    	ITeiidServer teiidServer = getServerManager().getDefaultServer();
     	teiidServer.createVdbDataSource(vdb.getFile().getName(), displayName, jndiName);
     }
 

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.TeiidServer;
+import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.runtime.ui.vdb.ExecuteVdbDialog;
@@ -67,7 +67,7 @@ public boolean isApplicable( ISelection selection ) {
             if (obj instanceof IFile) {
                 String extension = ((IFile)obj).getFileExtension();
                 if (extension != null && extension.equals("vdb")) { //$NON-NLS-1$
-//                    TeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
+//                    ITeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
 //                    if (teiidServer != null) {
                         return true;
 //                    }
@@ -99,7 +99,7 @@ public void run() {
     	}
     }
 
-    public static void executeVdb( TeiidServer teiidServer, String vdbName ) throws Exception {
+    public static void executeVdb( ITeiidServer teiidServer, String vdbName ) throws Exception {
     	if( worker == null ) {
     		worker = new ExecuteVdbWorker();
     	}

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.TeiidServer;
+import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.actions.SortableSelectionAction;
@@ -53,7 +53,7 @@ private static String getString( final String id,
     private String pwd;
     private ConnectionInfoProviderFactory providerFactory;
 
-    private TeiidServer cachedServer;
+    private ITeiidServer cachedServer;
 
     /**
      * @since 5.0
@@ -64,7 +64,7 @@ public CreateDataSourceAction() {
         providerFactory = new ConnectionInfoProviderFactory();
     }
 
-    public void setTeiidServer( TeiidServer teiidServer ) {
+    public void setTeiidServer( ITeiidServer teiidServer ) {
         this.cachedServer = teiidServer;
     }
 
@@ -99,7 +99,7 @@ public void run() {
         }
         try {
 
-            TeiidServer teiidServer = cachedServer;
+            ITeiidServer teiidServer = cachedServer;
             if (teiidServer == null) {
                 if (DqpPlugin.getInstance().getServerManager().getDefaultServer() == null) {
                     MessageDialog.openConfirm(iww.getShell(), getString("noServer.title"), //$NON-NLS-1$

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.TeiidServer;
+import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.common.graphics.GlobalUiColorManager;
@@ -106,7 +106,7 @@ private static String getString( final String id,
 
     Map<String, ModelResource> relationalModelsMap;
 
-    private TeiidServer teiidServer;
+    private ITeiidServer teiidServer;
     // private JdbcManager jdbcManager;
     private ConnectionInfoProviderFactory providerFactory;
     // private IConnectionProfile selectedProfile;
@@ -122,7 +122,7 @@ private static String getString( final String id,
     /**
      * @since 4.0
      */
-    public CreateDataSourceWizard( TeiidServer teiidServer,
+    public CreateDataSourceWizard( ITeiidServer teiidServer,
                                    Collection<ModelResource> relationalModels,
                                    ModelResource initialSelection ) {
         super(DqpUiPlugin.getDefault(), TITLE, null);

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.TeiidServer;
+import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
 import org.teiid.designer.ui.actions.SortableSelectionAction;
@@ -75,7 +75,7 @@ public boolean removeDataSource( IFile modelFile ) throws Exception {
         Properties properties = getConnectionProperties(modelFile);
 
         if (properties != null && !properties.isEmpty()) {
-            TeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
+            ITeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();
             String name = modelFile.getFullPath().removeFileExtension().lastSegment();
             String jndiName = new ConnectionInfoHelper().generateUniqueConnectionJndiName(name,
                                                                                           modelFile.getFullPath(),

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
@@ -20,7 +20,7 @@
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.teiid.designer.runtime.DqpPlugin;
 import org.teiid.designer.runtime.ITeiidDataSource;
-import org.teiid.designer.runtime.TeiidServer;
+import org.teiid.designer.runtime.ITeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
 import org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider;
@@ -100,7 +100,7 @@ protected TreeViewer createTreeViewer( Composite parent ) {
             public boolean select( Viewer viewer,
                                    Object parentElement,
                                    Object element ) {
-                if (element instanceof TeiidServer) {
+                if (element instanceof ITeiidServer) {
                     return element.equals(DqpPlugin.getInstance().getServerManager().getDefaultServer());
                 }
 

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.TeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
 import org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider;
@@ -100,7 +100,7 @@ protected TreeViewer createTreeViewer( Composite parent ) {
             public boolean select( Viewer viewer,
                                    Object parentElement,
                                    Object element ) {
-                if (element instanceof TeiidServer) {
+                if (element instanceof ITeiidServer) {
                     return element.equals(DqpPlugin.getInstance().getServerManager().getDefaultServer());
                 }
 

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
@@ -27,9 +27,9 @@
 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.vdb.VdbModelEntry;
 import org.teiid.designer.vdb.connections.SourceHandler;
@@ -86,7 +86,7 @@ public Object[] getApplicableActions( Object obj ) {
         if (!initialized) {
             initialize();
         }
-        TeiidServer defServer = getDefaultServer();
+        ITeiidServer defServer = getDefaultServer();
         if (defServer == null || !defServer.isConnected()) {
             return null;
         }
@@ -142,7 +142,7 @@ public void run() {
                 SelectJndiDataSourceDialog dialog = new SelectJndiDataSourceDialog(Display.getCurrent().getActiveShell());
 
                 ITeiidDataSource initialSelection = null;
-                TeiidServer defServer = getDefaultServer();
+                ITeiidServer defServer = getDefaultServer();
                 if (defServer != null && defServer.isConnected()) {
                     try {
                         initialSelection = defServer.getDataSource(jndiName);
@@ -190,7 +190,7 @@ public void run() {
                 SelectTranslatorDialog dialog = new SelectTranslatorDialog(Display.getCurrent().getActiveShell());
 
                 ITeiidTranslator initialSelection = null;
-                TeiidServer defServer = getDefaultServer();
+                ITeiidServer defServer = getDefaultServer();
                 if (defServer != null && defServer.isConnected()) {
                     try {
                         initialSelection = defServer.getTranslator(transName);
@@ -221,7 +221,7 @@ public void run() {
      */
     @Override
     public String[] getDataSourceNames() {
-        TeiidServer defaultServer = getDefaultServer();
+        ITeiidServer defaultServer = getDefaultServer();
 
         if ((defaultServer != null) && defaultServer.isConnected()) {
             Collection<ITeiidDataSource> dataSources = null;
@@ -250,7 +250,7 @@ public String[] getDataSourceNames() {
         return null;
     }
 
-    TeiidServer getDefaultServer() {
+    ITeiidServer getDefaultServer() {
         return DqpPlugin.getInstance().getServerManager().getDefaultServer();
     }
 
@@ -265,7 +265,7 @@ public PropertyDefinition[] getTranslatorDefinitions( String translatorName ) {
             throw new IllegalArgumentException();
         }
 
-        TeiidServer defaultServer = getDefaultServer();
+        ITeiidServer defaultServer = getDefaultServer();
 
         if ((defaultServer != null) && defaultServer.isConnected()) {
             try {
@@ -326,7 +326,7 @@ public PropertyDefinition[] getTranslatorDefinitions( String translatorName ) {
      */
     @Override
     public String[] getTranslatorTypes() {
-        TeiidServer defaultServer = getDefaultServer();
+        ITeiidServer defaultServer = getDefaultServer();
 
         if ((defaultServer != null) && defaultServer.isConnected()) {
             Collection<ITeiidTranslator> translators = null;

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,10 +71,10 @@
 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.ITeiidServer;
 import org.teiid.designer.runtime.ITeiidTranslator;
 import org.teiid.designer.runtime.ITeiidVdb;
 import org.teiid.designer.runtime.TeiidJdbcInfo;
-import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.preview.PreviewManager;
 import org.teiid.designer.runtime.preview.jobs.TeiidPreviewVdbJob;
@@ -375,7 +375,7 @@ private void internalRun( final EObject eObject,
     	    return;
     	}
 
-    	TeiidServer defaultServer = getServerManager().getDefaultServer();
+    	ITeiidServer defaultServer = getServerManager().getDefaultServer();
         try {
             String driverPath = defaultServer.getAdminDriverPath();
             String vdbName = PreviewManager.getPreviewProjectVdbName(project);

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,6 +4,7 @@
 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.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.DqpUiPlugin;
@@ -37,7 +38,7 @@ public DisconnectFromServerAction( Display display ) {
     @Override
     public void run() {
         IStructuredSelection sselection = getStructuredSelection();
-        final TeiidServer teiidServer = RuntimeAssistant.getServerFromSelection(sselection);
+        final ITeiidServer teiidServer = RuntimeAssistant.getServerFromSelection(sselection);
         UiBusyIndicator.showWhile(display, new Runnable() {
 
             @Override
@@ -54,7 +55,7 @@ public void run() {
      */
     @Override
     protected boolean updateSelection( IStructuredSelection selection ) {
-        TeiidServer teiidServer = RuntimeAssistant.getServerFromSelection(selection);
+        ITeiidServer teiidServer = RuntimeAssistant.getServerFromSelection(selection);
         return ((selection.size() == 1) && (teiidServer != null));
     }