JBoss Tools SVN: r36869 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2011-12-02 04:49:04 -0500 (Fri, 02 Dec 2011)
New Revision: 36869
Added:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/BPMNConvertCase.java
Log:
[jbpm-bot] BPMN Convert test moved into jBPM bot test
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/BPMNConvertCase.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/BPMNConvertCase.java (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/BPMNConvertCase.java 2011-12-02 09:49:04 UTC (rev 36869)
@@ -0,0 +1,124 @@
+package org.jboss.tools.jbpm.ui.bot.test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.channels.FileChannel;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.jboss.tools.jbpm.ui.bot.test.Activator;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.entity.JavaProjectEntity;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+@Require(clearProjects = true, perspective = "Java")
+public class BPMNConvertCase extends SWTTestExt {
+
+ private String projectName = "BPMNConvertProject";
+ private String originalFolder = "original";
+ private String targetFolder = "target";
+ private String file1 = "PolicyPricingProcess.bpmn";
+ private String file2 = "PolicyPricingProcess.bpmn_diagram";
+
+ @Test
+ public void createProject() {
+ // Create Java Project
+ JavaProjectEntity project = new JavaProjectEntity();
+ project.setProjectName(projectName);
+ eclipse.createJavaProject(project);
+
+ // create original folder
+ packageExplorer.selectProject(projectName);
+ bot.menu("File").menu("New").menu("Folder").click();
+ bot.textWithLabel("Folder name:").setText(originalFolder);
+ open.finish(bot);
+
+ // create target folder
+ packageExplorer.selectProject(projectName);
+ bot.menu("File").menu("New").menu("Folder").click();
+ bot.textWithLabel("Folder name:").setText(targetFolder);
+ open.finish(bot);
+ }
+
+ @Test
+ public void importFiles() {
+ // file1
+ File in = SWTUtilExt.getResourceFile(Activator.PLUGIN_ID, "original",
+ file1);
+ File out = new File(Platform.getLocation() + File.separator
+ + projectName + File.separator + originalFolder
+ + File.separator + file1);
+ copyFile(in, out);
+
+ // file2
+ in = SWTUtilExt.getResourceFile(Activator.PLUGIN_ID, "original", file2);
+ out = new File(Platform.getLocation() + File.separator + projectName
+ + File.separator + originalFolder + File.separator + file2);
+ copyFile(in, out);
+
+ // refresh
+ packageExplorer.selectProject(projectName);
+ bot.menu("File").menu("Refresh").click();
+
+ util.waitForNonIgnoredJobs();
+
+ eclipse.openFile(projectName, originalFolder, file1);
+ eclipse.openFile(projectName, originalFolder, file2);
+
+ bot.closeAllEditors();
+ }
+
+ @Test
+ public void convertProcess() {
+ SWTBot viewBot = bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot();
+ SWTEclipseExt.selectTreeLocation(viewBot,projectName, originalFolder, file1);
+
+ open.newExport(ActionItem.Export.BPMNBPMNtojPDL.LABEL);
+ bot.clickButton(IDELabel.Button.NEXT);
+ bot.clickButton(IDELabel.Button.NEXT);
+ bot.clickButton(IDELabel.Button.NEXT);
+
+ bot.tree().expandNode(projectName).select(targetFolder);
+ open.finish(bot);
+
+ // refresh target folder
+ packageExplorer.selectProject(projectName);
+ bot.menu("File").menu("Refresh").click();
+
+ // open converted jbpm file
+ eclipse.openFile(projectName, targetFolder, "jpdl", file1,
+ "Policy Pricing", "processdefinition.xml");
+
+ bot.sleep(TIME_10S);
+ }
+
+ private void copyFile(File in, File out) {
+ try {
+
+ FileChannel inChannel = null;
+ FileChannel outChannel = null;
+
+ inChannel = new FileInputStream(in).getChannel();
+ outChannel = new FileOutputStream(out).getChannel();
+
+ inChannel.transferTo(0, inChannel.size(), outChannel);
+
+ if (inChannel != null)
+ inChannel.close();
+ if (outChannel != null)
+ outChannel.close();
+ log.info("File " + in.getAbsolutePath() + " copied");
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ fail("Error during copying files " + in.getAbsolutePath() + " - "
+ + e.getMessage());
+ }
+ }
+
+}
Property changes on: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/BPMNConvertCase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 6 months
JBoss Tools SVN: r36868 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2011-12-02 04:48:37 -0500 (Fri, 02 Dec 2011)
New Revision: 36868
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java
Log:
[jbpm-bot] fix jbpm deployment test
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java 2011-12-02 09:20:05 UTC (rev 36867)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java 2011-12-02 09:48:37 UTC (rev 36868)
@@ -47,8 +47,13 @@
SWTBotText item = gefBot.textWithLabel("Server Deployer:").setText("gpd-deployer/upload");
editor.save();
+ //gefBot.checkBoxWithLabel("Use credentials").select();
+ gefBot.checkBox(3).select();
+ gefBot.textWithLabel("Username:").setText("admin");
+ gefBot.textWithLabel("Password:").setText("admin");
+
String serverName = TestConfigurator.currentConfig.getServer().type+"-"+TestConfigurator.currentConfig.getServer().version;
- servers.startServer(serverName);
+ servers.startServer(serverName);
item.setFocus();
bot.menu("jBPM").menu("Ping Server").click();
12 years, 6 months
JBoss Tools SVN: r36867 - in trunk/ws/plugins: org.jboss.tools.ws.jaxrs.ui/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 04:20:05 -0500 (Fri, 02 Dec 2011)
New Revision: 36867
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
Log:
Lowering dependency version to enable p2 updates
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-12-02 09:07:43 UTC (rev 36866)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-12-02 09:20:05 UTC (rev 36867)
@@ -11,7 +11,7 @@
org.eclipse.equinox.ds;bundle-version="1.3.0";visibility:=reexport,
org.eclipse.jdt.core;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0";visibility:=reexport,
- org.eclipse.jdt.launching.macosx;bundle-version="3.2.100";visibility:=reexport;resolution:=optional,
+ org.eclipse.jdt.launching.macosx;bundle-version="3.2.100";resolution:=optional;visibility:=reexport,
org.eclipse.jface.text;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.jst.j2ee.ejb;bundle-version="1.1.502",
org.eclipse.ui.workbench;bundle-version="3.7.0";visibility:=reexport,
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-12-02 09:07:43 UTC (rev 36866)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-12-02 09:20:05 UTC (rev 36867)
@@ -24,7 +24,7 @@
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.eclipse.jdt.doc.user;bundle-version="3.7.0";resolution:=optional,
org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.equinox.ds;bundle-version="1.3.1",
+ org.eclipse.equinox.ds;bundle-version="1.3.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.jface.text;bundle-version="3.7.0",
org.eclipse.ui.workbench;bundle-version="3.7.0",
12 years, 6 months
JBoss Tools SVN: r36866 - trunk/vpe/plugins/org.jboss.tools.vpe.html/templates.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-02 04:07:43 -0500 (Fri, 02 Dec 2011)
New Revision: 36866
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
Log:
https://issues.jboss.org/browse/JBIDE-10050 No name attribute in input html tag
patch is applied
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-12-02 07:41:03 UTC (rev 36865)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-12-02 09:07:43 UTC (rev 36866)
@@ -1236,7 +1236,7 @@
<vpe:tag name="input" case-sensitive="no">
<vpe:if test="(@type='checkbox')|(@type='radio')">
<vpe:template children="no" modify="no">
- <vpe:copy attrs="id,style,class,type,checked,disabled,height,width,placeholder">
+ <vpe:copy attrs="id,style,class,type,checked,disabled,height,width,placeholder,name">
<!--vpe:attribute name="disabled" value="disabled"/-->
</vpe:copy>
<vpe:dnd>
@@ -1246,7 +1246,7 @@
</vpe:if>
<vpe:if test="(@type='submit')|(@type='button')">
<vpe:template children="yes" modify="yes">
- <vpe:copy attrs="id,type,value,style,class,dir,disabled,height,width,placeholder" />
+ <vpe:copy attrs="id,type,value,style,class,dir,disabled,height,width,placeholder,name" />
<!--span class="__button__tag" style="{@style}">
<nobr><vpe:value expr="{@value}"/></nobr>
</span-->
@@ -1292,7 +1292,7 @@
<vpe:template children="no" modify="no">
<input type="file" value="{@value}"
class="{@styleClass}" style="{@style}" size="{@size}" disabled="{@disabled}"
- height="{@height}" width="{@width}" placeholder="{@placeholder}"/>
+ height="{@height}" width="{@width}" placeholder="{@placeholder}" name="{@name}"/>
<vpe:resize>
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
@@ -1312,11 +1312,11 @@
<!-- <img src="{@src}" width="20" height="20" />-->
<input type="image" value="{@value}" class="{@class}" style="{@style}"
size="{@size}" disabled="{@disabled}" border="{@border}" dir="{@dir}" src="{src(@src)}"
- height="{@height}" width="{@width}" placeholder="{@placeholder}" />
+ height="{@height}" width="{@width}" placeholder="{@placeholder}" name="{@name}" />
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="no">
- <vpe:copy attrs="id,type,style,class,value,size,dir,disabled,height,width,placeholder" />
+ <vpe:copy attrs="id,type,style,class,value,size,dir,disabled,height,width,placeholder,name" />
<!--span class="__input__tag" style="{@style}">
<nobr><vpe:value expr="{@value}"/></nobr>
</span-->
12 years, 6 months
JBoss Tools SVN: r36865 - in trunk/as/plugins: org.jboss.ide.eclipse.as.management.as71 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-02 02:41:03 -0500 (Fri, 02 Dec 2011)
New Revision: 36865
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
Log:
JBIDE-10293 - newest fix, two jar updates.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-12-02 05:44:36 UTC (rev 36864)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-12-02 07:41:03 UTC (rev 36865)
@@ -33,7 +33,8 @@
String id = server.getRuntime().getRuntimeType().getId();
if (JBOSS7_RUNTIME.equals(id)
|| EAP6_RUNTIME.equals(id)) {
- return IJBoss7ManagerService.AS_VERSION_700;
+ // This is the proper fix for now. See JBIDE-10293
+ return IJBoss7ManagerService.AS_VERSION_710_Beta;
}
if( JBOSS71_RUNTIME.equals(id))
return IJBoss7ManagerService.AS_VERSION_710_Beta;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-controller-client-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-as-protocol-7.1.0.Beta1b.jar
===================================================================
(Binary files differ)
12 years, 6 months
JBoss Tools SVN: r36864 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-02 00:44:36 -0500 (Fri, 02 Dec 2011)
New Revision: 36864
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-6828 - cleanup and enhancement
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -38,6 +38,8 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.tools.jmx.core.ExtensionManager;
import org.jboss.tools.jmx.core.IConnectionWrapper;
@@ -84,8 +86,11 @@
IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if( quick != null && selection != null && selection.toArray().length == 1 ) {
if( selection.getFirstElement() instanceof IServer ) {
- if( menu instanceof MenuManager ) {
- ((MenuManager)quick).add(showInJMXViewAction);
+ IServer server = (IServer)selection.getFirstElement();
+ if( ServerConverter.getJBossServer(server) != null && !ServerUtil.isJBoss7(server)) {
+ if( menu instanceof MenuManager ) {
+ ((MenuManager)quick).add(showInJMXViewAction);
+ }
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -222,6 +222,7 @@
public static String ExploreUtils_Action_Text;
public static String ExploreUtils_Description;
+ public static String ShowInJMXConsole_Action_Text;
public static String ShowInWebManagementConsole_Action_Text;
public static String ShowInWelcomePage_Action_Text;
public static String ShowInAction_Error;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-02 05:44:36 UTC (rev 36864)
@@ -197,6 +197,7 @@
ExploreUtils_Action_Text=Explore
ExploreUtils_Description=Explore deploy directory
+ShowInJMXConsole_Action_Text=JMX Management Console
ShowInWebManagementConsole_Action_Text=Web Management Console
ShowInWelcomePage_Action_Text=Welcome (Root) Page
ShowInAction_Error="Could not show \"{0}\""
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.common.ui.BrowserUtil;
+
+public abstract class AbstractOpenBrowserServerAction extends CommonActionProvider {
+
+ private ICommonActionExtensionSite actionSite;
+ private OpenBrowserAction openURLAction;
+
+
+ protected abstract String getActionText();
+ protected abstract boolean accepts(IServer server);
+ protected abstract String getURL(IServer server) throws CoreException;
+
+ protected boolean shouldAddAction() {
+ ICommonViewerSite site = actionSite.getViewSite();
+ IStructuredSelection selection = null;
+ if (site instanceof ICommonViewerWorkbenchSite) {
+ ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
+ selection = (IStructuredSelection) wsSite.getSelectionProvider()
+ .getSelection();
+ }
+ return shouldAddForSelection(selection);
+ }
+
+ protected boolean shouldAddForSelection(IStructuredSelection sel) {
+ IServer server = getSingleServer(sel);
+ if( server != null ) {
+ JBossServer jbs = ServerConverter.getJBossServer(server);
+ if( jbs != null )
+ return true;
+ }
+ return false;
+ }
+
+ protected IServer getSingleServer(IStructuredSelection sel) {
+ if( sel.size() == 1 && sel.getFirstElement() instanceof IServer )
+ return (IServer)sel.getFirstElement();
+ return null;
+ }
+
+ public void init(ICommonActionExtensionSite site) {
+ super.init(site);
+ this.actionSite = site;
+ createActions(site);
+ }
+
+ protected void createActions(ICommonActionExtensionSite site) {
+ ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
+ CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
+ if (commonViewerWorkbenchSite != null) {
+ openURLAction =
+ new OpenBrowserAction(commonViewerWorkbenchSite.getSelectionProvider());
+ }
+ }
+
+ public void fillContextMenu(IMenuManager menu) {
+ if( shouldAddAction())
+ CommonActionProviderUtils.addToShowInQuickSubMenu(openURLAction, menu, actionSite);
+ }
+
+ private class OpenBrowserAction extends AbstractServerAction {
+ public OpenBrowserAction(ISelectionProvider sp) {
+ super(sp, getActionText());
+ }
+
+ public boolean accept(IServer server) {
+ return accepts(server);
+ }
+
+ public void perform(IServer server) {
+ try {
+ String consoleUrl = getURL(server);
+ BrowserUtil.checkedCreateInternalBrowser(
+ consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
+ JBossServerUIPlugin.getDefault().getLog());
+ } catch (CoreException e) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, e.getMessage(), e);
+ JBossServerUIPlugin.log(status);
+ ErrorDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
+ , Messages.ShowInAction_Error_Title
+ , NLS.bind(Messages.ShowInAction_Error, getActionText()), status);
+ }
+ }
+ }
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+import com.ibm.icu.text.MessageFormat;
+
+public class ShowInJMXConsoleActionProvider extends AbstractOpenBrowserServerAction {
+ private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/jmx-console"; //$NON-NLS-1$
+ protected String getActionText() {
+ return Messages.ShowInJMXConsole_Action_Text;
+ }
+ protected boolean shouldAddForSelection(IStructuredSelection sel) {
+ IServer server = getSingleServer(sel);
+ if( server != null ) {
+ JBossServer jbs = ServerConverter.getJBossServer(server);
+ if( jbs != null ) {
+ // TODO fix this so anything BELOW 7 works
+ // need new util methods
+ return !ServerUtil.isJBoss7(server);
+ }
+ }
+ return false;
+ }
+
+ protected boolean accepts(IServer server) {
+ return server.getServerState() == IServer.STATE_STARTED;
+ }
+ protected String getURL(IServer server) throws CoreException {
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort));
+ return consoleUrl;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -1,82 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.tools.common.ui.BrowserUtil;
import com.ibm.icu.text.MessageFormat;
-public class ShowInWebManagementActionProvider extends CommonActionProvider {
+public class ShowInWebManagementActionProvider extends AbstractOpenBrowserServerAction {
private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console";
-
- private ICommonActionExtensionSite actionSite;
- private OpenWebManagementConsoleAction openWebManagementConsoleAction;
-
- public void init(ICommonActionExtensionSite site) {
- super.init(site);
- this.actionSite = site;
- createActions(site);
+ protected String getActionText() {
+ return Messages.ShowInWebManagementConsole_Action_Text;
}
-
- protected void createActions(ICommonActionExtensionSite site) {
- ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
- CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
- if (commonViewerWorkbenchSite != null) {
- openWebManagementConsoleAction =
- new OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider());
- }
+ protected boolean accepts(IServer server) {
+ return (ServerUtil.isJBoss7(server)
+ && server.getServerState() == IServer.STATE_STARTED);
}
-
- public void fillContextMenu(IMenuManager menu) {
- CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu, actionSite);
+ protected String getURL(IServer server) throws CoreException {
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort));
+ return consoleUrl;
}
- private static class OpenWebManagementConsoleAction extends AbstractServerAction {
- public OpenWebManagementConsoleAction(ISelectionProvider sp) {
- super(sp, Messages.ShowInWebManagementConsole_Action_Text);
- setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE));
- }
-
- public boolean accept(IServer server) {
- return (ServerUtil.isJBoss7(server)
- && server.getServerState() == IServer.STATE_STARTED);
- }
-
- public void perform(IServer server) {
- JBossServer jbossServer;
- try {
- jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
- String host = jbossServer.getHost();
- int webPort = jbossServer.getJBossWebPort();
- String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort));
- BrowserUtil.checkedCreateInternalBrowser(
- consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault()
- .getLog());
- } catch (CoreException e) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, e.getMessage(), e);
- JBossServerUIPlugin.log(status);
- ErrorDialog.openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
- , Messages.ShowInAction_Error_Title
- , NLS.bind(Messages.ShowInAction_Error, Messages.ShowInWebManagementConsole_Action_Text), status);
- }
- }
- }
+// setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE));
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-12-02 05:44:36 UTC (rev 36864)
@@ -1,79 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.tools.common.ui.BrowserUtil;
import com.ibm.icu.text.MessageFormat;
-public class ShowInWelcomePageActionProvider extends CommonActionProvider {
+public class ShowInWelcomePageActionProvider extends AbstractOpenBrowserServerAction {
- private static final String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/"; //$NON-NLS-1$
-
- private ICommonActionExtensionSite actionSite;
- private OpenWelcomePageAction openWelcomePageAction;
-
- public void init(ICommonActionExtensionSite site) {
- super.init(site);
- this.actionSite = site;
- createActions(site);
+ private static String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/"; //$NON-NLS-1$
+ protected String getActionText() {
+ return Messages.ShowInWelcomePage_Action_Text;
}
-
- protected void createActions(ICommonActionExtensionSite site) {
- ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
- CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
- if (commonViewerWorkbenchSite != null) {
- openWelcomePageAction =
- new OpenWelcomePageAction(commonViewerWorkbenchSite.getSelectionProvider());
- }
+
+ protected boolean accepts(IServer server) {
+ return server.getServerState() == IServer.STATE_STARTED;
}
-
- public void fillContextMenu(IMenuManager menu) {
- CommonActionProviderUtils.addToShowInQuickSubMenu(openWelcomePageAction, menu, actionSite);
+
+ protected String getURL(IServer server) throws CoreException {
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host, String.valueOf(webPort));
+ return consoleUrl;
}
- private static class OpenWelcomePageAction extends AbstractServerAction {
- public OpenWelcomePageAction(ISelectionProvider sp) {
- super(sp, Messages.ShowInWelcomePage_Action_Text);
- }
-
- public boolean accept(IServer server) {
- return (ServerUtil.isJBoss7(server)
- && server.getServerState() == IServer.STATE_STARTED);
- }
-
- public void perform(IServer server) {
- try {
- JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
- String host = jbossServer.getHost();
- int webPort = jbossServer.getJBossWebPort();
- String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host, String.valueOf(webPort));
- BrowserUtil.checkedCreateInternalBrowser(
- consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault()
- .getLog());
- } catch (CoreException e) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, e.getMessage(), e);
- JBossServerUIPlugin.log(status);
- ErrorDialog.openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
- , Messages.ShowInAction_Error_Title
- , NLS.bind(Messages.ShowInAction_Error, Messages.ShowInWelcomePage_Action_Text), status);
- }
- }
- }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-12-02 03:50:02 UTC (rev 36863)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-12-02 05:44:36 UTC (rev 36864)
@@ -366,8 +366,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerLogActionProvider"
- id="org.jboss.ide.eclipse.as.ui.extensions.serverLog">
+ class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInJMXConsoleActionProvider"
+ id="org.jboss.ide.eclipse.as.ui.extensions.jmxConsole.showIn">
<enablement>
<instanceof
value="org.eclipse.wst.server.core.IServer">
@@ -392,6 +392,15 @@
</instanceof>
</enablement>
</actionProvider>
+ <actionProvider
+ class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerLogActionProvider"
+ id="org.jboss.ide.eclipse.as.ui.extensions.serverLog">
+ <enablement>
+ <instanceof
+ value="org.eclipse.wst.server.core.IServer">
+ </instanceof>
+ </enablement>
+ </actionProvider>
</extension>
@@ -416,6 +425,8 @@
<actionExtension
pattern="org.jboss.tools.as.wst.server.ui.ServersView.ExploreActionProvider"/>
<actionExtension
+ pattern="org.jboss.ide.eclipse.as.ui.extensions.jmxConsole.showIn"/>
+ <actionExtension
pattern="org.jboss.ide.eclipse.as.ui.extensions.managementConsole"/>
<actionExtension
pattern="org.jboss.ide.eclipse.as.ui.extensions.welcomePage"/>
12 years, 6 months
JBoss Tools SVN: r36863 - trunk/download.jboss.org/jbosstools/updates/requirements/gwt.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-01 22:50:02 -0500 (Thu, 01 Dec 2011)
New Revision: 36863
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
Log:
update builder to get latest GWT 2.4 bits
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2011-12-02 01:54:12 UTC (rev 36862)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2011-12-02 03:50:02 UTC (rev 36863)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/gwt/build.xml -Ddestination=/tmp/gwt-repo
-->
<target name="mirror">
- <!-- note: this site no longer contains the 20110715-1120 release of GWT, since Google removes old versions -->
+ <!-- note: this site no longer contains the 20111201-2000 release of GWT, since Google removes old versions -->
<property name="URL" value="http://dl.google.com/eclipse/plugin/3.7" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20110715-1120" name="Google plugins for Eclipse 3.7" />
+ <repository location="file:${destination}/20111201-2000" name="Google plugins for Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -36,6 +36,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20110715-1120" artifactRepository="file:${destination}/20110715-1120" publishartifacts="true" source="${destination}/20110715-1120" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20111201-2000" artifactRepository="file:${destination}/20111201-2000" publishartifacts="true" source="${destination}/20111201-2000" compress="${compress}" />
</target>
</project>
12 years, 6 months
JBoss Tools SVN: r36862 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-01 20:54:12 -0500 (Thu, 01 Dec 2011)
New Revision: 36862
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
fix URLs for JBT
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-02 01:44:25 UTC (rev 36861)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-02 01:54:12 UTC (rev 36862)
@@ -214,7 +214,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -231,7 +231,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -248,7 +248,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -265,7 +265,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -282,7 +282,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -299,7 +299,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -316,7 +316,7 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- url="http://jboss.org/tools">
+ url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
</extension>
12 years, 6 months
JBoss Tools SVN: r36861 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-01 20:44:25 -0500 (Thu, 01 Dec 2011)
New Revision: 36861
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ActiveEditorSwitcher.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeUpdateJob.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://issues.jboss.org/browse/JBIDE-10016 NullPointerException in VPE when an attribute is intensively changed
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ActiveEditorSwitcher.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ActiveEditorSwitcher.java 2011-12-02 01:42:26 UTC (rev 36860)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ActiveEditorSwitcher.java 2011-12-02 01:44:25 UTC (rev 36861)
@@ -1,40 +0,0 @@
-package org.jboss.tools.vpe.editor;
-
-public class ActiveEditorSwitcher {
- public static final int ACTIVE_EDITOR_CANNOT = 0;
- public static final int ACTIVE_EDITOR_NONE = 1;
- public static final int ACTIVE_EDITOR_SOURCE = 2;
- public static final int ACTIVE_EDITOR_VISUAL = 3;
-
- private int type = ACTIVE_EDITOR_CANNOT;
- private VpeController vpeController;
- private VpeEditorPart editPart;
-
- public ActiveEditorSwitcher(VpeController vpeController, VpeEditorPart editPart) {
- this.vpeController = vpeController;
- this.editPart = editPart;
- }
-
- public void initActiveEditor() {
- type = ACTIVE_EDITOR_NONE;
- }
-
- public void destroyActiveEditor() {
- type = ACTIVE_EDITOR_CANNOT;
- }
-
- public boolean startActiveEditor(int newType) {
- if (type != ACTIVE_EDITOR_NONE || type == ACTIVE_EDITOR_NONE && newType == ACTIVE_EDITOR_SOURCE
- && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) {
- return false;
- } else {
- type = newType;
- return true;
- }
- }
-
- public void stopActiveEditor() {
- vpeController.onRefresh();
- type = ACTIVE_EDITOR_NONE;
- }
-}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-12-02 01:42:26 UTC (rev 36860)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-12-02 01:44:25 UTC (rev 36861)
@@ -14,7 +14,6 @@
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -85,6 +84,7 @@
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
import org.jboss.tools.common.model.ui.util.ModelUtilities;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
@@ -104,6 +104,7 @@
import org.jboss.tools.vpe.dnd.VpeDnD;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.menu.VpeMenuCreator;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
@@ -131,6 +132,16 @@
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeDebugUtil;
+import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil;
+import org.jboss.tools.vpe.handlers.PageDesignOptionsHandler;
+import org.jboss.tools.vpe.handlers.PreferencesHandler;
+import org.jboss.tools.vpe.handlers.RefreshHandler;
+import org.jboss.tools.vpe.handlers.RotateEditorsHandler;
+import org.jboss.tools.vpe.handlers.ShowBorderHandler;
+import org.jboss.tools.vpe.handlers.ShowBundleAsELHandler;
+import org.jboss.tools.vpe.handlers.ShowNonVisualTagsHandler;
+import org.jboss.tools.vpe.handlers.ShowTextFormattingHandler;
import org.jboss.tools.vpe.handlers.VisualPartAbstractHandler;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
@@ -153,7 +164,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-@SuppressWarnings({ "restriction", "deprecation" })
public class VpeController implements INodeAdapter,
IModelLifecycleListener, INodeSelectionListener,
ITextSelectionListener, SelectionListener,
@@ -164,6 +174,7 @@
MozillaContextMenuListener, MozillaResizeListener,
MozillaAfterPaintListener, MozillaScrollListener {
+ public static final int DEFAULT_UPDATE_DELAY_TIME = 400;
private boolean visualEditorVisible = true;
private boolean synced = true;
StructuredTextEditor sourceEditor;
@@ -178,7 +189,7 @@
private VpeVisualDomBuilder visualBuilder;
private VpeDnD vpeDnD;
// private VpeVisualKeyHandler visualKeyHandler;
- private ActiveEditorSwitcher switcher;
+ private ActiveEditorSwitcher switcher = new ActiveEditorSwitcher();
private Attr lastRemovedAttr;
private String lastRemovedAttrName;
private boolean mouseUpSelectionReasonFlag;
@@ -201,7 +212,7 @@
private XModelTreeListenerSWTSync optionsListener;
// Added by Max Areshkau Fix for JBIDE-1479
private UIJob job = null;
- private VpeUpdateJob uiJob;
+ private UIJob uiJob;
// JBIDE-675, visual refresh job
private UIJob visualRefreshJob;
private UIJob reinitJob;
@@ -213,7 +224,7 @@
* Added by Max Areshkau JBIDE-675, stores information about modification
* events
*/
- private List<VpeEventBean> changeEvents;
+ private LinkedList<VpeEventBean> changeEvents;
Shell tip;
@@ -227,10 +238,12 @@
*/
private IKeyEventHandler keyEventHandler;
+ // contains vpe update delau time in miliseconds
+ private int vpeUpdateDelayTime;
+
public VpeController(VpeEditorPart editPart) {
this.editPart = editPart;
- this.switcher = new ActiveEditorSwitcher(this, editPart);
dropWindow = new VpeDropWindow(editPart.getSite().getShell());
}
@@ -354,6 +367,9 @@
elReferenceListListener = ELReferenceList.getInstance();
elReferenceListListener.addChangeListener(this);
+ // initialization of vpe update delay time
+ vpeUpdateDelayTime = DEFAULT_UPDATE_DELAY_TIME;
+
// pageContext.fireTaglibsChanged();
// yradtsevich: we have to refresh VPE selection on init (fix of
@@ -511,13 +527,23 @@
display = PlatformUI.getWorkbench().getDisplay();
if (display != null && (Thread.currentThread() == display.getThread())) {
- getChangeEvents().add(new VpeEventBean(notifier, eventType, feature, oldValue, newValue, pos));
+ getChangeEvents().addLast(
+ new VpeEventBean(notifier, eventType, feature, oldValue,
+ newValue, pos));
if (uiJob == null) {
- uiJob = new VpeUpdateJob(this, switcher);
+ uiJob = new VPEUpdateJob(VpeUIMessages.VPE_UPDATE_JOB_TITLE);
+ }
+
+ if (uiJob.getState() != Job.RUNNING) {
uiJob.setPriority(Job.LONG);
+ // Fix of JBIDE-1900
+ uiJob.schedule(getVpeUpdateDelayTime());
+ } else {
+ uiJob.cancel();
+ uiJob.schedule(getVpeUpdateDelayTime());
+ setVpeUpdateDelayTime(400);
}
- uiJob.interrupt();
- uiJob.execute();
+
return;
}
// start job when we modify file in non ui thread
@@ -542,11 +568,6 @@
job.schedule(1000L);
}
- public void notifyChangedInUiThread(VpeEventBean eventBean) {
- notifyChangedInUiThread(eventBean.getNotifier(), eventBean.getEventType(), eventBean.getFeature(),
- eventBean.getOldValue(), eventBean.getNewValue(), eventBean.getPos());
- }
-
public void notifyChangedInUiThread(INodeNotifier notifier, int eventType,
Object feature, Object oldValue, Object newValue, int pos) {
if (switcher == null
@@ -1180,11 +1201,11 @@
public void keyPress(nsIDOMKeyEvent keyEvent) {
if (VpeDebug.PRINT_VISUAL_KEY_EVENT) {
System.out.println("<<< keyPress type: " + keyEvent.getType() + //$NON-NLS-1$
- " Ctrl: " //$NON-NLS-1$
+ " Ctrl: "
+ keyEvent.getCtrlKey()
- + " Shift: " + keyEvent.getShiftKey() + //$NON-NLS-1$
- " CharCode: " + keyEvent.getCharCode() //$NON-NLS-1$
- + " KeyCode: " + keyEvent.getKeyCode()); //$NON-NLS-1$
+ + " Shift: " + keyEvent.getShiftKey() + //$NON-NLS-1$ //$NON-NLS-2$
+ " CharCode: " + keyEvent.getCharCode()
+ + " KeyCode: " + keyEvent.getKeyCode()); //$NON-NLS-1$ //$NON-NLS-2$
}
if (!switcher
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_VISUAL)) {
@@ -1196,6 +1217,7 @@
} finally {
switcher.stopActiveEditor();
}
+ setVpeUpdateDelayTime(0);
/*
* adding calls of core event handlers, for example' CTR+H' or 'CTRL+M'
* event handler dialog
@@ -1493,6 +1515,127 @@
System.out.println();
}
+ private class VPEUpdateJob extends UIJob {
+ private boolean cancelled = false;
+
+ final static int MAX_EVENTS_TILL_REFRESH = 30;
+
+ private VPEUpdateJob(String name) {
+ super(name);
+ }
+
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ cancelled=false;
+ monitor.beginTask(VpeUIMessages.VPE_UPDATE_JOB_TITLE,
+ 100);
+ while (getChangeEvents().size() > 0) {
+ if (monitor.isCanceled() || cancelled) {
+ return Status.CANCEL_STATUS;
+ }
+
+ if (changeEvents.size() > MAX_EVENTS_TILL_REFRESH) {
+ monitor.worked((int) (10000 / 2));
+ System.out.println("full refresh is started");
+ reinitImpl();
+ System.out.println("full refresh is finished");
+ monitor.worked(10000);
+ changeEvents.clear();
+ return Status.OK_STATUS;
+ }
+
+ monitor.worked((int) (100 / getChangeEvents().size()));
+ VpeEventBean eventBean = getChangeEvents().getFirst();
+ try {
+ notifyChangedInUiThread(
+ eventBean.getNotifier(), eventBean
+ .getEventType(), eventBean
+ .getFeature(), eventBean
+ .getOldValue(), eventBean
+ .getNewValue(), eventBean
+ .getPos());
+ } catch (VpeDisposeException ex) {
+ // JBIDE-675 we will get this exception if user
+ // close editor,
+ // when update visual editor job is running, we
+ // shoud ignore this
+ // exception
+ break;
+ } catch (NullPointerException ex) {
+ if (switcher != null) {
+ throw ex;
+ } else {
+ // class was disposed and exception result
+ // of that we can't stop
+ // refresh job in time, so we just ignore
+ // this exception
+ }
+ } catch(RuntimeException ex) {
+ VpePlugin.getPluginLog().logError(ex);
+ } finally {
+ getChangeEvents().remove(eventBean);
+ }
+ }
+ // cause is to lock calls others events
+ if (switcher != null && switcher.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE))
+ try {
+ sourceSelectionChanged();
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3619
+ * VpeViewUpdateJob takes place after toolbar
+ * selection have been updated. New nodes
+ * haven't been put into dom mapping thus
+ * toolbar becomes desabled. Updating toolbar
+ * state here takes into account updated vpe
+ * nodes.
+ */
+ if (toolbarFormatControllerManager != null) {
+ toolbarFormatControllerManager.selectionChanged();
+ }
+ } finally {
+ switcher.stopActiveEditor();
+ }
+ monitor.done();
+ return Status.OK_STATUS;
+ }
+
+ protected void canceling() {
+ this.cancelled = true;
+ }
+ }
+
+ public class ActiveEditorSwitcher {
+ public static final int ACTIVE_EDITOR_CANNOT = 0;
+ public static final int ACTIVE_EDITOR_NONE = 1;
+ public static final int ACTIVE_EDITOR_SOURCE = 2;
+ public static final int ACTIVE_EDITOR_VISUAL = 3;
+
+ private int type = ACTIVE_EDITOR_CANNOT;
+
+ private void initActiveEditor() {
+ type = ACTIVE_EDITOR_NONE;
+ }
+
+ private void destroyActiveEditor() {
+ type = ACTIVE_EDITOR_CANNOT;
+ }
+
+ public boolean startActiveEditor(int newType) {
+ if (type != ACTIVE_EDITOR_NONE || type == ACTIVE_EDITOR_NONE && newType == ACTIVE_EDITOR_SOURCE
+ && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) {
+ return false;
+ } else {
+ type = newType;
+ return true;
+ }
+ }
+
+ public void stopActiveEditor() {
+ onRefresh();
+ type = ACTIVE_EDITOR_NONE;
+ }
+ }
+
void refreshTemplates() {
if (includeList.includesRefresh()) {
visualRefresh();
@@ -1931,9 +2074,11 @@
/**
* @return the changeEvents
*/
- public List<VpeEventBean> getChangeEvents() {
+ public LinkedList<VpeEventBean> getChangeEvents() {
+
if (changeEvents == null) {
- changeEvents = Collections.synchronizedList(new LinkedList<VpeEventBean>());
+
+ changeEvents = new LinkedList<VpeEventBean>();
}
return changeEvents;
}
@@ -1956,19 +2101,19 @@
reinitJob.schedule();
}
- void reinitImpl() {
+ private void reinitImpl() {
try {
if (switcher == null
|| !switcher
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
return;
}
-
+
// this method must be invoked before any visual
// node is created, see JBIDE-5105
visualEditor.reinitDesignMode();
-
visualBuilder.clearSelectionRectangle();
+ //selectionManager = null;
IDOMModel sourceModel = (IDOMModel) getModel();
if (sourceModel != null) {
IDOMDocument sourceDocument = sourceModel.getDocument();
@@ -2064,6 +2209,21 @@
}
/**
+ * @return the vpeUpdateDelayTime
+ */
+ private int getVpeUpdateDelayTime() {
+ return vpeUpdateDelayTime;
+ }
+
+ /**
+ * @param vpeUpdateDelayTime
+ * the vpeUpdateDelayTime to set
+ */
+ private void setVpeUpdateDelayTime(int vpeUpdateDelayTime) {
+ this.vpeUpdateDelayTime = vpeUpdateDelayTime;
+ }
+
+ /**
* @return the selectionManager
*/
public ISelectionManager getSelectionManager() {
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeUpdateJob.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeUpdateJob.java 2011-12-02 01:42:26 UTC (rev 36860)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeUpdateJob.java 2011-12-02 01:44:25 UTC (rev 36861)
@@ -1,113 +0,0 @@
-package org.jboss.tools.vpe.editor;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.progress.UIJob;
-import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
-import org.jboss.tools.vpe.messages.VpeUIMessages;
-
-public class VpeUpdateJob extends UIJob {
-
- protected boolean execState = false;
-
- protected VpeController vpeController;
- protected ActiveEditorSwitcher switcher;
-
- public VpeUpdateJob(VpeController vpeController, ActiveEditorSwitcher switcher) {
- super(VpeUIMessages.VPE_UPDATE_JOB_TITLE);
- this.vpeController = vpeController;
- this.switcher = switcher;
- }
-
- protected synchronized void setExecState(boolean execState) {
- this.execState = execState;
- }
-
- protected synchronized boolean isExecState() {
- return execState;
- }
-
- public void interrupt() {
- setExecState(false);
- }
-
- public void execute() {
- setExecState(true);
- schedule();
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- IStatus res = Status.OK_STATUS;
- final int totalWork = 10000;
- final int maxQueue4WholeRefresh = 30;
- monitor.beginTask(VpeUIMessages.VPE_UPDATE_JOB_TITLE, totalWork);
- final List<VpeEventBean> changeEvents = vpeController.getChangeEvents();
- while (changeEvents.size() > 0) {
- if (!isExecState()) {
- break;
- }
- if (changeEvents.size() > maxQueue4WholeRefresh) {
- changeEvents.clear();
- monitor.worked((int) (totalWork / 2));
- vpeController.reinitImpl();
- monitor.worked(totalWork);
- break;
- }
- monitor.worked((int) (totalWork / changeEvents.size()));
- VpeEventBean eventBean = changeEvents.remove(0);
- if (monitor.isCanceled()) {
- // Yahor Radtsevich: the following line is commented as fix of JBIDE-3758: VPE autorefresh is broken in
- // some cases. Now if the change events queue should be cleared, the user have to do it explicitly.
- // getChangeEvents().clear();
- res = Status.CANCEL_STATUS;
- break;
- }
- try {
- vpeController.notifyChangedInUiThread(eventBean);
- } catch (VpeDisposeException ex) {
- // JBIDE-675 we will get this exception if user
- // close editor,
- // when update visual editor job is running, we
- // shoud ignore this
- // exception
- break;
- } catch (NullPointerException ex) {
- if (switcher != null) {
- throw ex;
- } else {
- // class was disposed and exception result
- // of that we can't stop
- // refresh job in time, so we just ignore
- // this exception
- }
- } catch (RuntimeException ex) {
- VpePlugin.getPluginLog().logError(ex);
- }
- }
- if (isExecState() && res == Status.OK_STATUS) {
- // cause is to lock calls others events
- if (switcher != null && switcher.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
- try {
- vpeController.sourceSelectionChanged();
- // https://jira.jboss.org/jira/browse/JBIDE-3619 VpeViewUpdateJob takes place after toolbar selection
- // have been updated. New nodes haven't been put into dom mapping thus toolbar becomes desabled.
- // Updating toolbar state here takes into account updated vpe nodes.
- final FormatControllerManager tfcm = vpeController.getToolbarFormatControllerManager();
- if (tfcm != null) {
- tfcm.selectionChanged();
- }
- } finally {
- switcher.stopActiveEditor();
- }
- }
- }
- monitor.done();
- return res;
- }
-
-}
\ No newline at end of file
12 years, 6 months
JBoss Tools SVN: r36859 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-01 20:41:32 -0500 (Thu, 01 Dec 2011)
New Revision: 36859
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
add certification bucket for JBDS/JBT Extras, along w/ JBDS redball icon; rewrite descriptions
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-02 01:34:15 UTC (rev 36858)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-02 01:41:32 UTC (rev 36859)
@@ -4,11 +4,22 @@
<extension
point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
<certification
+ id="com.jboss.jbds.central.discovery.certification.extras"
+ name="JBoss Developer Studio - Extras"
+ url="http://devstudio.jboss.com">
+ <description>
+ Extra Plugins for JBoss Tools or JBoss Developer Studio
+ </description>
+ <icon
+ image48="images/jbds_icon32.png">
+ </icon>
+ </certification>
+ <certification
id="org.jboss.tools.central.discovery.certification"
name="JBoss Tools"
- url="http://jboss.org/tools/">
+ url="http://www.jboss.org/tools/">
<description>
- Plugins for JBoss Tools.
+ Plugins for JBoss Tools or JBoss Developer Studio
</description>
<icon
image48="images/jbosstools_icon32.png">
@@ -16,7 +27,7 @@
</certification>
<connectorCategory
- description="Plugins related to working with Maven"
+ description="Plugins for working with Maven"
id="org.jboss.tools.central.discovery.maven"
name="Maven"
relevance="60">
@@ -25,7 +36,7 @@
</connectorCategory>
<connectorCategory
- description="Plugins related to testing"
+ description="Plugins for testing + code quality"
id="org.jboss.tools.central.discovery.testing"
name="Testing"
relevance="60">
@@ -34,7 +45,7 @@
</connectorCategory>
<connectorCategory
- description="Plugins related to working with source control systems"
+ description="Plugins for source control systems"
id="org.jboss.tools.central.discovery.scm"
name="Source Control Management"
relevance="60">
@@ -43,7 +54,7 @@
</connectorCategory>
<connectorCategory
- description="Plugins related to web development"
+ description="Plugins for web development"
id="org.jboss.tools.central.discovery.web"
name="Web Development"
relevance="60">
@@ -53,6 +64,7 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="Eclipse Team Provider for the Subversion version control system"
id="org.tigris.subversion.subclipse"
kind="task"
@@ -69,6 +81,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="Tool support for PMD"
id="net.sourceforge.pmd.eclipse"
kind="task"
@@ -85,6 +98,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="FindBugs Plug-in"
id="edu.umd.cs.findbugs.plugin.eclipse"
kind="task"
@@ -101,6 +115,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.web"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="Tool support for the Spring Framework"
id="org.springframework.ide.eclipse.feature"
kind="task"
@@ -117,10 +132,11 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="An Eclipse Git Team provider in pure Java"
id="org.eclipse.egit"
kind="task"
- license="Free, EPL, Incubation"
+ license="Free, EPL"
name="Eclipse EGit"
provider="Eclipse Git"
siteUrl="http://download.jboss.org/jbosstools/updates/indigo/">
@@ -133,6 +149,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="m2e - Maven Integration for Eclipse"
id="org.eclipse.m2e.feature"
kind="task"
@@ -149,6 +166,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="Maven Integration for Web Tools"
id="org.maven.ide.eclipse.wtp.feature"
kind="task"
@@ -165,6 +183,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
+ certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="TestNG plug-in for Eclipse"
id="org.testng.eclipse"
kind="task"
@@ -183,6 +202,7 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven Integration"
id="org.jboss.tools.maven.feature"
kind="task"
@@ -194,7 +214,6 @@
image32="images/jbosstools_icon32.png">
</icon>
<overview
- summary="JBoss Maven Integration"
url="http://jboss.org/tools">
</overview>
</connectorDescriptor>
12 years, 6 months