JBoss Tools SVN: r40922 - trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 15:07:14 -0400 (Thu, 10 May 2012)
New Revision: 40922
Modified:
trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java 2012-05-10 17:56:31 UTC (rev 40921)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java 2012-05-10 19:07:14 UTC (rev 40922)
@@ -30,7 +30,7 @@
public static class Seam23FacetInstallDelegateTestSetup extends TestSetup {
- AbstractSeam2FacetInstallDelegateTest delegate = new Seam230FacetInstallDelegateTest("Delegate");
+ Seam230FacetInstallDelegateTest delegate = new Seam230FacetInstallDelegateTest("Delegate");
@Override
protected void setUp() throws Exception {
delegate.setUp();
12 years, 8 months
JBoss Tools SVN: r40921 - trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-10 13:56:31 -0400 (Thu, 10 May 2012)
New Revision: 40921
Added:
trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/.project
Removed:
trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/src/
Log:
JBDS-2131 - remove duplicate code from discovery plugins
Added: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/.project
===================================================================
--- trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/.project (rev 0)
+++ trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/.project 2012-05-10 17:56:31 UTC (rev 40921)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.central.discovery.soa-tooling</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
12 years, 8 months
JBoss Tools SVN: r40920 - in trunk/openshift/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: 2012-05-10 13:46:45 -0400 (Thu, 10 May 2012)
New Revision: 40920
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbeddedCartridgeWizardStrategy.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
[JBIDE-10852] implementing conflicting cases when embedding cartridges
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-10 17:31:56 UTC (rev 40919)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-10 17:46:45 UTC (rev 40920)
@@ -13,7 +13,6 @@
import java.lang.reflect.InvocationTargetException;
import java.net.SocketTimeoutException;
import java.util.Collection;
-import java.util.Set;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateListStrategy;
@@ -39,9 +38,6 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ControlDecoration;
@@ -76,7 +72,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.ui.WizardUtils;
@@ -116,6 +111,7 @@
private Group newAppEmbeddableCartridgesGroup;
private Button checkAllButton;
private Button uncheckAllButton;
+ private EmbeddedCartridgeWizardStrategy embeddedCartridgeWizardStrategy;
public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) {
super("Setup OpenShift Application",
@@ -140,6 +136,8 @@
GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(container);
createApplicationSelectionGroup(container, dbc);
createApplicationConfigurationGroup(container, dbc);
+
+ this.embeddedCartridgeWizardStrategy = new EmbeddedCartridgeWizardStrategy(viewer, this, pageModel);
}
private Composite createApplicationSelectionGroup(Composite container, DataBindingContext dbc) {
@@ -233,8 +231,8 @@
};
try {
WizardUtils.runInWizard(j, getContainer(), dbc);
- } catch(InvocationTargetException ite) {
- } catch(InterruptedException ie) {
+ } catch (InvocationTargetException ite) {
+ } catch (InterruptedException ie) {
}
}
}
@@ -462,19 +460,9 @@
try {
IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement();
if (event.getChecked()) {
- if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) {
- addPhpMyAdminCartridge(cartridge);
- } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) {
- addJenkinsCartridge(cartridge);
- } else {
- addCartridge(cartridge);
- }
+ embeddedCartridgeWizardStrategy.addCartridge(cartridge);
} else {
- if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) {
- removeMySQLCartridge(cartridge);
- } else {
- removeCartridge(cartridge);
- }
+ embeddedCartridgeWizardStrategy.removeCartridge(cartridge);
}
} catch (OpenShiftException e) {
OpenShiftUIActivator.log("Could not process embeddable cartridges", e);
@@ -485,99 +473,20 @@
};
}
- private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException,
- SocketTimeoutException {
- if (pageModel.hasApplicationOfType(ICartridge.JENKINS_14)) {
- pageModel.getSelectedEmbeddableCartridges().add(cartridge);
- } else {
- final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell());
- if (dialog.open() == Dialog.OK) {
- createJenkinsApplication(cartridge, dialog.getValue());
- } else {
- viewer.setChecked(cartridge, false);
- }
- }
- }
- private void createJenkinsApplication(final IEmbeddableCartridge cartridge, final String name) {
- try {
- WizardUtils.runInWizard(new Job(NLS.bind("Creating jenkins application \"{0}\"...", name)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- IApplication jenkinsApplication = pageModel.createJenkinsApplication(name, monitor);
- pageModel.getSelectedEmbeddableCartridges().add(cartridge);
- openLogDialog(jenkinsApplication);
- return Status.OK_STATUS;
- } catch (Exception e) {
- getShell().getDisplay().syncExec(new Runnable() {
- @Override
- public void run() {
- viewer.setChecked(cartridge, false);
- }
- });
- return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
- }
- }
-
- }, getContainer());
- } catch (Exception e) {
- // ignore
- }
- }
-
- private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
- if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge",
- "To embed phpmyadmin, you'd also have to embed mysql.")) {
- pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
- pageModel.selectEmbeddedCartridges(cartridge);
- viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
- } else {
- viewer.setChecked(cartridge, false);
- }
- } else {
- pageModel.getSelectedEmbeddableCartridges().add(cartridge);
- }
- }
-
- private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- pageModel.getSelectedEmbeddableCartridges().add(cartridge);
- }
-
- private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges();
- if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) {
- if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge",
- "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) {
- checkedCartridges.remove(IEmbeddableCartridge.PHPMYADMIN_34);
- checkedCartridges.remove(cartridge);
- viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false);
- } else {
- viewer.setChecked(cartridge, true);
- }
- } else {
- checkedCartridges.remove(cartridge);
- }
- }
-
- private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- pageModel.getSelectedEmbeddableCartridges().remove(cartridge);
- }
-
private SelectionListener onCheckAll() {
return new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- viewer.setAllChecked(true);
- try {
- addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14);
- } catch (OpenShiftException ex) {
- OpenShiftUIActivator.log("Could not select jenkins cartridge", ex);
- } catch (SocketTimeoutException ex) {
- OpenShiftUIActivator.log("Could not select jenkins cartridge", ex);
- }
+// viewer.setAllChecked(true);
+// try {
+// addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14);
+// } catch (OpenShiftException ex) {
+// OpenShiftUIActivator.log("Could not select jenkins cartridge", ex);
+// } catch (SocketTimeoutException ex) {
+// OpenShiftUIActivator.log("Could not select jenkins cartridge", ex);
+// }
}
};
@@ -694,43 +603,6 @@
}
}
- private static class JenkinsApplicationDialog extends InputDialog {
-
- public JenkinsApplicationDialog(Shell shell) {
- super(
- shell,
- "New Jenkins application",
- "To embed Jenkins into your application, you first have to create a separate Jenkins application. "
- + "Please provide a name for this new Jenkins application (lower-case letters and digits only):"
- , null, new JenkinsNameValidator());
- }
-
- private static class JenkinsNameValidator implements IInputValidator {
-
- @Override
- public String isValid(String input) {
- if (StringUtils.isEmpty(input)) {
- return "You have to provide a name for the jenkins application";
- }
-
- if (!StringUtils.isAlphaNumeric(input)) {
- return "The name may only contain lower-case letters and digits.";
- }
- return null;
- }
- }
- }
-
- private void openLogDialog(final IApplication application) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- new CreationLogDialog(getShell(), application).open();
- }
- });
- }
-
/**
* Viewer element comparer based on #equals(). The default implementation in
* CheckboxTableViewer compares elements based on instance identity.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-10 17:31:56 UTC (rev 40919)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-10 17:46:45 UTC (rev 40920)
@@ -382,10 +382,14 @@
return wizardModel.getSelectedEmbeddableCartridges();
}
- public void selectEmbeddedCartridges(IEmbeddableCartridge cartridge) {
-
+ public void selectEmbeddedCartridges(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ getSelectedEmbeddableCartridges().add(cartridge);
}
+ public void unselectEmbeddedCartridges(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ getSelectedEmbeddableCartridges().remove(cartridge);
+ }
+
public void setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) {
firePropertyChange(PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES,
wizardModel.getSelectedEmbeddableCartridges(),
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbeddedCartridgeWizardStrategy.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbeddedCartridgeWizardStrategy.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbeddedCartridgeWizardStrategy.java 2012-05-10 17:46:45 UTC (rev 40920)
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.wizard;
+
+import java.net.SocketTimeoutException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+
+import com.openshift.client.IApplication;
+import com.openshift.client.ICartridge;
+import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.OpenShiftException;
+
+/**
+ * A UI strategy that is able to add and remove embedded cartridges while
+ * fullfilling requirements and resolving conflicts (ex. mutual exclusivity
+ * etc.)
+ *
+ * @author Andre Dietisheim
+ */
+public class EmbeddedCartridgeWizardStrategy {
+
+ private CheckboxTableViewer viewer;
+ private ApplicationConfigurationWizardPageModel pageModel;
+ private IWizardPage wizardPage;
+
+ public EmbeddedCartridgeWizardStrategy(CheckboxTableViewer viewer, IWizardPage wizardPage,
+ ApplicationConfigurationWizardPageModel pageModel) {
+ this.viewer = viewer;
+ this.wizardPage = wizardPage;
+ this.pageModel = pageModel;
+ }
+
+ public void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException {
+ if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) {
+ addPhpMyAdmin();
+ } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) {
+ addJenkins(cartridge);
+ } else if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) {
+ addMySql();
+ } else if (IEmbeddableCartridge.POSTGRESQL_84.equals(cartridge)) {
+ addPostgreSql();
+ } else if (IEmbeddableCartridge.ROCKMONGO_11.equals(cartridge)) {
+ addRockMongo();
+ } else if (IEmbeddableCartridge._10GEN_MMS_AGENT_01.equals(cartridge)) {
+ add10gen();
+ } else {
+ pageModel.selectEmbeddedCartridges(cartridge);
+ }
+ }
+
+ public void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) {
+ removeMySQL();
+ } else if (IEmbeddableCartridge.MONGODB_20.equals(cartridge)) {
+ removeMongoDb();
+ } else {
+ pageModel.unselectEmbeddedCartridges(cartridge);
+ }
+ }
+
+ private void addJenkins(final IEmbeddableCartridge cartridge) throws OpenShiftException,
+ SocketTimeoutException {
+ if (pageModel.hasApplicationOfType(ICartridge.JENKINS_14)) {
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
+ } else {
+ final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell());
+ if (dialog.open() == Dialog.OK) {
+ createJenkinsApplication(cartridge, dialog.getValue());
+ } else {
+ viewer.setChecked(cartridge, false);
+ }
+ }
+ }
+
+ private void createJenkinsApplication(final IEmbeddableCartridge cartridge, final String name) {
+ try {
+ WizardUtils.runInWizard(new Job(NLS.bind("Creating jenkins application \"{0}\"...", name)) {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ IApplication jenkinsApplication = pageModel.createJenkinsApplication(name, monitor);
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
+ openLogDialog(jenkinsApplication);
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ getShell().getDisplay().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ viewer.setChecked(cartridge, false);
+ }
+ });
+ return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
+ }
+ }
+
+ }, getContainer());
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ private void addPhpMyAdmin() throws OpenShiftException {
+ if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
+ if (MessageDialog.openQuestion(getShell(), "Embed phpMyAdmin Cartridge",
+ "To embed phpMyAdmin, you'd also have to embed MySQL. \n\nAlso embed MySQL?")) {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.PHPMYADMIN_34);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, false);
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false);
+ }
+ } else {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.PHPMYADMIN_34);
+ }
+ }
+
+ private void addMySql()
+ throws OpenShiftException, SocketTimeoutException {
+ if (viewer.getChecked(IEmbeddableCartridge.POSTGRESQL_84)) {
+ if (MessageDialog
+ .openQuestion(getShell(), "Remove PostgreSQL Cartridge",
+ "MySQL and PostgreSQL are mutually exclusive. To embed MySQL, you have to remove PostgreSQL. \n\nRemove PostgreSQL?")) {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.POSTGRESQL_84);
+ viewer.setChecked(IEmbeddableCartridge.POSTGRESQL_84, false);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, false);
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ }
+ } else {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ }
+ }
+
+ private void addPostgreSql()
+ throws OpenShiftException, SocketTimeoutException {
+ if (viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
+ if (MessageDialog
+ .openQuestion(getShell(), "Remove MySQL Cartridge",
+ "MySQL and PostgreSQL are mutually exclusive. To embed PostgreSQL, you have to remove MySQL. \n\nRemove MySQL?")) {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.POSTGRESQL_84);
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, false);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.POSTGRESQL_84, false);
+ }
+ } else {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.POSTGRESQL_84);
+ }
+ }
+
+ private void removeMySQL() throws OpenShiftException {
+ if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) {
+ if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge",
+ "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.PHPMYADMIN_34);
+ viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
+ }
+ } else {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ }
+ }
+
+ private void addRockMongo() throws OpenShiftException {
+ if (!viewer.getChecked(IEmbeddableCartridge.MONGODB_20)) {
+ if (MessageDialog.openQuestion(getShell(), "Embed MongoDB Cartridge",
+ "To embed RockMongo, you'd also have to embed MongoDB. \n\nAlso embed MongoDB?")) {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.MONGODB_20);
+ viewer.setChecked(IEmbeddableCartridge.MONGODB_20, true);
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.ROCKMONGO_11);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MONGODB_20, false);
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MONGODB_20);
+ viewer.setChecked(IEmbeddableCartridge.ROCKMONGO_11, false);
+ }
+ } else {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.PHPMYADMIN_34);
+ }
+ }
+
+ private void removeMongoDb() throws OpenShiftException {
+ if (viewer.getChecked(IEmbeddableCartridge.ROCKMONGO_11)) {
+ if (MessageDialog.openQuestion(getShell(), "Remove MongoDB cartridge",
+ "If you remove the MongoDB cartridge, you'd also have to remove RockMongo.")) {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.ROCKMONGO_11);
+ viewer.setChecked(IEmbeddableCartridge.ROCKMONGO_11, false);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MONGODB_20, true);
+ }
+ } else {
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MONGODB_20);
+ }
+ }
+
+ private void add10gen() throws OpenShiftException {
+ if (!viewer.getChecked(IEmbeddableCartridge.MONGODB_20)) {
+ if (MessageDialog.openQuestion(getShell(), "Embed 10gen Cartridge",
+ "To embed 10gen cartridge, you'd also have to embed MongoDB. \n\nAlso embed MongoDB?")) {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.MONGODB_20);
+ viewer.setChecked(IEmbeddableCartridge.MONGODB_20, true);
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge._10GEN_MMS_AGENT_01);
+ } else {
+ viewer.setChecked(IEmbeddableCartridge.MONGODB_20, false);
+ pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MYSQL_51);
+ viewer.setChecked(IEmbeddableCartridge._10GEN_MMS_AGENT_01, false);
+ }
+ } else {
+ pageModel.selectEmbeddedCartridges(IEmbeddableCartridge.PHPMYADMIN_34);
+ }
+ }
+
+
+ private Shell getShell() {
+ return viewer.getControl().getShell();
+ }
+
+ private IWizardContainer getContainer() {
+ return wizardPage.getWizard().getContainer();
+ }
+
+ private void openLogDialog(final IApplication application) {
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ new CreationLogDialog(getShell(), application).open();
+ }
+ });
+ }
+
+ private static class JenkinsApplicationDialog extends InputDialog {
+
+ public JenkinsApplicationDialog(Shell shell) {
+ super(
+ shell,
+ "New Jenkins application",
+ "To embed Jenkins into your application, you first have to create a separate Jenkins application. "
+ + "Please provide a name for this new Jenkins application (lower-case letters and digits only):"
+ , null, new JenkinsNameValidator());
+ }
+
+ private static class JenkinsNameValidator implements IInputValidator {
+
+ @Override
+ public String isValid(String input) {
+ if (StringUtils.isEmpty(input)) {
+ return "You have to provide a name for the jenkins application";
+ }
+
+ if (!StringUtils.isAlphaNumeric(input)) {
+ return "The name may only contain lower-case letters and digits.";
+ }
+ return null;
+ }
+ }
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbeddedCartridgeWizardStrategy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r40919 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-10 13:31:56 -0400 (Thu, 10 May 2012)
New Revision: 40919
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
Log:
JBIDE-11684 - EAP 5.0. ER6 Maven artefacts are not compatible with JBT Java EE Web Project
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-05-10 14:51:03 UTC (rev 40918)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-05-10 17:31:56 UTC (rev 40919)
@@ -42,7 +42,7 @@
public class MavenArtifactHelper {
- private static final DependencyKey ENTERPRISE_JBOSS_SPEC = DependencyKey.fromPortableString("org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1::"); //$NON-NLS-1$
+ //private static final DependencyKey ENTERPRISE_JBOSS_SPEC = DependencyKey.fromPortableString("org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1::"); //$NON-NLS-1$
private static final String COORDS = "org.jboss.spec:jboss-javaee-web-6.0:[0,)"; //$NON-NLS-1$
/**
@@ -87,7 +87,7 @@
if (!isEnterpriseRepositoryAvailable()) {
return new Status(IStatus.ERROR,
MavenProjectExamplesActivator.PLUGIN_ID,
- NLS.bind(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo, ENTERPRISE_JBOSS_SPEC));
+ NLS.bind(Messages.ArchetypeExamplesWizardFirstPage_Unresolved_Enterprise_Repo, COORDS));
}
if (project != null) {
Set<String> requirements = project.getEssentialEnterpriseDependencyGavs();
12 years, 8 months
JBoss Tools SVN: r40918 - branches/jbosstools-3.3.0.Beta3/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-10 10:51:03 -0400 (Thu, 10 May 2012)
New Revision: 40918
Modified:
branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target
Log:
revert to where things were for Beta2, but with the newer org.maven.ide.eclipse.wtp.feature.feature.group 0.15.2
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target 2012-05-10 14:48:02 UTC (rev 40917)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target 2012-05-10 14:51:03 UTC (rev 40918)
@@ -21,9 +21,9 @@
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201112281337"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201112281337"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-05-10 14:48:02 UTC (rev 40917)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-05-10 14:51:03 UTC (rev 40918)
@@ -21,7 +21,7 @@
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -291,8 +291,8 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201103241727"/>
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201105051105"/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target 2012-05-10 14:48:02 UTC (rev 40917)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target 2012-05-10 14:51:03 UTC (rev 40918)
@@ -21,7 +21,7 @@
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
12 years, 8 months
JBoss Tools SVN: r40917 - branches/jbosstools-3.3.0.Beta3/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-10 10:48:02 -0400 (Thu, 10 May 2012)
New Revision: 40917
Modified:
branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target.p2mirror.xml
Log:
revert to where things were for Beta2, but with the newer org.maven.ide.eclipse.wtp.feature.feature.group 0.15.2
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target 2012-05-10 14:48:02 UTC (rev 40917)
@@ -16,11 +16,10 @@
<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR2/"/> -->
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target.p2mirror.xml 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/jbds.target.p2mirror.xml 2012-05-10 14:48:02 UTC (rev 40917)
@@ -34,7 +34,6 @@
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version=""/>
-<iu id="org.jboss.tools.maven.apt.feature.feature.group" version=""/>
<iu id="ch.qos.logback.classic" version=""/>
<iu id="ch.qos.logback.core" version=""/>
<iu id="ch.qos.logback.slf4j" version=""/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-05-10 14:48:02 UTC (rev 40917)
@@ -8,8 +8,8 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use _composite_/core/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/core/3.3...."/>
+ <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -18,11 +18,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml 2012-05-10 14:48:02 UTC (rev 40917)
@@ -28,14 +28,13 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/core/3.3...."/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version=""/>
-<iu id="org.jboss.tools.maven.apt.feature.feature.group" version=""/>
<iu id="ch.qos.logback.classic" version=""/>
<iu id="ch.qos.logback.core" version=""/>
<iu id="ch.qos.logback.slf4j" version=""/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target 2012-05-10 14:48:02 UTC (rev 40917)
@@ -8,7 +8,7 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use _composite_/core/3.3.indigo -->
+ <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
</location>
@@ -18,11 +18,10 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target.p2mirror.xml 2012-05-10 14:37:11 UTC (rev 40916)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/unified.target.p2mirror.xml 2012-05-10 14:48:02 UTC (rev 40917)
@@ -35,7 +35,6 @@
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version=""/>
-<iu id="org.jboss.tools.maven.apt.feature.feature.group" version=""/>
<iu id="ch.qos.logback.classic" version=""/>
<iu id="ch.qos.logback.core" version=""/>
<iu id="ch.qos.logback.slf4j" version=""/>
12 years, 8 months
JBoss Tools SVN: r40916 - branches/jbosstools-3.3.0.Beta1/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-10 10:37:11 -0400 (Thu, 10 May 2012)
New Revision: 40916
Modified:
branches/jbosstools-3.3.0.Beta1/build/target-platform/jbds.target
branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target
branches/jbosstools-3.3.0.Beta1/build/target-platform/unified.target
Log:
switch from org.maven.ide.eclipse.wtp.feature.feature.group 0.15.1.20120208-1300 to 0.15.2.20120306-2040; switch from javax.servlet 3.0.0.v201103241727 and javax.servlet.jsp 2.0.0.v201101211617 to 2.5.0.v201103041518 and 2.2.0.v201103241009
Modified: branches/jbosstools-3.3.0.Beta1/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/target-platform/jbds.target 2012-05-10 14:08:35 UTC (rev 40915)
+++ branches/jbosstools-3.3.0.Beta1/build/target-platform/jbds.target 2012-05-10 14:37:11 UTC (rev 40916)
@@ -18,7 +18,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
Modified: branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target 2012-05-10 14:08:35 UTC (rev 40915)
+++ branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target 2012-05-10 14:37:11 UTC (rev 40916)
@@ -20,7 +20,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
@@ -291,8 +291,8 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201103241727"/>
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201105051105"/>
Modified: branches/jbosstools-3.3.0.Beta1/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/target-platform/unified.target 2012-05-10 14:08:35 UTC (rev 40915)
+++ branches/jbosstools-3.3.0.Beta1/build/target-platform/unified.target 2012-05-10 14:37:11 UTC (rev 40916)
@@ -20,7 +20,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
12 years, 8 months
JBoss Tools SVN: r40915 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-10 10:08:35 -0400 (Thu, 10 May 2012)
New Revision: 40915
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java
Log:
Fixed - JBIDE-11833
Show Environment Properties filters variables
(clearing the console before displaying again)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java 2012-05-10 14:05:42 UTC (rev 40914)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java 2012-05-10 14:08:35 UTC (rev 40915)
@@ -46,6 +46,7 @@
}
List<String> props = application.getEnvironmentProperties();
final MessageConsole console = ConsoleUtils.findMessageConsole(getMessageConsoleName(application));
+ console.clearConsole();
MessageConsoleStream stream = console.newMessageStream();
for (String prop : props) {
stream.println(prop);
12 years, 8 months
JBoss Tools SVN: r40914 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-10 10:05:42 -0400 (Thu, 10 May 2012)
New Revision: 40914
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
Fixed - JBIDE-11833
Show Environment Properties filters variables
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r40913 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-10 09:39:10 -0400 (Thu, 10 May 2012)
New Revision: 40913
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
Fixed - JBIDE-11222
Don't force users to sign in again if they already have created their account in the OpenShift Express Console
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-05-10 13:37:51 UTC (rev 40912)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-05-10 13:39:10 UTC (rev 40913)
@@ -21,17 +21,13 @@
super(true, "Import OpenShift Application");
}
- public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
- this(user, project, application, false);
- }
-
/**
* Constructor
* @param user
* @param project
* @param application
*/
- public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean skipCredentialsPage) {
- super(user, project, application, true, skipCredentialsPage, "Import OpenShift Application");
+ public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
+ super(user, project, application, true, "Import OpenShift Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-10 13:37:51 UTC (rev 40912)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-10 13:39:10 UTC (rev 40913)
@@ -55,28 +55,21 @@
*/
public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard {
- private boolean skipCredentialsPage;
+ private final boolean skipCredentialsPage;
- private OpenShiftExpressApplicationWizardModel wizardModel;
+ private final OpenShiftExpressApplicationWizardModel wizardModel;
- public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) {
+ OpenShiftExpressApplicationWizard(final boolean useExistingApplication, final String wizardTitle) {
this(null, null, null, useExistingApplication, wizardTitle);
}
- public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
- this(user, project, application, useExistingApplication, false, wizardTitle);
- }
-
- public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, boolean skipCredentialsPage, String wizardTitle) {
- setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication));
+
+ OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
- this.skipCredentialsPage = skipCredentialsPage;
+ this.wizardModel = new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication);
+ this.skipCredentialsPage = (user != null);
}
- void setWizardModel(OpenShiftExpressApplicationWizardModel wizardModel) {
- this.wizardModel = wizardModel;
- }
-
OpenShiftExpressApplicationWizardModel getWizardModel() {
return wizardModel;
}
12 years, 8 months