JBoss Tools SVN: r35732 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2011-10-17 12:40:31 -0400 (Mon, 17 Oct 2011)
New Revision: 35732
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
Log:
JBIDE-9877 : create maven project examples in the workspace
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-10-17 15:49:49 UTC (rev 35731)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-10-17 16:40:31 UTC (rev 35732)
@@ -37,7 +37,7 @@
private static final String UNNAMED_PROJECTS = "UnnamedProjects"; //$NON-NLS-1$
- private static final String JBOSS_TOOLS_MAVEN_PROJECTS = "/.JBossToolsMavenProjects"; //$NON-NLS-1$
+ //private static final String JBOSS_TOOLS_MAVEN_PROJECTS = "/.JBossToolsMavenProjects"; //$NON-NLS-1$
@Override
public List<Project> importProject(final Project projectDescription, File file,
@@ -45,7 +45,7 @@
List<Project> projects = new ArrayList<Project>();
IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
IPath rootPath = workspaceRoot.getLocation();
- IPath mavenProjectsRoot = rootPath.append(JBOSS_TOOLS_MAVEN_PROJECTS);
+ IPath mavenProjectsRoot = rootPath; //.append(JBOSS_TOOLS_MAVEN_PROJECTS);
String projectName = projectDescription.getName();
if (projectName == null || projectName.isEmpty()) {
projectName = UNNAMED_PROJECTS;
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-10-17 15:49:49 UTC (rev 35731)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-10-17 16:40:31 UTC (rev 35732)
@@ -52,7 +52,7 @@
private static final String UNNAMED_PROJECTS = "UnnamedProjects"; //$NON-NLS-1$
- private static final String JBOSS_TOOLS_MAVEN_PROJECTS = "/.JBossToolsMavenProjects"; //$NON-NLS-1$
+ //private static final String JBOSS_TOOLS_MAVEN_PROJECTS = "/.JBossToolsMavenProjects"; //$NON-NLS-1$
private boolean confirm;
@@ -62,7 +62,7 @@
List<Project> projects = new ArrayList<Project>();
IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
IPath rootPath = workspaceRoot.getLocation();
- IPath mavenProjectsRoot = rootPath.append(JBOSS_TOOLS_MAVEN_PROJECTS);
+ IPath mavenProjectsRoot = rootPath;//.append(JBOSS_TOOLS_MAVEN_PROJECTS);
String projectName = projectDescription.getName();
if (projectName == null || projectName.isEmpty()) {
projectName = UNNAMED_PROJECTS;
13 years, 2 months
JBoss Tools SVN: r35731 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-17 11:49:49 -0400 (Mon, 17 Oct 2011)
New Revision: 35731
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
Log:
[JBIDE-9793] added "cloning from" label that shows git repo url
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-17 15:24:58 UTC (rev 35730)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-17 15:49:49 UTC (rev 35731)
@@ -17,10 +17,9 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
@@ -104,10 +103,24 @@
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneGroup);
GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(4).applyTo(cloneGroup);
+ Label gitUriLabel = new Label(cloneGroup, SWT.NONE);
+ gitUriLabel.setText("Cloning From");
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(gitUriLabel);
+
+ Text gitUriValueText = new Text(cloneGroup, SWT.BORDER);
+ gitUriValueText.setEditable(false);
+// gitUriValueText.setBackground(cloneGroup.getBackground());
+ GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(gitUriValueText);
+ dbc.bindValue(
+ WidgetProperties.text(SWT.Modify).observe(gitUriValueText)
+ , BeanProperties.value(AdapterWizardPageModel.PROPERTY_GIT_URI).observe(model)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , null);
+
Label repoPathLabel = new Label(cloneGroup, SWT.NONE);
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(repoPathLabel);
- repoPathLabel.setText("Location");
-
+ repoPathLabel.setText("Destination");
+
Button defaultRepoPathButton = new Button(cloneGroup, SWT.CHECK);
defaultRepoPathButton.setText("default");
GridDataFactory.fillDefaults()
@@ -166,8 +179,7 @@
Link sshPrefsLink = new Link(cloneGroup, SWT.NONE);
sshPrefsLink
- .setText("Please make sure that the private part of the key pair, "
- + "you used to create your domain,\nis listed in the <a>SSH2 Preferences</a>");
+ .setText("Make sure your SSH key used with the domain is listed in <a>SSH2 Preferences</a>");
GridDataFactory.fillDefaults()
.span(4, 1).align(SWT.FILL, SWT.CENTER).indent(0, 10).applyTo(sshPrefsLink);
sshPrefsLink.addSelectionListener(onSshPrefs());
@@ -342,11 +354,12 @@
}
protected void onPageActivated(DataBindingContext dbc) {
- /*
- * this needs to be initialized at page visibility since the default
- * repository path default
- */
model.resetRepositoryPath();
+ try {
+ model.updateGitUri();
+ } catch (OpenshiftException e) {
+ OpenshiftUIActivator.log(OpenshiftUIActivator.createErrorStatus(e.getMessage(), e));
+ }
serverTypeToCreate = getServerTypeToCreate();
model.getParentModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate);
@@ -363,8 +376,7 @@
modeLabel.setText("Mode: Source");
model.getParentModel().setProperty(AdapterWizardPageModel.MODE, AdapterWizardPageModel.MODE_SOURCE);
} catch (OpenshiftException ose) {
- OpenshiftUIActivator.getDefault().getLog()
- .log(new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, ose.getMessage(), ose));
+ OpenshiftUIActivator.log(OpenshiftUIActivator.createErrorStatus(ose.getMessage(), ose));
}
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-17 15:24:58 UTC (rev 35730)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-17 15:49:49 UTC (rev 35731)
@@ -13,6 +13,8 @@
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.UIPreferences;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.client.IApplication;
+import org.jboss.tools.openshift.express.client.OpenshiftException;
/**
* @author André Dietisheim
@@ -22,6 +24,7 @@
private static final String REMOTE_NAME_DEFAULT = "origin";
+ public static final String PROPERTY_GIT_URI = "gitUri";
public static final String PROPERTY_REPO_PATH = "repositoryPath";
public static final String PROPERTY_REMOTE_NAME = "remoteName";
@@ -33,12 +36,28 @@
public static final String SERVER_TYPE = "serverType";
private ImportProjectWizardModel wizardModel;
+ private String gitUri;
public AdapterWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
setRemoteName(REMOTE_NAME_DEFAULT);
}
+ public void updateGitUri() throws OpenshiftException {
+ IApplication application = wizardModel.getApplication();
+ if (application != null) {
+ setGitUri(application.getGitUri());
+ }
+ }
+
+ public void setGitUri(String gitUri) {
+ firePropertyChange(PROPERTY_GIT_URI, this.gitUri, this.gitUri = gitUri);
+ }
+
+ public String getGitUri() {
+ return this.gitUri;
+ }
+
public String getRepositoryPath() {
return wizardModel.getRepositoryPath();
}
@@ -58,9 +77,7 @@
}
private String getEGitDefaultRepositoryPath() {
- String destinationDir =
- Activator.getDefault().getPreferenceStore().getString(UIPreferences.DEFAULT_REPO_DIR);
- return destinationDir;
+ return Activator.getDefault().getPreferenceStore().getString(UIPreferences.DEFAULT_REPO_DIR);
}
public String getRemoteName() {
13 years, 2 months
JBoss Tools SVN: r35730 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-17 11:24:58 -0400 (Mon, 17 Oct 2011)
New Revision: 35730
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
JBIDE-9793 - Ensuring created server has correct name
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 15:11:32 UTC (rev 35729)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 15:24:58 UTC (rev 35730)
@@ -25,7 +25,7 @@
org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.m2e.core.ui;bundle-version="1.0.100",
- org.eclipse.wst.common.modulecore;bundle-version="1.2.101"
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-17 15:11:32 UTC (rev 35729)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-17 15:24:58 UTC (rev 35730)
@@ -41,6 +41,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
@@ -259,7 +260,10 @@
IRuntime rt = (IRuntime)getProperty(AdapterWizardPageModel.RUNTIME_DELEGATE);
String mode = (String)getProperty(AdapterWizardPageModel.MODE);
- IServer server = ExpressServerUtils.createServer(rt, type, "Openshift Server1");
+ String serverNameBase = getApplication().getName() + " Openshift Server";
+ String serverName = org.jboss.ide.eclipse.as.core.util.ServerUtil.getDefaultServerName(serverNameBase);
+
+ IServer server = ExpressServerUtils.createServer(rt, type, serverName);
ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(),
getUser().getRhlogin(), getUser().getPassword(),
getUser().getDomain().getNamespace(), getApplication().getName(), mode);
13 years, 2 months
JBoss Tools SVN: r35729 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-17 11:11:32 -0400 (Mon, 17 Oct 2011)
New Revision: 35729
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
[JBIDE-9793] depending on the latest m2e core plugin (which fixes an issue when importing maven projects)
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 14:59:17 UTC (rev 35728)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 15:11:32 UTC (rev 35729)
@@ -24,7 +24,7 @@
org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.m2e.core.ui;bundle-version="1.0.0",
+ org.eclipse.m2e.core.ui;bundle-version="1.0.100",
org.eclipse.wst.common.modulecore;bundle-version="1.2.101"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 2 months
JBoss Tools SVN: r35728 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-10-17 10:59:17 -0400 (Mon, 17 Oct 2011)
New Revision: 35728
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/WebXmlEditorTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Added web.xml file editor test.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-10-17 14:52:42 UTC (rev 35727)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-10-17 14:59:17 UTC (rev 35728)
@@ -15,6 +15,7 @@
import org.jboss.tools.jsf.ui.bot.test.smoke.FacesConfigCodeCompletionTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.MarkersTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest;
+import org.jboss.tools.jsf.ui.bot.test.smoke.WebXmlEditorTest;
import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest;
import org.jboss.tools.jsf.ui.bot.test.templates.UnknownTemplateTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -44,7 +45,8 @@
OpenOnTest.class,
CodeCompletionTest.class,
FacesConfigCodeCompletionTest.class,
- MarkersTest.class
+ MarkersTest.class,
+ WebXmlEditorTest.class
})
public class JSFAllBotTests{
}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/WebXmlEditorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/WebXmlEditorTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/WebXmlEditorTest.java 2011-10-17 14:59:17 UTC (rev 35728)
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.ui.bot.test.smoke;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+
+/**
+ * * Test web.xml file editor functionality
+ *
+ * @author Vladimir Pakan
+ *
+ */
+public class WebXmlEditorTest extends JSFAutoTestCase {
+ public static final String SESSION_CONFIG_NODE = "session-config";
+ public static final String WELCOME_FILE_LIST_NODE = "welcome-file-list";
+ public static final String JSP_CONFIG_NODE = "JSP Config";
+ public static final String LOGIN_CONFIG_NODE = "login-config";
+ public static final String LOCALE_ENCODING_MAPPING_LIST = "locale-encoding-mapping-list";
+ public static final String SERVLETS_NODE = "Servlets";
+ private static final String WEB_XML_FILE_NAME = "web.xml";
+ private static final String SERVLET_NAME = "TestChangeServlet";
+ private static final String DISPLAY_NAME = "Test Change Servlet";
+ private static final String SERVLET_CLASS = "org.jboss.tests.TestChangeServlet.java";
+ private static final String SERVLET_DESCRIPTION = "Dummy Servlet just for testing web.xml editor functionality";
+ private static final String URL_PATTERN = "*xhtml";
+ private SWTBotEditor webXmlConfigEditor;
+ private SWTBotEditorExt webXmlConfigEditorExt;
+ private String origWebXmlFileContent;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ webXmlConfigEditor = eclipse.openFile(VPEAutoTestCase.JBT_TEST_PROJECT_NAME,
+ "WebContent", "WEB-INF", WebXmlEditorTest.WEB_XML_FILE_NAME);
+ origWebXmlFileContent = webXmlConfigEditor.toTextEditor().getText();
+ webXmlConfigEditorExt = new SWTBotEditorExt(webXmlConfigEditor.toTextEditor().getReference(), bot);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ if (webXmlConfigEditor != null) {
+ webXmlConfigEditor.toTextEditor().setText(origWebXmlFileContent);
+ webXmlConfigEditor.saveAndClose();
+ }
+ super.tearDown();
+ }
+
+ /**
+ * Test web.xml file editor
+ */
+ public void testWebXmlEditor() {
+ // open web.xml file editor
+ webXmlConfigEditorExt.selectPage(IDELabel.WebXmlEditor.TREE_TAB_LABEL);
+ SWTBotTree tree = webXmlConfigEditor.bot().tree();
+ SWTBotTreeItem tiWebXml = tree.expandNode(WebXmlEditorTest.WEB_XML_FILE_NAME);
+ // check content of web.xml tree select each treeitem and expand when possible
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.SESSION_CONFIG_NODE).select();
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.WELCOME_FILE_LIST_NODE).expand().select();
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.JSP_CONFIG_NODE).select();
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.LOGIN_CONFIG_NODE).select();
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.LOCALE_ENCODING_MAPPING_LIST).select();
+ bot.sleep(Timing.time1S());
+ tiWebXml.getNode(WebXmlEditorTest.SERVLETS_NODE).expand().select();
+ // try to add new servlet
+ tiWebXml.getNode(WebXmlEditorTest.SERVLETS_NODE).select();
+ bot.button(IDELabel.Button.ADD,0).click();
+ bot.shell(IDELabel.WebXmlEditor.ADD_SERVLET_DIALOG_TITLE).activate();
+ bot.textWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_DIALOG_SERVLET_NAME_LABEL)
+ .setText(WebXmlEditorTest.SERVLET_NAME);
+ bot.textWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_DIALOG_DISPLAY_NAME_LABEL)
+ .setText(WebXmlEditorTest.DISPLAY_NAME);
+ bot.textWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_DIALOG_SERVLET_CLASS_LABEL)
+ .setText(WebXmlEditorTest.SERVLET_CLASS);
+ bot.textWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_DIALOG_DESCRITPION_LABEL)
+ .setText(WebXmlEditorTest.SERVLET_DESCRIPTION);
+ bot.button(IDELabel.Button.FINISH).click();
+ webXmlConfigEditor.save();
+ String editorText = webXmlConfigEditorExt.getText();
+ String textToContain = "<servlet-name>" + WebXmlEditorTest.SERVLET_NAME + "</servlet-name>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ textToContain = "<display-name>" + WebXmlEditorTest.DISPLAY_NAME + "</display-name>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ textToContain = "<servlet-class>" + WebXmlEditorTest.SERVLET_CLASS + "</servlet-class>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ textToContain = "<description>" + WebXmlEditorTest.SERVLET_DESCRIPTION + "</description>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ // try to add new servlet mapping
+ tiWebXml.getNode(WebXmlEditorTest.SERVLETS_NODE).select();
+ bot.button(IDELabel.Button.ADD,1).click();
+ bot.shell(IDELabel.WebXmlEditor.ADD_SERVLET_MAPPING_DIALOG_TITLE).activate();
+ bot.comboBoxWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_MAPPING_DIALOG_SERVLET_NAME_LABEL)
+ .setText(WebXmlEditorTest.SERVLET_NAME);
+ bot.textWithLabel(IDELabel.WebXmlEditor.ADD_SERVLET_MAPPING_DIALOG_URL_PATTERN_LABEL)
+ .setText(WebXmlEditorTest.URL_PATTERN);
+ bot.button(IDELabel.Button.FINISH).click();
+ webXmlConfigEditor.save();
+ editorText = webXmlConfigEditorExt.getText()
+ .replaceAll("\n", "")
+ .replaceAll("\t", "")
+ .replaceAll("\r", "")
+ .replaceAll(" ", "");
+ textToContain = "<servlet-mapping><servlet-name>" + WebXmlEditorTest.SERVLET_NAME + "</servlet-name>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ textToContain = "<url-pattern>" + WebXmlEditorTest.URL_PATTERN + "</url-pattern></servlet-mapping>";
+ assertTrue("Web.xml editor has to contain text '" +
+ textToContain +
+ "' but it doesn't.",
+ editorText.toLowerCase().contains(textToContain.toLowerCase()));
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/WebXmlEditorTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-10-17 14:52:42 UTC (rev 35727)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-10-17 14:59:17 UTC (rev 35728)
@@ -709,6 +709,14 @@
public static final String SOURCE_TAB_LABEL = "Source";
public static final String TREE_TAB_LABEL = "Tree";
+ public static final String ADD_SERVLET_DIALOG_TITLE = "Add Servlet";
+ public static final String ADD_SERVLET_MAPPING_DIALOG_TITLE = "Add Servlet Mapping";
+ public static final String ADD_SERVLET_DIALOG_SERVLET_NAME_LABEL = "Servlet-Name:*";
+ public static final String ADD_SERVLET_DIALOG_DISPLAY_NAME_LABEL = "Display-Name:";
+ public static final String ADD_SERVLET_DIALOG_SERVLET_CLASS_LABEL = "Servlet-Class:*";
+ public static final String ADD_SERVLET_DIALOG_DESCRITPION_LABEL = "Description:";
+ public static final String ADD_SERVLET_MAPPING_DIALOG_SERVLET_NAME_LABEL = "Servlet-Name:*";
+ public static final String ADD_SERVLET_MAPPING_DIALOG_URL_PATTERN_LABEL = "URL-Pattern:*";
}
}
13 years, 2 months
JBoss Tools SVN: r35727 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-17 10:52:42 -0400 (Mon, 17 Oct 2011)
New Revision: 35727
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
Log:
[JBIDE-9793] corrected column span of link to ssh prefs
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-17 14:48:47 UTC (rev 35726)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-17 14:52:42 UTC (rev 35727)
@@ -111,7 +111,7 @@
sshPrefsLink
.setText("Please make sure that your private key for the public key is listed in the <a>SSH2 Preferences</a>");
GridDataFactory.fillDefaults()
- .span(2, 1).align(SWT.FILL, SWT.CENTER).applyTo(sshPrefsLink);
+ .span(3, 1).align(SWT.FILL, SWT.CENTER).applyTo(sshPrefsLink);
sshPrefsLink.addSelectionListener(onSshPrefs());
}
13 years, 2 months
JBoss Tools SVN: r35726 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-17 10:48:47 -0400 (Mon, 17 Oct 2011)
New Revision: 35726
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
Log:
[JBIDE-9889] added link to the ssh preferences
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-17 14:40:54 UTC (rev 35725)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-17 14:48:47 UTC (rev 35726)
@@ -56,6 +56,7 @@
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.tools.common.ui.databinding.DataBindingUtils;
import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter;
+import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences;
import org.jboss.tools.openshift.express.client.ICartridge;
import org.jboss.tools.openshift.express.client.OpenshiftException;
import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
@@ -87,7 +88,7 @@
protected void doCreateControls(Composite parent, DataBindingContext dbc) {
GridLayoutFactory.fillDefaults().applyTo(parent);
- Group projectGroup = createProjectGroup(parent, dbc);
+ Group projectGroup = createCloneGroup(parent, dbc);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(projectGroup);
@@ -96,36 +97,36 @@
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
}
- private Group createProjectGroup(Composite parent, DataBindingContext dbc) {
- Group projectGroup = new Group(parent, SWT.BORDER);
- projectGroup.setText("Git clone");
+ private Group createCloneGroup(Composite parent, DataBindingContext dbc) {
+ Group cloneGroup = new Group(parent, SWT.BORDER);
+ cloneGroup.setText("Git clone");
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(projectGroup);
- GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(4).applyTo(projectGroup);
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneGroup);
+ GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(4).applyTo(cloneGroup);
- Label repoPathLabel = new Label(projectGroup, SWT.NONE);
+ Label repoPathLabel = new Label(cloneGroup, SWT.NONE);
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(repoPathLabel);
repoPathLabel.setText("Location");
- Button defaultRepoPathButton = new Button(projectGroup, SWT.CHECK);
+ Button defaultRepoPathButton = new Button(cloneGroup, SWT.CHECK);
defaultRepoPathButton.setText("default");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(defaultRepoPathButton);
defaultRepoPathButton.addSelectionListener(onDefaultRepoPath());
IObservableValue defaultRepoButtonSelection = WidgetProperties.selection().observe(defaultRepoPathButton);
- Text repoPathText = new Text(projectGroup, SWT.BORDER);
+ Text repoPathText = new Text(cloneGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(repoPathText);
DataBindingUtils.bindMandatoryTextField(
repoPathText, "Location", AdapterWizardPageModel.PROPERTY_REPO_PATH, model, dbc);
dbc.bindValue(
- defaultRepoButtonSelection
+ defaultRepoButtonSelection
, WidgetProperties.enabled().observe(repoPathText)
, new UpdateValueStrategy().setConverter(new InvertingBooleanConverter())
, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER));
- Button browseRepoPathButton = new Button(projectGroup, SWT.PUSH);
+ Button browseRepoPathButton = new Button(cloneGroup, SWT.PUSH);
browseRepoPathButton.setText("Browse");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseRepoPathButton);
@@ -138,17 +139,17 @@
defaultRepoButtonSelection.setValue(true);
- Label remoteNameLabel = new Label(projectGroup, SWT.NONE);
+ Label remoteNameLabel = new Label(cloneGroup, SWT.NONE);
remoteNameLabel.setText("Remote name");
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(remoteNameLabel);
- Button defaultRemoteNameButton = new Button(projectGroup, SWT.CHECK);
+ Button defaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
defaultRemoteNameButton.setText("default");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(defaultRemoteNameButton);
defaultRemoteNameButton.addSelectionListener(onDefaultRemoteName());
- Text remoteNameText = new Text(projectGroup, SWT.BORDER);
+ Text remoteNameText = new Text(cloneGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
.span(2, 1).align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false)
.applyTo(remoteNameText);
@@ -157,13 +158,21 @@
IObservableValue defaultRemoteNameSelection = WidgetProperties.selection().observe(defaultRemoteNameButton);
dbc.bindValue(
- defaultRemoteNameSelection
+ defaultRemoteNameSelection
, WidgetProperties.enabled().observe(remoteNameText)
, new UpdateValueStrategy().setConverter(new InvertingBooleanConverter())
, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER));
defaultRemoteNameSelection.setValue(true);
- return projectGroup;
+ Link sshPrefsLink = new Link(cloneGroup, SWT.NONE);
+ sshPrefsLink
+ .setText("Please make sure that the private part of the key pair, "
+ + "you used to create your domain,\nis listed in the <a>SSH2 Preferences</a>");
+ GridDataFactory.fillDefaults()
+ .span(4, 1).align(SWT.FILL, SWT.CENTER).indent(0, 10).applyTo(sshPrefsLink);
+ sshPrefsLink.addSelectionListener(onSshPrefs());
+
+ return cloneGroup;
}
private SelectionListener onDefaultRepoPath() {
@@ -201,6 +210,16 @@
};
}
+ private SelectionAdapter onSshPrefs() {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ SshPrivateKeysPreferences.openPreferencesPage(getShell());
+ }
+ };
+ }
+
private Group createAdapterGroup(Composite parent) {
Group serverAdapterGroup = new Group(parent, SWT.BORDER);
serverAdapterGroup.setText("JBoss Server adapter");
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-17 14:40:54 UTC (rev 35725)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-17 14:48:47 UTC (rev 35726)
@@ -111,7 +111,7 @@
sshPrefsLink
.setText("Please make sure that your private key for the public key is listed in the <a>SSH2 Preferences</a>");
GridDataFactory.fillDefaults()
- .span(2, 1).align(SWT.FILL, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(sshPrefsLink);
+ .span(2, 1).align(SWT.FILL, SWT.CENTER).applyTo(sshPrefsLink);
sshPrefsLink.addSelectionListener(onSshPrefs());
}
13 years, 2 months
JBoss Tools SVN: r35724 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-17 10:34:29 -0400 (Mon, 17 Oct 2011)
New Revision: 35724
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
Log:
[JBIDE-9889] catching transport exception and reporting in a error dialog
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-17 14:09:22 UTC (rev 35723)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-17 14:34:29 UTC (rev 35724)
@@ -57,4 +57,9 @@
log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
}
+ public static IStatus createErrorStatus(String message, Throwable throwable) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ message, throwable);
+ }
+
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 14:09:22 UTC (rev 35723)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 14:34:29 UTC (rev 35724)
@@ -22,6 +22,7 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.errors.TransportException;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.common.ui.WizardUtils;
@@ -48,39 +49,43 @@
public boolean performFinish() {
try {
WizardUtils.runInWizard(
- new Job("Creating local git repo...") {
+ new Job("Cloning local git repo...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
IStatus status = Status.OK_STATUS;
+ String errorMessage = null;
try {
File repositoryFile = model.cloneRepository(monitor);
model.importProject(repositoryFile, monitor);
} catch (OpenshiftException e) {
- status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
+ errorMessage = "An exception occurred while creating local git repository.";
+ status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e);
} catch (URISyntaxException e) {
- status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "The url of the remote git repository is not valid", e);
+ errorMessage = "The url of the remote git repository is not valid";
+ status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e);
} catch (InvocationTargetException e) {
- if (e.getTargetException() instanceof JGitInternalException) {
- status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "Could not clone the repository. Authentication failed.", e
- .getTargetException());
+ if (isTransportException(e)) {
+ errorMessage = "Could not clone the repository. Authentication failed.\n"
+ + " Please make sure that you added your private key to the ssh preferences.";
+ TransportException te = getTransportException(e);
+ status = OpenshiftUIActivator.createErrorStatus(te.getMessage(), te);
} else {
- status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
+ errorMessage = "An exception occurred while creating local git repository.";
+ status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e);
}
} catch (Exception e) {
- status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
+ errorMessage = "An exception occurred while creating local git repository.";
+ status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e);
}
if (!status.isOK()) {
OpenshiftUIActivator.log(status);
+ openErrorDialog(errorMessage, status);
}
return status;
}
+
}, getContainer());
return true;
} catch (Exception e) {
@@ -98,4 +103,27 @@
addPage(new ApplicationWizardPage(this, model));
addPage(new AdapterWizardPage(this, model));
}
+
+ private boolean isTransportException(InvocationTargetException e) {
+ return e.getTargetException() instanceof JGitInternalException
+ && e.getTargetException().getCause() instanceof TransportException;
+ }
+
+ private TransportException getTransportException(InvocationTargetException e) {
+ if (isTransportException(e)) {
+ return (TransportException) ((JGitInternalException) e.getTargetException()).getCause();
+ }
+ return null;
+ }
+
+ private void openErrorDialog(final String errorMessage, final IStatus status) {
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ ErrorDialog.openError(getShell(), "Error cloning the git repo", errorMessage, status);
+ }
+ });
+ }
+
}
13 years, 2 months
JBoss Tools SVN: r35723 - in trunk/central/plugins/org.jboss.tools.central: schema and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-10-17 10:09:22 -0400 (Mon, 17 Oct 2011)
New Revision: 35723
Removed:
trunk/central/plugins/org.jboss.tools.central/schema/downloadJBossRuntimes.exsd
Modified:
trunk/central/plugins/org.jboss.tools.central/plugin.properties
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java
Log:
JBIDE-6369 Should support auto download of new container for Tools
Modified: trunk/central/plugins/org.jboss.tools.central/plugin.properties
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/plugin.properties 2011-10-17 14:09:16 UTC (rev 35722)
+++ trunk/central/plugins/org.jboss.tools.central/plugin.properties 2011-10-17 14:09:22 UTC (rev 35723)
@@ -1,5 +1,4 @@
#Properties file for org.jboss.tools.central
BundleVendor = JBoss by Red Hat
BundleName = JBoss Central
-DownloadJBossRuntimes = Download JBoss Runtimes
ProjectExamplesTutorial = Project Examples Tutorial
Deleted: trunk/central/plugins/org.jboss.tools.central/schema/downloadJBossRuntimes.exsd
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/schema/downloadJBossRuntimes.exsd 2011-10-17 14:09:16 UTC (rev 35722)
+++ trunk/central/plugins/org.jboss.tools.central/schema/downloadJBossRuntimes.exsd 2011-10-17 14:09:22 UTC (rev 35723)
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.tools.central" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.jboss.tools.central" id="downloadJBossRuntimes" name="Download JBoss Runtimes"/>
- </appinfo>
- <documentation>
- Downloads a new JBoss Runtime
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtime">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="url" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="size" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- 3.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- <extension
- point="org.jboss.tools.central.downloadJBossRuntimes">
-
-</extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- JBoss by Red Hat
- </documentation>
- </annotation>
-
-</schema>
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-10-17 14:09:16 UTC (rev 35722)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-10-17 14:09:22 UTC (rev 35723)
@@ -237,7 +237,7 @@
final String downloadId = projectFix.getProperties().get(ProjectFix.DOWNLOAD_ID);
boolean haveDownloadId = false;
if (downloadId != null) {
- DownloadRuntime downloadRuntime = RuntimeCoreActivator.getDefault().getDownloadJBossRuntimes().get(downloadId);
+ DownloadRuntime downloadRuntime = RuntimeCoreActivator.getDefault().getDownloadRuntimes().get(downloadId);
if (downloadRuntime != null) {
haveDownloadId = true;
Button download = toolkit.createButton(fixesComposite, "Download and Install...", SWT.PUSH);
13 years, 2 months