Author: rob.stryker(a)jboss.com Date: 2009-10-29 17:46:42 -0400 (Thu, 29 Oct 2009) New Revision: 18357 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-5122 - deprecate jboss servers view Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-10-29 20:49:26 UTC (rev 18356) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-10-29 21:46:42 UTC (rev 18357) @@ -148,6 +148,19 @@ </includes> </viewerContentBinding> </extension> + <extension + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.server.ui.ServersView"> + <includes> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets"> + </contentExtension> + </includes> + </viewerContentBinding> + </extension> + <extension point="org.eclipse.ui.preferencePages"> <page Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2009-10-29 20:49:26 UTC (rev 18356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2009-10-29 21:46:42 UTC (rev 18357) @@ -15,7 +15,7 @@ actionSets.serverActions.startServer.label=Start Server actionSets.serverActions.runApplicationFromSelectedElement.label=Run Application from Selected Element perspective.name=JBoss AS -ViewName_JBossServerView=JBoss Server View +ViewName_JBossServerView=JBoss Server View (Deprecated) ViewName_ServerLog=Server Log Bundle-Vendor.0 = JBoss by Red Hat Bundle-Name.0 = JBossAS Tools Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-10-29 20:49:26 UTC (rev 18356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-10-29 21:46:42 UTC (rev 18357) @@ -352,8 +352,44 @@ </viewerContentBinding> </extension> + <extension + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView"> + <includes> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.as.ui.extensions.xml"> + </contentExtension> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.as.ui.extensions.jmx"> + </contentExtension> + <contentExtension + isRoot="false" + pattern="org.jboss.tools.jmx.ui.internal.views.navigator.JMXLinkHelper"> + </contentExtension> + </includes> + </viewerContentBinding> + <viewerActionBinding + viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView"> + <includes> + <actionExtension + pattern="org.jboss.ide.eclipse.as.ui.extensions.modules"/> + <actionExtension + pattern="org.jboss.ide.eclipse.as.ui.extensions.serverLog"/> + <actionExtension + pattern="org.jboss.ide.eclipse.as.ui.extensions.showInJMXView"/> + <actionExtension + pattern="org.jboss.tools.jmx.ui.internal.views.navigator.actionProvider"> + </actionExtension> + </includes> + </viewerActionBinding> + </extension> + + <!-- Extensions to new Server View --> <extension @@ -458,11 +494,10 @@ </extension> - <extension point="org.eclipse.ui.navigator.viewer"> <viewerContentBinding - viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView"> + viewerId="org.eclipse.wst.server.ui.ServersView"> <includes> <contentExtension isRoot="false" @@ -479,7 +514,7 @@ </includes> </viewerContentBinding> <viewerActionBinding - viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView"> + viewerId="org.eclipse.wst.server.ui.ServersView"> <includes> <actionExtension pattern="org.jboss.ide.eclipse.as.ui.extensions.modules"/> @@ -495,7 +530,6 @@ </extension> - <!-- Decorator for xpaths / xml--> <extension point="org.eclipse.ui.decorators"> <decorator