Skip to content

Commit

Permalink
Merge pull request #16 from Teiid-Designer/teiiddes-1459-server-view
Browse files Browse the repository at this point in the history 
Teiiddes 1459 server view
  • Loading branch information
@blafond
blafond committed Sep 10, 2012
2 parents c1433a6 + bf36089 commit 8c2bc97
Show file tree
Hide file tree
Showing 87 changed files with 4,529 additions and 3,628 deletions.
70 changes: 69 additions & 1 deletion features/org.teiid.designer.runtime.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Including: Connection management, VDB creation and management and Data Preview/V
version="0.0.0"
name="Teiid Designer Design-time"/>

<includes
id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature"
version="0.0.0"/>

<requires>
<import feature="org.eclipse.datatools.common.doc.user" version="1.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.connectivity.doc.user" version="1.7.0" match="greaterOrEqual"/>
Expand Down Expand Up @@ -57,7 +61,71 @@ Including: Connection management, VDB creation and management and Data Preview/V
<import feature="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" version="1.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="1.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.sqltools.doc.user" version="1.7.0" match="greaterOrEqual"/>
<import plugin="org.jdom"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
<import plugin="org.jdom" version="1.1.1" match="compatible"/>
<import plugin="teiid_embedded_query" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc.relational" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.core" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.core.designer" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.core" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.8.0" match="compatible"/>
<import plugin="org.teiid.designer.transformation" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.legacy" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.vdb" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.connectivity" version="1.2.5" match="compatible"/>
<import plugin="net.jcip.annotations" version="1.0.0" match="compatible"/>
<import plugin="org.teiid.designer.datatools" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.relational" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.webservice" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.xml" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.function" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.extension" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.wst.server.core" version="1.4.0" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.core" version="2.4.0" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.dmr" version="2.4.0" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.management.core" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.ui.views" version="3.6.100" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.editors" version="3.8.0" match="compatible"/>
<import plugin="org.teiid.designer.vdb.ui" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.ui.common" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.ui" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.103.0" match="compatible"/>
<import plugin="org.eclipse.xsd" version="2.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.8.0" match="compatible"/>
<import plugin="org.teiid.designer.dqp" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.webservice" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.transformation.ui" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc.ui" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.5.200" match="compatible"/>
<import plugin="org.junit4" version="4.8.1" match="compatible"/>
<import plugin="org.teiid.designer.udf" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.7.100" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.debugger.core.ui" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.routineeditor" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.routineeditor.ui" version="1.0.2" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.editor.core" version="1.0.2" match="compatible"/>
<import plugin="org.teiid.datatools.connectivity" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.connectivity.db.generic.ui" version="1.0.1" match="compatible"/>
<import plugin="org.eclipse.datatools.connectivity.ui" version="1.2.3" match="compatible"/>
<import plugin="org.teiid.designer.datatools.ui" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.sqleditor" version="1.0.2" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.result.ui" version="1.1.2" match="compatible"/>
<import plugin="org.teiid.datatools.connectivity.ui" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.sdt" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.datatools.sqltools.sqlscrapbook" version="1.0.2" match="compatible"/>
<import plugin="org.eclipse.wst.server.ui" version="1.4.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator" version="3.5.200" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.ui" version="2.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench" version="3.103.0" match="compatible"/>
<import plugin="org.eclipse.datatools.connectivity.ui.dse" version="1.1.4" match="compatible"/>
<import plugin="org.eclipse.ui.cheatsheets" version="3.4.200" match="compatible"/>
<import plugin="org.teiid.designer.dqp.ui" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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)",
teiid_embedded_query;bundle-version="8.0.0"
teiid_embedded_query;bundle-version="[8.0.0,9.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.datatools.modelbase.dbdefinition,
Expand Down
6 changes: 3 additions & 3 deletions ...d.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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.Server;
import org.teiid.designer.runtime.TeiidServer;
import org.teiid.designer.runtime.ui.actions.DeployVdbAction;
import org.teiid.designer.runtime.ui.actions.EditVdbAction;
import org.teiid.designer.runtime.ui.connection.CreateDataSourceAction;
Expand Down Expand Up @@ -592,10 +592,10 @@ public static void executeAction(String id, Properties properties, boolean synch
if (RuntimeAssistant.ensureServerConnection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
Messages.CreateDataSource_NoServerMessage)) {
try {
Server server = DqpPlugin.getInstance().getServerManager().getDefaultServer();
TeiidServer teiidServer = DqpPlugin.getInstance().getServerManager().getDefaultServer();

CreateDataSourceAction action = new CreateDataSourceAction();
action.setAdmin(server.getAdmin());
action.setAdmin(teiidServer.getAdmin());

action.setSelection(new StructuredSelection());

Expand Down
6 changes: 5 additions & 1 deletion plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ Require-Bundle: org.eclipse.ui.views;bundle-version="[3.6.100,4.0.0)",
org.teiid.datatools.connectivity.ui;bundle-version="[8.0.0,9.0.0)",
org.teiid.designer.sdt;bundle-version="[8.0.0,9.0.0)",
org.teiid.designer.extension;bundle-version="[8.0.0,9.0.0)",
org.eclipse.datatools.sqltools.sqlscrapbook;bundle-version="[1.0.2,2.0.0)"
org.eclipse.datatools.sqltools.sqlscrapbook;bundle-version="[1.0.2,2.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"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
3 changes: 3 additions & 0 deletions plugins/org.teiid.designer.dqp.ui/plugin.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,6 @@ decorator.label = Teiid View Decorator

previewDecorator.description = Decorates previewable objects
previewDecorator.label = Previewable Object Decorator

servers.navigatorContent.name = Server Navigator Configuration
teiidView.navigatorContent.name = Teiid View Navigator Configuration
148 changes: 144 additions & 4 deletions plugins/org.teiid.designer.dqp.ui/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
icon="icons/full/obj16/connectorBinding.gif"
category="org.teiid.designer.ui"
class="org.teiid.designer.runtime.ui.views.TeiidView"
id="connectorsView">
id="org.teiid.designer.runtime.ui.views.Teiid">
</view>
</extension>
<!-- Extension to allow plugins to contribute to the Modeler Perspective. -->
Expand Down Expand Up @@ -150,22 +150,22 @@
adaptable="true"
label="%decorator.label"
state="true"
class="org.teiid.designer.runtime.ui.views.TeiidViewTreeProvider"
class="org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider"
id="org.teiid.designer.dqp.ui.decorator">
<description>
%decorator.description
</description>
<enablement>
<objectClass
name="org.teiid.designer.runtime.Server">
name="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode">
</objectClass>
</enablement>
</decorator>
<decorator
lightweight="true"
location="BOTTOM_RIGHT"
adaptable="true"
label="%previewDecoratorr.label"
label="%previewDecorator.label"
state="true"
class="org.teiid.designer.runtime.ui.views.PreviewModelObjectLabelProvider"
id="org.teiid.designer.dqp.ui.previewDecorator">
Expand Down Expand Up @@ -197,4 +197,144 @@
label="%removeRestWarPropertiesAction.label">
</specialAction>
</extension>
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
viewerId="org.eclipse.wst.server.ui.ServersView">
<includes>
<contentExtension
isRoot="false"
pattern="org.teiid.designer.ui.servers.teiid.content">
</contentExtension>
</includes>
</viewerContentBinding>
<viewerActionBinding
viewerId="org.eclipse.wst.server.ui.ServersView">
<includes>
<actionExtension
pattern="org.teiid.designer.runtime.ui.views.Teiid.actions">
</actionExtension>
</includes>
</viewerActionBinding>
<viewerContentBinding
viewerId="org.teiid.designer.runtime.ui.views.Teiid">
<includes>
<contentExtension
isRoot="true"
pattern="org.teiid.designer.runtime.ui.views.Teiid.content">
</contentExtension>
</includes>
</viewerContentBinding>
<viewerActionBinding
viewerId="org.teiid.designer.runtime.ui.views.Teiid">
<includes>
<actionExtension
pattern="org.teiid.designer.runtime.ui.views.Teiid.actions">
</actionExtension>
</includes>
</viewerActionBinding>
</extension>
<extension
point="org.eclipse.ui.navigator.navigatorContent">
<navigatorContent
activeByDefault="true"
contentProvider="org.teiid.designer.runtime.ui.views.TeiidServerContentProvider"
icon="icons/full/ctool16/teiid-server.png"
id="org.teiid.designer.ui.servers.teiid.content"
labelProvider="org.teiid.designer.runtime.ui.views.TeiidServerLabelProvider"
name="%servers.navigatorContent.name"
priority="lowest">
<triggerPoints>
<instanceof
value="org.eclipse.wst.server.core.IServer">
</instanceof>
</triggerPoints>
</navigatorContent>
<navigatorContent
activeByDefault="true"
contentProvider="org.teiid.designer.runtime.ui.views.TeiidServerContentProvider"
icon="icons/full/ctool16/teiid-server.png"
id="org.teiid.designer.runtime.ui.views.Teiid.content"
labelProvider="org.teiid.designer.runtime.ui.views.TeiidViewDecoratingLabelProvider"
name="%teiidView.navigatorContent.name"
priority="highest">
<triggerPoints>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode">
</instanceof>
</triggerPoints>
<dropAssistant
class="org.teiid.designer.runtime.ui.views.TeiidViewDropAdapterAssistant"
id="org.teiid.designer.runtime.ui.views.Teiid.dnd">
<possibleDropTargets></possibleDropTargets>
</dropAssistant>
</navigatorContent>
<actionProvider
class="org.teiid.designer.runtime.ui.views.TeiidServerActionProvider"
id="org.teiid.designer.runtime.ui.views.Teiid.actions"
priority="highest">
<enablement>
<or>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidResourceNode">
</instanceof>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode">
</instanceof>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidFolder">
</instanceof>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidErrorNode">
</instanceof>
<instanceof
value="org.teiid.designer.runtime.ui.views.content.TeiidEmptyNode">
</instanceof>
</or>
</enablement>
</actionProvider>
</extension>
<extension point="org.eclipse.ui.editors">
<editor
class="org.teiid.designer.runtime.ui.server.editor.TeiidServerEditor"
default="false"
extensions="teiidserver"
icon="icons/full/obj16/connectorBinding.gif"
id="org.teiid.designer.runtime.ui.server.editor.TeiidServerEditor"
name="Teiid Server"/>
</extension>
<extension point="org.eclipse.ui.elementFactories">
<factory id="org.teiid.designer.runtime.ui.server.editor.input.factory"
class="org.teiid.designer.runtime.ui.server.editor.TeiidServerEditorInputFactory"/>
</extension>
<extension
point="org.eclipse.core.runtime.adapters">
<factory
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">
</adapter>
<adapter
type="org.teiid.designer.runtime.ui.views.content.TeiidResourceNode">
</adapter>
</factory>
<factory
adaptableType="org.teiid.designer.runtime.ui.views.content.TeiidResourceNode"
class="org.teiid.designer.runtime.ui.views.content.adapter.TeiidResourceNodeAdapterFactory">
<adapter
type="org.teiid.designer.runtime.TeiidServer">
</adapter>
<adapter
type="org.teiid.designer.runtime.ui.views.content.TeiidServerContainerNode">
</adapter>
</factory>
<factory
adaptableType="org.teiid.designer.runtime.ui.views.content.TeiidFolder"
class="org.teiid.designer.runtime.ui.views.content.adapter.TeiidFolderAdapterFactory">
<adapter
type="org.teiid.designer.runtime.TeiidServer">
</adapter>
</factory>
</extension>
</plugin>
3 changes: 1 addition & 2 deletions plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.teiid.designer.runtime.ui;

import java.util.ResourceBundle;

import org.teiid.core.PluginUtil;
import org.teiid.core.util.PluginUtilImpl;

Expand Down Expand Up @@ -63,7 +62,7 @@ interface Extensions {

String SQL_RESULTSET_PROCESSOR = /*EXT_PREFIX + DOT + */"sqlResultSetProcessor"; //$NON-NLS-1$

String CONNECTORS_VIEW_ID = /*PLUGIN_ID + DOT + */"connectorsView"; //$NON-NLS-1$
String CONNECTORS_VIEW_ID = "org.teiid.designer.runtime.ui.views.Teiid"; //$NON-NLS-1$
}

interface Images {
Expand Down

0 comments on commit 8c2bc97

Please sign in to comment.