May 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41354 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-05-24 09:40:19 -0400 (Thu, 24 May 2012) New Revision: 41354 Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java Log: DeployingArchiveTest implemented Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java (rev 0) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java 2012-05-24 13:40:19 UTC (rev 41354) @@ -0,0 +1,191 @@ +/******************************************************************************* + * Copyright (c) 2010-2012 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.archives.ui.bot.test; + +import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog; +import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer; +import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author jjankovi + * + */ +@Require(clearProjects = true, perspective = "Java", + server = @Server(state = ServerState.NotRunning, + version = "6.0", operator = ">=")) +public class DeployingArchiveTest extends ArchivesTestBase { + + private static String project = "pr3"; + private final String ARCHIVE_NAME_1 = + project + "a.jar"; + private final String ARCHIVE_NAME_2 = + project + "b.jar"; + private final String PATH_SUFFIX = " [/" + project + "]"; + private final String PATH_ARCHIVE_1 = + ARCHIVE_NAME_1 + PATH_SUFFIX; + private final String PATH_ARCHIVE_2 = + ARCHIVE_NAME_2 + PATH_SUFFIX; + + @BeforeClass + public static void setup() { + importProjectWithoutRuntime(project); + } + + @Test + public void testDeployingArchivetWithView() { + + /* prepare view for testing */ + ProjectArchivesView view = viewForProject(project); + + /* publish into server with entered options */ + publishArchiveInView(view, false, false, + project, PATH_ARCHIVE_1); + + /* test archive is deployed */ + assertArchiveIsDeployed(project + "/" + ARCHIVE_NAME_1); + + /* remove archive from pre-configured server */ + removeArchiveFromServer(project + "/" + ARCHIVE_NAME_1); + + /* select the project again - workaround when switching views */ + view = viewForProject(project); + + /* edit publish setting - always publish option */ + editPublishSettingsArchiveInView(view, true, false, + project, PATH_ARCHIVE_1); + + /* publish into server without dialog appears */ + publishArchiveInView(view, project, PATH_ARCHIVE_1); + + /* test archive is deployed */ + assertArchiveIsDeployed(project + "/" + ARCHIVE_NAME_1); + } + + @Test + public void testDeployingArchiveWithExplorer() { + + /* prepare explorer for testing */ + ProjectArchivesExplorer explorer = explorerForProject(project); + + /* publish into server with entered options */ + publishArchiveInExplorer(explorer, false, false, PATH_ARCHIVE_2); + + /* test archive is deployed */ + assertArchiveIsDeployed(project + "/" + ARCHIVE_NAME_2); + + /* remove archive from pre-configured server */ + removeArchiveFromServer(project + "/" + ARCHIVE_NAME_2); + + /* select the project again - workaround when switching views */ + explorer = explorerForProject(project); + + /* edit publish setting - always publish option */ + editPublishSettingsArchiveInExplorer(explorer, true, false, PATH_ARCHIVE_2); + + /* publish into server without dialog appears */ + publishArchiveInExplorer(explorer, PATH_ARCHIVE_2); + + /* test archive is deployed */ + assertArchiveIsDeployed(project + "/" + ARCHIVE_NAME_2); + } + + private void publishArchiveInView( + ProjectArchivesView view, String... archivePath) { + view.publishToServer(false, archivePath); + } + + private void publishArchiveInView( + ProjectArchivesView view, + boolean alwaysPublish, + boolean autodeploy, String... archivePath) { + fillDeployDialogForArchives(true, true, view, + null, alwaysPublish, autodeploy, archivePath); + } + + private void publishArchiveInExplorer( + ProjectArchivesExplorer explorer, String archive) { + explorer.publishToServer(false, archive); + } + + private void publishArchiveInExplorer( + ProjectArchivesExplorer explorer, + boolean alwaysPublish, + boolean autodeploy, String archive) { + fillDeployDialogForArchives(true, true, null, + explorer, alwaysPublish, autodeploy, archive); + } + + private void editPublishSettingsArchiveInView( + ProjectArchivesView view, boolean alwaysPublish, + boolean autodeploy, String... archivePath) { + fillDeployDialogForArchives(false, true, view, null, + alwaysPublish, autodeploy, archivePath); + } + + private void editPublishSettingsArchiveInExplorer( + ProjectArchivesExplorer explorer, + boolean alwaysPublish, + boolean autodeploy, String archive) { + fillDeployDialogForArchives(false, true, null, + explorer, alwaysPublish, autodeploy, archive); + } + + private void fillDeployDialogForArchives(boolean publishContextMenu, + boolean returnDialog, ProjectArchivesView view, + ProjectArchivesExplorer explorer, boolean alwaysPublish, + boolean autodeploy, String... archivePath) { + + if (!alwaysPublish && autodeploy) { + throw new IllegalArgumentException( + "Cannot autodeploy without always publish option checked"); + } + if (view == null && explorer == null) { + throw new IllegalArgumentException( + "At least one of explorer or view must be provided"); + } + ArchivePublishSettingsDialog dialog = getDialog(publishContextMenu, + view, explorer, returnDialog, archivePath); + + dialog.selectServers(configuredState.getServer().name); + if (alwaysPublish) dialog.checkAlwaysPublish(); + if (autodeploy) dialog.checkAutoDeploy(); + dialog.finish(); + } + + private ArchivePublishSettingsDialog getDialog(boolean publishContextMenu, + ProjectArchivesView view, ProjectArchivesExplorer explorer, + boolean returnDialog, String[] archivePath) { + ArchivePublishSettingsDialog dialog = null; + if (publishContextMenu) { + if (view == null) { + dialog = explorer.publishToServer(returnDialog, archivePath[0]); + } else { + dialog = view.publishToServer(returnDialog, archivePath); + } + } else { + if (view == null) { + dialog = explorer.editPublishSettings(archivePath[0]); + } else { + dialog = view.editPublishSettings(archivePath); + } + } + return dialog; + + } + + +}

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41353 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: core/behaviour and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-24 09:20:19 -0400 (Thu, 24 May 2012) New Revision: 41353 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgesOperation.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 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 trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 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/OpenShiftExpressApplicationWizardModel.java Log: [JBIDE-11314] corrected bugs, moved EmbedCartridgesOperation to job. getting timeout app creation dialog ("continue" or "close") Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 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.core; - -import java.net.SocketTimeoutException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osgi.util.NLS; -import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; - -import com.openshift.client.ApplicationScale; -import com.openshift.client.IApplication; -import com.openshift.client.ICartridge; -import com.openshift.client.IGearProfile; -import com.openshift.client.OpenShiftApplicationNotAvailableException; -import com.openshift.client.OpenShiftException; - -/** - * @author Xavier Coulon - * @author Andre Dietisheim - */ -public class CreateApplicationOperation { - - private UserDelegate user; - - public CreateApplicationOperation(UserDelegate user) { - this.user = user; - } - - public IApplication execute(final String name, final ICartridge cartridge, final ApplicationScale scale, - final IGearProfile gearProfile, final IProgressMonitor monitor) - throws OpenShiftApplicationNotAvailableException, OpenShiftException { - if (user == null) { - throw new OpenShiftException(OpenShiftExpressUIMessages.CANNOT_CREATE_NO_USER); - } - - monitor.setTaskName(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); - Logger.debug(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); - return createApplication(name, cartridge, scale, gearProfile, monitor); - } - - private IApplication createApplication(final String name, final ICartridge cartridge, - final ApplicationScale scale, final IGearProfile gearProfile, final IProgressMonitor monitor) - throws OpenShiftException { - monitor.setTaskName(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); - Logger.debug(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); - return user.createApplication(name, cartridge, scale, gearProfile); - } -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgesOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgesOperation.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgesOperation.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -1,130 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 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.core; - -import java.net.SocketTimeoutException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; - -import com.openshift.client.IApplication; -import com.openshift.client.IEmbeddableCartridge; -import com.openshift.client.IEmbeddedCartridge; -import com.openshift.client.OpenShiftException; - -/** - * An operation that embeds/removes cartridges from a given application. - * - * @author Andre Dietisheim - */ -public class EmbedCartridgesOperation { - - private IApplication application; - - public EmbedCartridgesOperation(IApplication application) { - this.application = application; - } - - /** - * Embeds and removes cartridges from the given application so that it - * matches the given list of enabled cartridges. - * - * @param selectedCartridges - * @param monitor - * @return - * @throws SocketTimeoutException - * @throws OpenShiftException - */ - public List<IEmbeddedCartridge> execute(final List<IEmbeddableCartridge> selectedCartridges, - final IProgressMonitor monitor) - throws SocketTimeoutException, OpenShiftException { - if (selectedCartridges == null) { - return Collections.emptyList(); - } - - removeEmbeddedCartridges( - getRemovedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application); - return addEmbeddedCartridges( - getAddedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application); - } - - private void removeEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToRemove, final IApplication application) - throws OpenShiftException, SocketTimeoutException { - if (cartridgesToRemove.isEmpty()) { - return; - } - Collections.sort(cartridgesToRemove, new CartridgeAddRemovePriorityComparator()); - for (IEmbeddableCartridge cartridgeToRemove : cartridgesToRemove) { - final IEmbeddedCartridge embeddedCartridge = application.getEmbeddedCartridge(cartridgeToRemove); - if (embeddedCartridge != null) { - embeddedCartridge.destroy(); - } - } - } - - private List<IEmbeddedCartridge> addEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToAdd, - final IApplication application) - throws OpenShiftException, SocketTimeoutException { - if (cartridgesToAdd.isEmpty()) { - return Collections.emptyList(); - } - Collections.sort(cartridgesToAdd, new CartridgeAddRemovePriorityComparator()); - return application.addEmbeddableCartridges(cartridgesToAdd); - } - - private List<IEmbeddableCartridge> getAddedCartridges(List<IEmbeddableCartridge> selectedCartridges, - List<IEmbeddedCartridge> embeddedCartridges) { - List<IEmbeddableCartridge> cartridgesToAdd = new ArrayList<IEmbeddableCartridge>(); - for (IEmbeddableCartridge cartridge : selectedCartridges) { - if (!embeddedCartridges.contains(cartridge)) { - cartridgesToAdd.add(cartridge); - } - } - return cartridgesToAdd; - } - - private List<IEmbeddableCartridge> getRemovedCartridges(List<IEmbeddableCartridge> selectedCartridges, - List<IEmbeddedCartridge> embeddedCartridges) { - List<IEmbeddableCartridge> cartridgesToRemove = new ArrayList<IEmbeddableCartridge>(); - for (IEmbeddableCartridge cartridge : embeddedCartridges) { - if (!selectedCartridges.contains(cartridge)) { - cartridgesToRemove.add(cartridge); - } - } - return cartridgesToRemove; - } - - private static class CartridgeAddRemovePriorityComparator implements Comparator<IEmbeddableCartridge> { - - @Override - public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) { - // mysql has to be added/removed before phpmyadmin - if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { - return -1; - } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { - return 1; - } else if (thisCartridge.equals(IEmbeddableCartridge.POSTGRESQL_84)) { - return -1; - } else if (thatCartridge.equals(IEmbeddableCartridge.POSTGRESQL_84)) { - return 1; - } else if (thisCartridge.equals(IEmbeddableCartridge.MONGODB_20)) { - return -1; - } else if (thatCartridge.equals(IEmbeddableCartridge.MONGODB_20)) { - return 1; - } - return 0; - } - } - -} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,7 +10,6 @@ *******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.behaviour; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -43,7 +42,6 @@ import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftPasswordStorageKey; import org.osgi.service.prefs.BackingStoreException; import com.openshift.client.IApplication; @@ -391,9 +389,6 @@ } catch(OpenShiftException ose) { Logger.error(NLS.bind("Could not find application for server {0}", server.getName())); return null; - } catch(SocketTimeoutException ose) { - Logger.error(NLS.bind("Could not find application for server {0}", server.getName())); - return null; } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.console; -import java.net.SocketTimeoutException; import java.util.List; import org.eclipse.jface.window.Window; @@ -143,20 +142,20 @@ * @throws SocketTimeoutException */ public IDomain createDomain(String id) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { if(checkForPassword()) { return delegate.createDomain(id); } return null; } public IApplication getApplicationByName(String arg0) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { if(checkForPassword() && delegate.hasDomain()) { return delegate.getDefaultDomain().getApplicationByName(arg0); } return null; } - public List<IApplication> getApplications() throws OpenShiftException, SocketTimeoutException { + public List<IApplication> getApplications() throws OpenShiftException { if(checkForPassword() && delegate.hasDomain()) { return delegate.getDefaultDomain().getApplications(); } @@ -177,14 +176,14 @@ return null; } - public List<ICartridge> getStandaloneCartridgeNames() throws OpenShiftException, SocketTimeoutException { + public List<ICartridge> getStandaloneCartridgeNames() throws OpenShiftException { if(checkForPassword()) { return delegate.getConnection().getStandaloneCartridges(); } return null; } - public IDomain getDefaultDomain() throws OpenShiftException, SocketTimeoutException { + public IDomain getDefaultDomain() throws OpenShiftException { if(checkForPassword()) { return delegate.getDefaultDomain(); } @@ -192,28 +191,28 @@ } public List<IEmbeddableCartridge> getEmbeddableCartridges() - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { if(checkForPassword()) { return delegate.getConnection().getEmbeddableCartridges(); } return null; } - public boolean hasApplication(String name) throws OpenShiftException, SocketTimeoutException { + public boolean hasApplication(String name) throws OpenShiftException { if(checkForPassword()) { return delegate.getDefaultDomain().hasApplicationByName(name); } return false; } - public boolean hasApplicationOfType(ICartridge type) throws OpenShiftException, SocketTimeoutException { + public boolean hasApplicationOfType(ICartridge type) throws OpenShiftException { if(hasDomain()) { return delegate.getDefaultDomain().hasApplicationByCartridge(type); } return false; } - public boolean hasDomain() throws OpenShiftException, SocketTimeoutException { + public boolean hasDomain() throws OpenShiftException { if(checkForPassword()) { return delegate.hasDomain(); } @@ -222,12 +221,12 @@ public boolean isValid() throws OpenShiftException { if(checkForPassword()) { - return true;//delegate.isValid(); + return true; } return false; } - public void refresh() throws OpenShiftException, SocketTimeoutException { + public void refresh() throws OpenShiftException { if(checkForPassword()) { delegate.refresh(); } @@ -247,11 +246,11 @@ this.connected = connected; } - public IOpenShiftSSHKey getSSHKeyByPublicKey(String publicKey) throws SocketTimeoutException, OpenShiftUnknonwSSHKeyTypeException, OpenShiftException { + public IOpenShiftSSHKey getSSHKeyByPublicKey(String publicKey) throws OpenShiftUnknonwSSHKeyTypeException, OpenShiftException { return delegate.getSSHKeyByPublicKey(publicKey); } - public IOpenShiftSSHKey putSSHKey(String name, ISSHPublicKey key) throws OpenShiftException, SocketTimeoutException { + public IOpenShiftSSHKey putSSHKey(String name, ISSHPublicKey key) throws OpenShiftException { return delegate.putSSHKey(name, key); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.portforward; -import java.net.SocketTimeoutException; import java.util.HashMap; import java.util.Map; @@ -22,8 +21,6 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.jdt.debug.ui.launchConfigurations.JavaLaunchTab; -import org.eclipse.jdt.internal.debug.ui.launcher.AbstractJavaMainTab; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jface.layout.GridDataFactory; @@ -171,8 +168,6 @@ } } catch (OpenShiftException e) { Logger.error("Failed to retrieve applications from user", e); - } catch (SocketTimeoutException e) { - Logger.error("Failed to retrieve applications from user", e); } return false; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.portforward; -import java.io.IOException; -import java.net.SocketTimeoutException; -import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.CoreException; @@ -83,8 +80,6 @@ } } catch (OpenShiftException e) { Logger.error("Failed to retrieve applications from user", e); - } catch (SocketTimeoutException e) { - Logger.error("Failed to retrieve applications from user", e); } return null; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; -import java.net.SocketTimeoutException; - import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; @@ -65,10 +63,6 @@ Logger.warn("Failed to retrieve User domain, prompting for creation", e); // let's use the domain creation wizard, then. domainWizard = new NewDomainDialog(user); - } catch (SocketTimeoutException e) { - Logger.warn("Failed to retrieve User domain, prompting for creation", e); - // let's use the domain creation wizard, then. - domainWizard = new NewDomainDialog(user); } return domainWizard; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; -import java.net.SocketTimeoutException; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -54,8 +52,6 @@ } } catch (OpenShiftException e) { Logger.warn("Failed to retrieve User domain, prompting for creation", e); - } catch (SocketTimeoutException e) { - Logger.warn("Failed to retrieve User domain, prompting for creation", e); } } } @@ -113,12 +109,7 @@ } } catch (OpenShiftException e) { Logger.warn( - "Failed to retrieve User domain, prompting for creation", - e); - } catch (SocketTimeoutException e) { - Logger.warn( - "Failed to retrieve User domain, prompting for creation", - e); + "Failed to retrieve User domain, prompting for creation", e); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; -import java.net.SocketTimeoutException; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -70,8 +68,6 @@ }); } catch (OpenShiftException e) { Logger.error("Failed to refresh element", e); - } catch (SocketTimeoutException e) { - Logger.error("Failed to refresh element", e); } finally { monitor.done(); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -37,5 +37,5 @@ return delegatingMonitor; } - protected abstract IStatus doRun(DelegatingProgressMonitor monitor); + protected abstract IStatus doRun(IProgressMonitor monitor); } \ No newline at end of file Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2012 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.job; + +import java.util.concurrent.locks.ReentrantLock; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.client.ApplicationScale; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IGearProfile; + +/** + * @author Andre Dietisheim + */ +public class CreateApplicationJob extends AbstractDelegatingMonitorJob { + + private UserDelegate user; + private String name; + private ICartridge cartridge; + private ApplicationScale scale; + private IGearProfile gear; + private IApplication application; + private ReentrantLock lock = new ReentrantLock(); + + public CreateApplicationJob(final String name, final ICartridge cartridge, final ApplicationScale scale, + final IGearProfile gear, UserDelegate user) { + super(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); + this.name = name; + this.cartridge = cartridge; + this.scale = scale; + this.gear = gear; + this.user = user; + } + + @Override + protected IStatus doRun(IProgressMonitor monitor) { + try { + lock.lock(); + this.application = user.createApplication(name, cartridge, scale, gear); + return Status.OK_STATUS; + } catch (Exception e) { + return OpenShiftUIActivator.createErrorStatus( + OpenShiftExpressUIMessages.COULD_NOT_CREATE_APPLICATION, e, name); + } finally { + lock.unlock(); + } + } + + public IApplication getApplication() { + try { + lock.lock(); + return application; + } finally { + lock.unlock(); + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -0,0 +1,129 @@ +/******************************************************************************* + * Copyright (c) 2012 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.job; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.client.IApplication; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; + +/** + * @author Andre Dietisheim + */ +public class EmbedCartridgesJob extends AbstractDelegatingMonitorJob { + + private List<IEmbeddableCartridge> selectedCartridges; + private IApplication application; + private List<IEmbeddedCartridge> addedCartridges; + + public EmbedCartridgesJob(List<IEmbeddableCartridge> selectedCartridges, IApplication application) { + super(NLS.bind(OpenShiftExpressUIMessages.ADDING_REMOVING_CARTRIDGES, application.getName())); + this.selectedCartridges = selectedCartridges; + this.application = application; + } + + @Override + protected IStatus doRun(IProgressMonitor monitor) { + try { + removeEmbeddedCartridges( + getRemovedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application); + this.addedCartridges = addEmbeddedCartridges( + getAddedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application); + return Status.OK_STATUS; + } catch (OpenShiftException e) { + return OpenShiftUIActivator.createErrorStatus("Could not embed cartridges for application {0}", e, + application.getName()); + } + } + + public List<IEmbeddedCartridge> getAddedCartridges() { + return addedCartridges; + } + + private void removeEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToRemove, final IApplication application) + throws OpenShiftException { + if (cartridgesToRemove.isEmpty()) { + return; + } + Collections.sort(cartridgesToRemove, new CartridgeAddRemovePriorityComparator()); + for (IEmbeddableCartridge cartridgeToRemove : cartridgesToRemove) { + final IEmbeddedCartridge embeddedCartridge = application.getEmbeddedCartridge(cartridgeToRemove); + if (embeddedCartridge != null) { + embeddedCartridge.destroy(); + } + } + } + + private List<IEmbeddedCartridge> addEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToAdd, + final IApplication application) throws OpenShiftException { + if (cartridgesToAdd.isEmpty()) { + return Collections.emptyList(); + } + Collections.sort(cartridgesToAdd, new CartridgeAddRemovePriorityComparator()); + return application.addEmbeddableCartridges(cartridgesToAdd); + } + + private List<IEmbeddableCartridge> getAddedCartridges(List<IEmbeddableCartridge> selectedCartridges, + List<IEmbeddedCartridge> embeddedCartridges) { + List<IEmbeddableCartridge> cartridgesToAdd = new ArrayList<IEmbeddableCartridge>(); + for (IEmbeddableCartridge cartridge : selectedCartridges) { + if (!embeddedCartridges.contains(cartridge)) { + cartridgesToAdd.add(cartridge); + } + } + return cartridgesToAdd; + } + + private List<IEmbeddableCartridge> getRemovedCartridges(List<IEmbeddableCartridge> selectedCartridges, + List<IEmbeddedCartridge> embeddedCartridges) { + List<IEmbeddableCartridge> cartridgesToRemove = new ArrayList<IEmbeddableCartridge>(); + for (IEmbeddableCartridge cartridge : embeddedCartridges) { + if (!selectedCartridges.contains(cartridge)) { + cartridgesToRemove.add(cartridge); + } + } + return cartridgesToRemove; + } + + private static class CartridgeAddRemovePriorityComparator implements Comparator<IEmbeddableCartridge> { + + @Override + public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) { + // mysql has to be added/removed before phpmyadmin + if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { + return -1; + } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { + return 1; + } else if (thisCartridge.equals(IEmbeddableCartridge.POSTGRESQL_84)) { + return -1; + } else if (thatCartridge.equals(IEmbeddableCartridge.POSTGRESQL_84)) { + return 1; + } else if (thisCartridge.equals(IEmbeddableCartridge.MONGODB_20)) { + return -1; + } else if (thatCartridge.equals(IEmbeddableCartridge.MONGODB_20)) { + return 1; + } + return 0; + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -12,6 +12,7 @@ import java.util.concurrent.atomic.AtomicBoolean; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IDialogConstants; @@ -19,22 +20,19 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; -import org.jboss.tools.common.ui.DelegatingProgressMonitor; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import com.openshift.client.IApplication; import com.openshift.client.OpenShiftException; -import com.openshift.client.OpenShiftTimeoutException; /** * @author Andre Dietisheim */ public class WaitForApplicationJob extends AbstractDelegatingMonitorJob { -// private static final int APP_REACHABLE_TIMEOUT = 180 * 1000; - private static final int APP_REACHABLE_TIMEOUT = 1 * 1000; + private static final int APP_REACHABLE_TIMEOUT = 180 * 1000; private IApplication application; private Shell shell; @@ -45,7 +43,7 @@ } @Override - protected IStatus doRun(DelegatingProgressMonitor monitor) { + protected IStatus doRun(IProgressMonitor monitor) { Logger.debug(OpenShiftExpressUIMessages.WAITING_FOR_REACHABLE); try { while (!application.waitForAccessible(APP_REACHABLE_TIMEOUT)) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -15,14 +15,17 @@ } public static String CANNOT_CREATE_NO_USER; + public static String CREATING_APPLICATION; + public static String COULD_NOT_CREATE_APPLICATION; public static String OPERATION_CANCELLED; - public static String CREATING_APPLICATION; public static String WAITING_FOR_REACHABLE; public static String APPLICATION_NOT_ANSWERING; public static String APPLICATION_NOT_ANSWERING_CONTINUE_WAITING; public static String BTN_KEEP_WAITING; public static String BTN_CLOSE_WIZARD; + public static String ADDING_REMOVING_CARTRIDGES; + public static String TAIL_SERVER_LOG_ACTION; public static String CREATE_OR_EDIT_DOMAIN_ACTION; public static String DELETE_DOMAIN_ACTION; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-24 13:20:19 UTC (rev 41353) @@ -1,12 +1,20 @@ CANNOT_CREATE_NO_USER=Could not create application, have no valid user credentials -CREATING_APPLICATION=Creating application \"{0}\"... +CREATING_APPLICATION=Creating application "{0}"... +COULD_NOT_CREATE_APPLICATION=Could not create application "{0}" OPERATION_CANCELLED=Operation was cancelled by user. -WAITING_FOR_REACHABLE=Waiting for application \"{0}\" to become reachable... -APPLICATION_NOT_ANSWERING=The application "{0}" did not answer in a reasonable amount of time. This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\nOnce you are able to access your application in a browser, you can then clone your git repository.\nIf you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\nIf this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode) +WAITING_FOR_REACHABLE=Waiting for application "{0}" to become reachable... +APPLICATION_NOT_ANSWERING=The application "{0}" did not answer in a reasonable amount of time. \ +This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\n\ +Once you are able to access your application in a browser, you can then clone your git repository.\n\ +If you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\n\ +If this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: \ +https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode) APPLICATION_NOT_ANSWERING_CONTINUE_WAITING=Application "{0}" did not answer so far.\n\nDo you want to continue to wait for it? BTN_KEEP_WAITING=Keep waiting BTN_CLOSE_WIZARD=Close wizard +ADDING_REMOVING_CARTRIDGES=Adding/removing cartridges for application "{0}"... + TAIL_SERVER_LOG_ACTION=Tail files # Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.viewer; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -141,8 +140,6 @@ } } catch(OpenShiftException e) { errors.put(parentElement, e); - } catch(SocketTimeoutException e) { - errors.put(parentElement, e); } return children; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.viewer.property; -import java.net.SocketTimeoutException; - import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; @@ -64,8 +62,6 @@ } } catch (OpenShiftException e) { Logger.error("Could not get selected object's property '" + id + "'.", e); - } catch (SocketTimeoutException e) { - Logger.error("Could not get selected object's property '" + id + "'.", e); } return null; } 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-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -11,7 +11,6 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import java.lang.reflect.InvocationTargetException; -import java.net.SocketTimeoutException; import java.util.Collection; import java.util.List; @@ -39,7 +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.PageChangingEvent; import org.eclipse.jface.fieldassist.AutoCompleteField; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.fieldassist.FieldDecoration; @@ -307,7 +305,7 @@ BeanProperties.list(ApplicationConfigurationWizardPageModel.PROPERTY_GEAR_PROFILES).observe(pageModel), new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), new UpdateListStrategy().setConverter(new GearProfileToStringConverter())); - + final ISWTObservableValue selectedGearProfileComboObservable = WidgetProperties.selection().observe(gearProfilesCombo); final IObservableValue selectedGearProfileModelObservable = BeanProperties.value( @@ -649,7 +647,7 @@ @Override protected void onPageActivated(final DataBindingContext dbc) { - if (checkForDomainExistance()) { + if (ensureHasDomain()) { new Thread() { public void run() { Display.getDefault().asyncExec(new Runnable() { @@ -658,10 +656,8 @@ enableApplicationWidgets(pageModel.isUseExistingApplication()); createExistingAppNameContentAssist(); // this is needed because of weird issues with UI - // not - // reacting to model changes while wizard runnable - // is - // run. We force another update + // not reacting to model changes while wizard + // runnable is run. We force another update dbc.updateModels(); } }); @@ -670,20 +666,12 @@ } } - @Override - protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) { - if (direction == Direction.BACKWARDS) { - return; - } - // event.doit = checkForDomainExistance(); - } - /** * Checks that the user has a domain, opens the creation dialog in case he * hasn't, closes the wizard if the user does not create a domain (required * for any application creation). Otherwise, returns true. */ - private boolean checkForDomainExistance() { + private boolean ensureHasDomain() { try { final UserDelegate user = this.pageModel.getUser(); if (user != null && !user.hasDomain()) { @@ -703,9 +691,6 @@ } catch (OpenShiftException e) { Logger.error("Failed to refresh OpenShift account info", e); return false; - } catch (SocketTimeoutException e) { - Logger.error("Failed to refresh OpenShift account info", e); - return false; } return true; } @@ -806,9 +791,6 @@ if (!pageModel.hasApplication(appName)) { return ValidationStatus.error(NLS.bind("The application \"{0}\" does not exist.", appName)); } - } catch (SocketTimeoutException e) { - return ValidationStatus.error(NLS.bind("The application \"{0}\" existance could not be verified.", - appName)); } catch (OpenShiftException e) { return ValidationStatus.error(NLS.bind("The application \"{0}\" existance could not be verified.", appName)); 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-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -17,10 +17,8 @@ import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.core.CartridgeNameComparator; -import org.jboss.tools.openshift.express.internal.core.CreateApplicationOperation; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; @@ -396,7 +394,7 @@ return getSelectedEmbeddableCartridges().contains(cartridge); } - public boolean hasApplication(String applicationName) throws SocketTimeoutException, OpenShiftException { + public boolean hasApplication(String applicationName) throws OpenShiftException { return getUser().hasApplication(applicationName); } @@ -404,16 +402,4 @@ public IDomain getDomain() throws SocketTimeoutException, OpenShiftException { return wizardModel.getUser().getDefaultDomain(); } - - @Override - public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException { - IApplication application = - new CreateApplicationOperation(getUser()).execute( - name, - ICartridge.JENKINS_14, - ApplicationScale.NO_SCALE, - IGearProfile.SMALL, - monitor); - return application; - } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; -import java.net.SocketTimeoutException; import java.util.Collections; import java.util.List; @@ -44,8 +43,6 @@ getUser().refresh(); } catch (OpenShiftException e) { Logger.error("Failed to refresh User's account", e); - } catch (SocketTimeoutException e) { - Logger.error("Failed to refresh User's account", e); } } @@ -58,8 +55,6 @@ return user.getApplications(); } catch (OpenShiftException e) { Logger.error("Failed to retrieve User's applications", e); - } catch (SocketTimeoutException e) { - Logger.error("Failed to retrieve User's applications", e); } return Collections.emptyList(); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -40,8 +40,6 @@ } } catch (OpenShiftException e) { Logger.error("Fail to retrieve OpenShift domain", e); - } catch (SocketTimeoutException e) { - Logger.error("Fail to retrieve OpenShift domain", e); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategyAdapter.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -13,10 +13,6 @@ import java.net.SocketTimeoutException; import java.util.List; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; @@ -31,12 +27,17 @@ import org.jboss.tools.openshift.express.internal.core.EmbedCartridgeStrategy; import org.jboss.tools.openshift.express.internal.core.EmbedCartridgeStrategy.EmbeddableCartridgeDiff; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.job.AbstractDelegatingMonitorJob; +import org.jboss.tools.openshift.express.internal.ui.job.CreateApplicationJob; +import org.jboss.tools.openshift.express.internal.ui.job.WaitForApplicationJob; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils.ToStringConverter; +import com.openshift.client.ApplicationScale; import com.openshift.client.IApplication; import com.openshift.client.ICartridge; import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IGearProfile; import com.openshift.client.OpenShiftException; /** @@ -51,6 +52,9 @@ */ public class EmbedCartridgeStrategyAdapter implements ICheckStateListener { + private static final int APP_CREATE_TIMEOUT = 2 * 60 * 1000; + private static final int APP_WAIT_TIMEOUT = 2 * 60 * 1000; + private IEmbedCartridgesWizardPageModel pageModel; private IWizardPage wizardPage; @@ -83,7 +87,7 @@ } } } - + } catch (OpenShiftException e) { OpenShiftUIActivator.log("Could not process embeddable cartridges", e); } catch (SocketTimeoutException e) { @@ -147,25 +151,21 @@ private void createJenkinsApplication(final ICartridge cartridge) { final String name = openJenkinsApplicationDialog(); try { - WizardUtils.runInWizard(new Job(NLS.bind("Creating application \"{0}\"...", name)) { - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - IApplication application = pageModel.createJenkinsApplication(name, monitor); - openLogDialog(application); - return Status.OK_STATUS; - } catch (Exception e) { - try { - // TODO: unselect failed embeddable cartridge - // pageModel.unselectEmbeddedCartridges(cartridge); - } catch (Exception ex) { - OpenShiftUIActivator.log(ex); - } - return OpenShiftUIActivator.createErrorStatus("Could not create application {0}", e); - } - } + CreateApplicationJob createJob = + new CreateApplicationJob(name, ICartridge.JENKINS_14, ApplicationScale.NO_SCALE, + IGearProfile.SMALL, pageModel.getUser()); + WizardUtils.runInWizard( + createJob, createJob.getDelegatingProgressMonitor(), getContainer(), APP_CREATE_TIMEOUT); - }, getContainer()); + if (createJob.getResult().isOK()) { + IApplication application = createJob.getApplication(); + openLogDialog(application); + + AbstractDelegatingMonitorJob job = new WaitForApplicationJob(application, getShell()); + WizardUtils.runInWizard( + job, job.getDelegatingProgressMonitor(), getContainer(), APP_WAIT_TIMEOUT); + } + } catch (Exception e) { // ignore } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -10,13 +10,10 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.TimeUnit; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; @@ -39,23 +36,23 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.IWizard; -import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Table; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.job.EmbedCartridgesJob; import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.IEmbeddedCartridge; -import com.openshift.client.OpenShiftException; /** * @author André Dietisheim */ public class EmbedCartridgeWizardPage extends AbstractOpenShiftWizardPage { + private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000; private EmbedCartridgeWizardPageModel pageModel; private CheckboxTableViewer viewer; @@ -84,23 +81,26 @@ ViewerProperties.checkedElements(IEmbeddableCartridge.class).observe(viewer), BeanProperties.set( EmbedCartridgeWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES) - .observe(pageModel));; + .observe(pageModel)); + ; // strategy has to be attached after the binding, so that the binding // can still add the checked cartridge and the strategy can correct viewer.addCheckStateListener(new EmbedCartridgeStrategyAdapter(pageModel, this)); - -// hiding buttons for now: https://issues.jboss.org/browse/JBIDE-10399 -// Button checkAllButton = new Button(embedGroup, SWT.PUSH); -// checkAllButton.setText("Embed A&ll"); -// GridDataFactory.fillDefaults() -// .hint(110, SWT.DEFAULT).align(SWT.FILL, SWT.CENTER).applyTo(checkAllButton); -// checkAllButton.addSelectionListener(onCheckAll()); -// Button uncheckAllButton = new Button(embedGroup, SWT.PUSH); -// uncheckAllButton.setText("Embed N&one"); -// GridDataFactory.fillDefaults() -// .hint(110, SWT.DEFAULT).align(SWT.FILL, SWT.CENTER).applyTo(uncheckAllButton); -// uncheckAllButton.addSelectionListener(onUncheckAll()); + // hiding buttons for now: https://issues.jboss.org/browse/JBIDE-10399 + // Button checkAllButton = new Button(embedGroup, SWT.PUSH); + // checkAllButton.setText("Embed A&ll"); + // GridDataFactory.fillDefaults() + // .hint(110, SWT.DEFAULT).align(SWT.FILL, + // SWT.CENTER).applyTo(checkAllButton); + // checkAllButton.addSelectionListener(onCheckAll()); + + // Button uncheckAllButton = new Button(embedGroup, SWT.PUSH); + // uncheckAllButton.setText("Embed N&one"); + // GridDataFactory.fillDefaults() + // .hint(110, SWT.DEFAULT).align(SWT.FILL, + // SWT.CENTER).applyTo(uncheckAllButton); + // uncheckAllButton.addSelectionListener(onUncheckAll()); } protected CheckboxTableViewer createTable(Composite tableContainer) { @@ -112,17 +112,17 @@ CheckboxTableViewer viewer = new CheckboxTableViewer(table); viewer.setComparer(new EqualityComparer()); viewer.setContentProvider(new ArrayContentProvider()); - - viewer.setSorter(new ViewerSorter(){ + viewer.setSorter(new ViewerSorter() { + @Override public int compare(Viewer viewer, Object e1, Object e2) { - if(e1 instanceof IEmbeddableCartridge && e2 instanceof IEmbeddableCartridge){ - return ((IEmbeddableCartridge)e1).getName().compareTo(((IEmbeddableCartridge)e2).getName()); + if (e1 instanceof IEmbeddableCartridge && e2 instanceof IEmbeddableCartridge) { + return ((IEmbeddableCartridge) e1).getName().compareTo(((IEmbeddableCartridge) e2).getName()); } return super.compare(viewer, e1, e2); } - + }); createTableColumn("Embeddable Cartridge", 1, new CellLabelProvider() { @@ -144,34 +144,34 @@ layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true)); } -// private SelectionListener onCheckAll() { -// return new SelectionAdapter() { -// -// @Override -// public void widgetSelected(SelectionEvent e) { -// viewer.setAllChecked(true); -// try { -// addJenkinsCartridge(IEmbeddedCartridge.JENKINS_14); -// } catch (OpenShiftException ex) { -// OpenShiftUIActivator.log("Could not select jenkins cartridge", ex); -// } catch (SocketTimeoutException ex) { -// OpenShiftUIActivator.log("Could not select jenkins cartridge", ex); -// } -// } -// -// }; -// } + // private SelectionListener onCheckAll() { + // return new SelectionAdapter() { + // + // @Override + // public void widgetSelected(SelectionEvent e) { + // viewer.setAllChecked(true); + // try { + // addJenkinsCartridge(IEmbeddedCartridge.JENKINS_14); + // } catch (OpenShiftException ex) { + // OpenShiftUIActivator.log("Could not select jenkins cartridge", ex); + // } catch (SocketTimeoutException ex) { + // OpenShiftUIActivator.log("Could not select jenkins cartridge", ex); + // } + // } + // + // }; + // } -// private SelectionListener onUncheckAll() { -// return new SelectionAdapter() { -// -// @Override -// public void widgetSelected(SelectionEvent e) { -// viewer.setAllChecked(false); -// } -// -// }; -// } + // private SelectionListener onUncheckAll() { + // return new SelectionAdapter() { + // + // @Override + // public void widgetSelected(SelectionEvent e) { + // viewer.setAllChecked(false); + // } + // + // }; + // } @Override protected void onPageActivated(DataBindingContext dbc) { @@ -216,7 +216,8 @@ @Override public void run() { try { - Set<IEmbeddableCartridge> selectedEmbeddableCartridges = pageModel.refreshSelectedEmbeddedCartridges(); + Set<IEmbeddableCartridge> selectedEmbeddableCartridges = pageModel + .refreshSelectedEmbeddedCartridges(); viewer.setCheckedElements( selectedEmbeddableCartridges.toArray()); } catch (Exception e) { @@ -237,40 +238,22 @@ } public boolean processCartridges() { - final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); try { - WizardUtils.runInWizard( - new Job(NLS.bind("Adding/Removing embedded cartridges for application {0}...", - pageModel.getApplication().getName())) { - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - List<IEmbeddedCartridge> addedCartridges = pageModel.embedCartridges(); - openLogDialog(addedCartridges); - queue.offer(true); - } catch (OpenShiftException e) { - safeRefreshSelectedEmbeddedCartridges(); - queue.offer(false); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - NLS.bind("Could not embed cartridges to application {0}", - pageModel.getApplication().getName()), e); - } catch (SocketTimeoutException e) { - safeRefreshSelectedEmbeddedCartridges(); - queue.offer(false); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - NLS.bind("Could not embed cartridges to application {0}", - pageModel.getApplication().getName()), e); - } - return Status.OK_STATUS; - } - }, getContainer()); - return queue.poll(10, TimeUnit.SECONDS); + EmbedCartridgesJob job = new EmbedCartridgesJob( + new ArrayList<IEmbeddableCartridge>(pageModel.getSelectedEmbeddableCartridges()), + pageModel.getApplication()); + IStatus result = WizardUtils.runInWizard(job, job.getDelegatingProgressMonitor(), getContainer(), EMBED_CARTRIDGES_TIMEOUT); + if (!result.isOK()) { + safeRefreshSelectedEmbeddedCartridges(); + } else { + openLogDialog(job.getAddedCartridges()); + } + return result.isOK(); } catch (Exception e) { return false; } } - + private void openLogDialog(final List<IEmbeddedCartridge> cartridges) { if (cartridges.size() == 0) { return; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -16,18 +16,13 @@ import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.internal.core.CreateApplicationOperation; -import org.jboss.tools.openshift.express.internal.core.EmbedCartridgesOperation; +import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import com.openshift.client.ApplicationScale; import com.openshift.client.IApplication; import com.openshift.client.ICartridge; import com.openshift.client.IDomain; import com.openshift.client.IEmbeddableCartridge; -import com.openshift.client.IEmbeddedCartridge; -import com.openshift.client.IGearProfile; import com.openshift.client.OpenShiftException; /** @@ -131,28 +126,9 @@ return getSelectedEmbeddableCartridges(); } - /** - * Embeds/removes the cartridges that were added/removed in this wizard - * page. - * - * @return the cartridges that were added (embedded). - * @throws OpenShiftException - * @throws SocketTimeoutException - */ - public List<IEmbeddedCartridge> embedCartridges() throws OpenShiftException, SocketTimeoutException { - return new EmbedCartridgesOperation(getApplication()) - .execute(new ArrayList<IEmbeddableCartridge>(selectedCartridges), null); - } - @Override - public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException { - IApplication application = - new CreateApplicationOperation(wizardModel.getUser()).execute( - name, - ICartridge.JENKINS_14, - ApplicationScale.NO_SCALE, - IGearProfile.SMALL, - monitor); - return application; + public UserDelegate getUser() { + return wizardModel.getUser(); } + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -13,9 +13,8 @@ import java.net.SocketTimeoutException; import java.util.Set; -import org.eclipse.core.runtime.IProgressMonitor; +import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import com.openshift.client.IApplication; import com.openshift.client.IDomain; import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.OpenShiftException; @@ -38,7 +37,6 @@ public boolean isSelected(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException; public IDomain getDomain() throws SocketTimeoutException, OpenShiftException; - - public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException; + public UserDelegate getUser(); } \ No newline at end of file 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-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -12,7 +12,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import java.net.SocketTimeoutException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; @@ -24,7 +23,6 @@ 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.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; @@ -38,20 +36,19 @@ import org.jboss.tools.common.ui.DelegatingProgressMonitor; import org.jboss.tools.common.ui.JobUtils; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.internal.core.EmbedCartridgesOperation; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; import org.jboss.tools.openshift.express.internal.ui.job.AbstractDelegatingMonitorJob; +import org.jboss.tools.openshift.express.internal.ui.job.CreateApplicationJob; +import org.jboss.tools.openshift.express.internal.ui.job.EmbedCartridgesJob; import org.jboss.tools.openshift.express.internal.ui.job.WaitForApplicationJob; import com.openshift.client.IApplication; import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.IEmbeddedCartridge; -import com.openshift.client.OpenShiftEndpointException; import com.openshift.client.OpenShiftException; -import com.openshift.client.OpenShiftTimeoutException; /** * @author Andre Dietisheim @@ -61,6 +58,7 @@ private static final int APP_CREATE_TIMEOUT = 2 * 60 * 1000; private static final int APP_WAIT_TIMEOUT = 2 * 60 * 1000; + private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000; private static final int IMPORT_TIMEOUT = 1 * 60 * 1000; private final boolean skipCredentialsPage; @@ -187,81 +185,37 @@ private boolean createApplication() { try { - final String applicationName = wizardModel.getApplicationName(); - AbstractDelegatingMonitorJob job = - new AbstractDelegatingMonitorJob( - NLS.bind("Creating application \"{0}\"...",applicationName)) { - - @Override - protected IStatus doRun(DelegatingProgressMonitor monitor) { - try { - getWizardModel().createApplication(delegatingMonitor); - return Status.OK_STATUS; - } catch (OpenShiftEndpointException e) { - // TODO: refresh user - return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\": {1}", - e, applicationName, e.getRestResponseMessages()); - } catch (OpenShiftTimeoutException e) { - // TODO: refresh user - return OpenShiftUIActivator. - createCancelStatus("Could not create application {0}. Connection timeouted", applicationName); - } catch (OpenShiftException e) { - // TODO: refresh user - return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\"", e, applicationName); - } - } - }; + CreateApplicationJob job = new CreateApplicationJob( + wizardModel.getApplicationName() + , wizardModel.getApplicationCartridge() + , wizardModel.getApplicationScale() + , wizardModel.getApplicationGearProfile() + , wizardModel.getUser()); IStatus status = WizardUtils.runInWizard( job, job.getDelegatingProgressMonitor(), getContainer(), APP_CREATE_TIMEOUT); + wizardModel.setApplication(job.getApplication()); return status.isOK(); } catch (Exception e) { return false; } } - private boolean addRemoveCartridges(final IApplication application, - final Set<IEmbeddableCartridge> selectedCartridges) { - try { - final String applicationName = application.getName(); - IStatus status = WizardUtils.runInWizard( - new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", applicationName)) { - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - if (selectedCartridges != null && !selectedCartridges.isEmpty()) { - final List<IEmbeddedCartridge> embeddedCartridges = - new EmbedCartridgesOperation(application).execute( - new ArrayList<IEmbeddableCartridge>(selectedCartridges) - , monitor); - openCreationLogDialog(embeddedCartridges); - } - } catch (OpenShiftEndpointException e) { - // TODO: refresh user - return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not embed cartridges to application {0}: {1}", applicationName, - e.getRestResponseMessages())); - } catch (OpenShiftException e) { - return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not embed cartridges to application {0}", getWizardModel() - .getApplication().getName()), e); - } catch (SocketTimeoutException e) { - return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not embed cartridges to application {0}", getWizardModel() - .getApplication().getName()), e); - } - return Status.OK_STATUS; - } - }, getContainer()); - return status.isOK(); - } catch (Exception e) { - return false; - } + private boolean addRemoveCartridges(final IApplication application,final Set<IEmbeddableCartridge> selectedCartridges) { + try { + EmbedCartridgesJob job = new EmbedCartridgesJob( + new ArrayList<IEmbeddableCartridge>(wizardModel.getSelectedEmbeddableCartridges()), + wizardModel.getApplication()); + IStatus result = WizardUtils.runInWizard(job, job.getDelegatingProgressMonitor(), getContainer(), EMBED_CARTRIDGES_TIMEOUT); + if (result.isOK()) { + openLogDialog(job.getAddedCartridges()); + } + return result.isOK(); + } catch (Exception e) { + return false; + } } - private void openCreationLogDialog(final List<IEmbeddedCartridge> embeddableCartridges) { + private void openLogDialog(final List<IEmbeddedCartridge> embeddableCartridges) { if (embeddableCartridges == null || embeddableCartridges.isEmpty()) { return; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-24 13:11:26 UTC (rev 41352) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-24 13:20:19 UTC (rev 41353) @@ -20,7 +20,6 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.core.EGitUtils; -import org.jboss.tools.openshift.express.internal.core.CreateApplicationOperation; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.core.console.UserModel; @@ -34,7 +33,6 @@ import com.openshift.client.ICartridge; import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.IGearProfile; -import com.openshift.client.OpenShiftApplicationNotAvailableException; import com.openshift.client.OpenShiftException; public class OpenShiftExpressApplicationWizardModel extends ObservableUIPojo implements IOpenShiftExpressWizardModel { @@ -372,19 +370,6 @@ } } - public IApplication createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, - OpenShiftException { - IApplication application = - new CreateApplicationOperation(getUser()).execute( - getApplicationName(), - getApplicationCartridge(), - getApplicationScale(), - getApplicationGearProfile(), - monitor); - setApplication(application); - return application; - } - @Override public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked")

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41352 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.

by jbosstools-commits＠lists.jboss.org

Author: rhopp Date: 2012-05-24 09:11:26 -0400 (Thu, 24 May 2012) New Revision: 41352 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java Log: Cleanup and Turning of test of deploying examples Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-05-24 11:59:16 UTC (rev 41351) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-05-24 13:11:26 UTC (rev 41352) @@ -7,7 +7,7 @@ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ BaseFunctionalityTest.class, - CreateProjectsWithServerTest.class, +// CreateProjectsWithServerTest.class, // CreateProjectsWithoutServerTest.class DocumentationSectionTest.class //EmptyTestForHudson.class Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-05-24 11:59:16 UTC (rev 41351) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-05-24 13:11:26 UTC (rev 41352) @@ -109,8 +109,6 @@ @Test public void createProjectsSectionTest(){ - //waitForAWhile(); -// SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot(); //Dynamic web project bot.hyperlink(IDELabel.JBossCentralEditor.DYNAMIC_WEB_PROJECT).click(); bot.waitForShell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT); @@ -120,51 +118,13 @@ log.info(bot.activeShell().getText()); //TODO will put back when IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD will be correct - /*bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); + bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD); bot.waitWhile(new NonSystemJobRunsCondition()); assertTrue("New OpenShift Express Application window should have appeared", bot.activeShell().getText().equals(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD)); //assertTrue("New OpenShift Express Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive()); - bot.activeShell().close();*/ + bot.activeShell().close(); - - //check Project example and detection of server -// formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); -// //bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); -// SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE); -// assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive()); -// try{ -// bot.clickButton("Install"); -// SWTBotShell shell = bot.waitForShell(IDELabel.Menu.PREFERENCES); -// if (shell == null){ -// fail("Preferences shell should have appeared"); -// } -// bot.activeShell().close(); -// }catch(WidgetNotFoundException wnfex){ -// fail("Missing Install button"); -// } -// try{ -// projectExampleShell.activate(); -// bot.clickButton("Download and Install..."); -// }catch(WidgetNotFoundException wnfex){ -// fail("Missing \"Download and Install\" button"); -// } -// -// //create direcotry where will be JBossAS downloaded -// if(!createDirectory(JBOSS_INSTALL_PATH)){ -// fail("Unable to create direcory for JBoss - \""+JBOSS_INSTALL_PATH+"\""); -// } -// -// bot.textWithLabel("Install folder:").setText(JBOSS_INSTALL_PATH); -// bot.textWithLabel("Download folder:").setText("/tmp"); -// bot.clickButton("OK"); -// bot.waitForShell("Progress Information"); -// util.waitForNonIgnoredJobs(Long.MAX_VALUE); -// //bot.waitUntil(Conditions.shellCloses(bot.activeShell()), Long.MAX_VALUE, TIME_5S); -// projectExampleShell.close();j - - //server should be added.. check again - //formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE); assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive()); @@ -176,8 +136,6 @@ } projectExampleShell.activate(); assertFalse("Button \"Download and Install...\" should not be enabled, because all requirements should have been met, condition", bot.button("Download and Install...").isEnabled()); -// bot.clickButton("Download and Install..."); -// fail("Button \"Download and Install...\" should not be enabled, because all requirements should have been met"); projectExampleShell.close(); //check the rest of project examples @@ -187,11 +145,6 @@ checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true); checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, false); - /*checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT); - checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_PROJECT); - checkCreateProject(IDELabel.JBossCentralEditor.HTML5_PROJECT); - checkCreateProject(IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT); - checkCreateProject(IDELabel.JBossCentralEditor.RICHFACES_PROJECT);*/ bot.toolbarDropDownButtonWithTooltip("New").click(); bot.waitForShell("New"); assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41351 - trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-24 07:59:16 -0400 (Thu, 24 May 2012) New Revision: 41351 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF Log: [ JBIDE-2001] corrected required egit/jgit bundles: remove upper bound, made both depend on >= 1.2.0 (since we dont want to force people on 1.3) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-05-24 11:58:19 UTC (rev 41350) +++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-05-24 11:59:16 UTC (rev 41351) @@ -5,14 +5,14 @@ Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", - org.eclipse.jgit;bundle-version="[1.0.0,2.1.0)", - org.eclipse.egit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.jgit;bundle-version="1.2.0", + org.eclipse.egit;bundle-version="1.2.0", com.jcraft.jsch;bundle-version="0.1.44", - org.eclipse.egit.core;bundle-version="[1.2.0,2.0.0)", - org.eclipse.team.core;bundle-version="[3.6.0,4.0.0)", - org.eclipse.wst.server.core;bundle-version="[1.1.302,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)" + org.eclipse.egit.core;bundle-version="1.2.0", + org.eclipse.team.core;bundle-version="3.6.0", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.core.runtime;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss by Red Hat

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41350 - in trunk/forge/tests/org.jboss.tools.forge.ui.bot.test: src/org/jboss/tools/forge/ui/bot/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2012-05-24 07:58:19 -0400 (Thu, 24 May 2012) New Revision: 41350 Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/EntityTest.java trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ProjectTest.java trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java Log: * wait for non ignored jobs Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-05-24 11:18:15 UTC (rev 41349) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-05-24 11:58:19 UTC (rev 41350) @@ -22,6 +22,14 @@ <skip>${swtbot.test.skip}</skip> <testSuite>org.jboss.tools.forge.ui.bot.test</testSuite> <testClass>org.jboss.tools.forge.ui.bot.test.suite.ForgeAllTest</testClass> + <dependencies combine.children="append"> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.forge.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> </plugin> </plugins> Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/EntityTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/EntityTest.java 2012-05-24 11:18:15 UTC (rev 41349) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/EntityTest.java 2012-05-24 11:58:19 UTC (rev 41350) @@ -12,7 +12,7 @@ @Test public void newEntity(){ - createProject(ProjectTypes.jar); + createProject(); createPersistence(); getStyledText().setText("entity\n"); Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-05-24 11:18:15 UTC (rev 41349) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-05-24 11:58:19 UTC (rev 41350) @@ -19,7 +19,7 @@ @Test public void hibernateJBossAS7(){ - createProject(ProjectTypes.jar); + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("HIBERNATE\n"); @@ -48,7 +48,7 @@ @Test public void openjpaJBossAS7(){ - createProject(ProjectTypes.jar); + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("OPENJPA\n"); @@ -73,7 +73,7 @@ @Test public void eclipselinkJBossAS7(){ - createProject(ProjectTypes.jar); + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("ECLIPSELINK\n"); @@ -99,7 +99,7 @@ @Test public void infinispanJBossAS7(){ - createProject(ProjectTypes.jar); + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("INFINISPAN\n"); Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ProjectTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ProjectTest.java 2012-05-24 11:18:15 UTC (rev 41349) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/ProjectTest.java 2012-05-24 11:58:19 UTC (rev 41350) @@ -1,8 +1,12 @@ package org.jboss.tools.forge.ui.bot.test; import java.io.IOException; + +import org.eclipse.swtbot.swt.finder.utils.SWTUtils; import org.jboss.tools.forge.ui.bot.test.suite.ForgeTest; +import org.jboss.tools.forge.ui.bot.test.util.ConsoleUtils; import org.jboss.tools.forge.ui.bot.test.util.ResourceUtils; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.Test; @@ -21,8 +25,9 @@ createProject(ProjectTypes.pom); String text = getStyledText().getText(); - assertTrue(text.contains("***SUCCESS*** Created project [" + PROJECT_NAME + "]")); - pExplorer.show(); + assertTrue(ConsoleUtils.waitUntilTextInConsole("***SUCCESS*** Created project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3)); + + pExplorer.show(); assertTrue(pExplorer.existsResource(PROJECT_NAME)); assertTrue(pExplorer.existsResource(PROJECT_NAME, "pom.xml")); @@ -46,7 +51,7 @@ createProject(ProjectTypes.war); String text = getStyledText().getText(); - assertTrue(text.contains("***SUCCESS*** Created project [" + PROJECT_NAME + "]")); + assertTrue(ConsoleUtils.waitUntilTextInConsole("***SUCCESS*** Created project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3)); pExplorer.show(); assertTrue(pExplorer.existsResource(PROJECT_NAME)); assertTrue(pExplorer.existsResource(PROJECT_NAME, "pom.xml")); Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-05-24 11:18:15 UTC (rev 41349) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-05-24 11:58:19 UTC (rev 41350) @@ -26,10 +26,11 @@ protected static final String PROJECT_NAME = "testproject"; protected static final String PACKAGE_NAME = "org.jboss.testproject"; - protected PackageExplorer pExplorer = new PackageExplorer(); + protected static ProjectExplorer pExplorer = null; @BeforeClass public static void setup(){ + pExplorer = new ProjectExplorer(); openForgeView(); startForge(); clear(); @@ -44,16 +45,29 @@ jar, war, pom } + protected void createProject(){ + getStyledText().setText("new-project \n"); + + getStyledText().setText(PROJECT_NAME + "\n"); + getStyledText().setText(PACKAGE_NAME + "\n"); + getStyledText().setText("Y\n"); + + ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3); + + util.waitForNonIgnoredJobs(); + } + protected void createProject(ProjectTypes type){ getStyledText().setText("new-project --type " + type + "\n"); + getStyledText().setText(PROJECT_NAME + "\n"); getStyledText().setText(PACKAGE_NAME + "\n"); getStyledText().setText("Y\n"); ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3); - util.waitForJobs("Importing Forge project"); //see org.jboss.tools.forge.importer#importProject() + util.waitForNonIgnoredJobs(); } protected void createPersistence(){ @@ -156,9 +170,9 @@ openForgeView(); SWTBotView view = getForgeView(); - view.toolbarButton("Start Forge").click(); + view.toolbarButton("Start the default Forge runtime").click(); - util.waitForJobs("Starting Forge"); //see org.jboss.tools.forge.ui.part#startForge() + util.waitForNonIgnoredJobs(); } public static void stopForge(){ @@ -167,7 +181,7 @@ openForgeView(); SWTBotView view = getForgeView(); - view.toolbarButton("Stop Forge").click(); + view.toolbarButton("Stop the running Forge runtime").click(); bot.sleep(TIME_5S); }

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41349 - trunk/central/tests/org.jboss.tools.central.test.ui.bot.

by jbosstools-commits＠lists.jboss.org

Author: rhopp Date: 2012-05-24 07:18:15 -0400 (Thu, 24 May 2012) New Revision: 41349 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml Log: Longer timeout before process is killed Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-05-24 10:50:22 UTC (rev 41348) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-05-24 11:18:15 UTC (rev 41349) @@ -64,6 +64,7 @@ <testClass>org.jboss.tools.central.test.ui.bot.CentralAllBotTests</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> + <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type>

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41348 - in trunk/vpe: plugins/org.jboss.tools.vpe.browsersim.browser and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-05-24 06:50:22 -0400 (Thu, 24 May 2012) New Revision: 41348 Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/about.html trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/about.html trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/about.html trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/about.html Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/build.properties trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/build.properties trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/build.properties Log: https://issues.jboss.org/browse/JBIDE-11183 : Update license text/about.html for BrowserSim feature/plugins Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/about.html =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/about.html (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/about.html 2012-05-24 10:50:22 UTC (rev 41348) @@ -0,0 +1,47 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2012 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +<p><b>Third Party Content</b></p> +<p>The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from Red Hat Inc., the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use. +</p> + +<p><b>Yahoo! Design Stencil Kit version 1.0</b></p> +<p>The plug-in based in part on <a href="http://developer.yahoo.com/ypatterns/about/stencils/">Yahoo! Design Stencil Kit version 1.0</a>. Copyright 2012 Yahoo! Inc. Licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.</p> + +<p><b>Motorola Droid .PSD by `zandog</b></p> +<p>The plug-in based in part on <a href="http://zandog.deviantart.com/#/d2ipirm">Motorola Droid .PSD</a> by `<a href="http://zandog.deviantart.com/">zandog</a>.</p> + +<p><b>Vector iPhone 4 PSD File by Hector van Rensburg</b></p> +<p>The plug-in based in part on <a href="http://psd.tutsplus.com/freebies/psd/freebie-vector-iphone-4-psd-file/">Vector iPhone 4 PSD File</a> by <a href="http://psd.tutsplus.com/author/hector-van-rensburg/">Hector van Rensburg</a>.</p> + +</BODY> +</HTML> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties 2012-05-24 10:21:04 UTC (rev 41347) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties 2012-05-24 10:50:22 UTC (rev 41348) @@ -1,7 +1,9 @@ source.. = src/ output.. = bin/ -src.includes = * +src.includes = *,\ + about.html src.excludes = src bin.includes = META-INF/,\ - . + .,\ + about.html Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/about.html =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/about.html (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/about.html 2012-05-24 10:50:22 UTC (rev 41348) @@ -0,0 +1,34 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2012 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +</BODY> +</HTML> \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/build.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/build.properties 2012-05-24 10:21:04 UTC (rev 41347) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/build.properties 2012-05-24 10:50:22 UTC (rev 41348) @@ -1,6 +1,8 @@ source.. = src/ output.. = bin/ -src.includes = * +src.includes = *,\ + about.html src.excludes = src bin.includes = META-INF/,\ - . + .,\ + about.html Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/about.html =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/about.html (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/about.html 2012-05-24 10:50:22 UTC (rev 41348) @@ -0,0 +1,34 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2012 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +</BODY> +</HTML> \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/build.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/build.properties 2012-05-24 10:21:04 UTC (rev 41347) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/build.properties 2012-05-24 10:50:22 UTC (rev 41348) @@ -1,8 +1,10 @@ source.. = src/ output.. = bin/ -src.includes = * +src.includes = *,\ + about.html src.excludes = src bin.includes = plugin.xml,\ META-INF/,\ .,\ - icons/ + icons/,\ + about.html Added: trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/about.html =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/about.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/about.html 2012-05-24 10:50:22 UTC (rev 41348) @@ -0,0 +1,34 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2012 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +</BODY> +</HTML> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/build.properties 2012-05-24 10:21:04 UTC (rev 41347) +++ trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/build.properties 2012-05-24 10:50:22 UTC (rev 41348) @@ -1,4 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + about.html +src.includes = about.html

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41347 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-24 06:21:04 -0400 (Thu, 24 May 2012) New Revision: 41347 Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/ServerRuntimesPreferencesDialog.java Log: Fixed paths and runtimes removal. Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-05-24 09:59:58 UTC (rev 41346) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-05-24 10:21:04 UTC (rev 41347) @@ -10,7 +10,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.jboss.tools.runtime.core.model.RuntimePath; import org.jboss.tools.runtime.ui.RuntimeUIActivator; -import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.condition.TaskDuration; @@ -45,7 +44,8 @@ SWTBot bot = SWTBotFactory.getBot(); SWTBotTable table = bot.table(); - for (int i = 0; i < table.rowCount(); i++){ + int pathsNumber = table.rowCount(); + for (int i = 0; i < pathsNumber; i++){ table.click(0, 0); bot.button("Remove").click(); } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-05-24 09:59:58 UTC (rev 41346) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-05-24 10:21:04 UTC (rev 41347) @@ -35,7 +35,8 @@ SWTBot bot = SWTBotFactory.getBot(); SWTBotTable table = bot.table(); - for (int i = 0; i < table.rowCount(); i++){ + int runtimesNumber = table.rowCount(); + for (int i = 0; i < runtimesNumber; i++){ table.click(0, 0); bot.button("Remove").click(); KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.RIGHT, Keystrokes.CR, Keystrokes.LF); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/ServerRuntimesPreferencesDialog.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/ServerRuntimesPreferencesDialog.java 2012-05-24 09:59:58 UTC (rev 41346) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/ServerRuntimesPreferencesDialog.java 2012-05-24 10:21:04 UTC (rev 41347) @@ -34,7 +34,8 @@ SWTBot bot = SWTBotFactory.getBot(); SWTBotTable table = bot.table(); - for (int i = 0; i < table.rowCount(); i++){ + int runtimesNumber = table.rowCount(); + for (int i = 0; i < runtimesNumber; i++){ table.click(0, 0); bot.button("Remove").click(); KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.RIGHT, Keystrokes.CR, Keystrokes.LF);

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41346 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2012-05-24 05:59:58 -0400 (Thu, 24 May 2012) New Revision: 41346 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java Log: https://issues.jboss.org/browse/JBIDE-11551 - correct the key if it is composed of multilple word separated by ?\226?\128?\152dot?\226?\128?\153(.) Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2012-05-24 09:35:39 UTC (rev 41345) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2012-05-24 09:59:58 UTC (rev 41346) @@ -153,8 +153,8 @@ @Override public boolean performFinish() { - String var = page1.getBundlePrefix(); - String key = page1.getKey(); + String bundlePrefix = page1.getBundlePrefix(); + String keyName = page1.getKey(); if (!page1.isDuplicatedKeyAndValue()) { IFile bundleFile = null; if (page1.isNewFile()) { @@ -194,7 +194,7 @@ * Register new resource bundle when new file is created. */ if (page1.isNewFile() && !page3.isUserDefined()) { - var = page3.getBundleName(); + bundlePrefix = page3.getBundleName(); IProject project = ExternalizeStringsUtils.getProject(editor); if (project != null) { String userDefinedPath = getUserDefinedPath().toString(); @@ -263,7 +263,7 @@ XModelObject application = facesConfig.getChildByPath("application"); //$NON-NLS-1$ XModelObject resourceBundle = facesConfig.getModel().createModelObject("JSFResourceBundle", null); //$NON-NLS-1$ resourceBundle.setAttributeValue("base-name", bundlePath); //$NON-NLS-1$ - resourceBundle.setAttributeValue("var", var); //$NON-NLS-1$ + resourceBundle.setAttributeValue("var", bundlePrefix); //$NON-NLS-1$ try { DefaultCreateHandler.addCreatedObject(application, resourceBundle, 0); } catch (XModelException e) { @@ -292,7 +292,7 @@ */ Element loadBundle = node.getOwnerDocument().createElement( jsfCoreTaglibPrefix + Constants.COLON + "loadBundle"); //$NON-NLS-1$ - loadBundle.setAttribute("var", var); //$NON-NLS-1$ + loadBundle.setAttribute("var", bundlePrefix); //$NON-NLS-1$ loadBundle.setAttribute("basename", bundlePath); //$NON-NLS-1$ Node elementToInsertBefore = null; Node refChild = null; @@ -316,7 +316,17 @@ /* * Replace text in the editor */ - String replacement = "#{" + var + Constants.DOT + key + "}"; //$NON-NLS-1$ //$NON-NLS-2$ + String replacement = null; + if (keyName.indexOf(Constants.DOT) > -1) { + /* + * https://issues.jboss.org/browse/JBIDE-11551 + * There is a dot(.) symbol in the key name. + * Use different bundle message format. + */ + replacement = "#{" + bundlePrefix + "['" + keyName + "']}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } else { + replacement = "#{" + bundlePrefix + Constants.DOT + keyName + "}"; //$NON-NLS-1$ //$NON-NLS-2$ + } page1.replaceText(replacement); return true; }

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41345 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original.

by jbosstools-commits＠lists.jboss.org

Author: jpeterka Date: 2012-05-24 05:35:39 -0400 (Thu, 24 May 2012) New Revision: 41345 Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram Log: Added test processes for jbpm3 ui bot convert test update Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn 2012-05-24 09:35:39 UTC (rev 41345) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_1ZcdAVmhEd2P9rCHPooJgA" iD="_1ZcdAFmhEd2P9rCHPooJgA"> + <pools xmi:type="bpmn:Pool" xmi:id="_1ZpRUVmhEd2P9rCHPooJgA" iD="_1ZpRUFmhEd2P9rCHPooJgA" name="Policy Pricing"> + <artifacts xmi:type="bpmn:DataObject" xmi:id="_fliSgVmmEd2P9rCHPooJgA" iD="_fliSgFmmEd2P9rCHPooJgA" name="Driver"> + <associations xmi:type="bpmn:Association" xmi:id="_iz_ykFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/> + </artifacts> + <artifacts xmi:type="bpmn:DataObject" xmi:id="_eFomAVmmEd2P9rCHPooJgA" iD="_eFomAFmmEd2P9rCHPooJgA" name="Policy"> + <associations xmi:type="bpmn:Association" xmi:id="_iAHekFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/> + </artifacts> + <vertices xmi:type="bpmn:Activity" xmi:id="_1ZpRU1mhEd2P9rCHPooJgA" iD="_1ZpRUlmhEd2P9rCHPooJgA" outgoingEdges="_W_ip4VmiEd2P9rCHPooJgA" incomingEdges="_WBEPcVmiEd2P9rCHPooJgA" name="Price Policy" lanes="_GO-2wVmiEd2P9rCHPooJgA" activityType="Task"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_A-sB0FmiEd2P9rCHPooJgA" iD="_A-rawFmiEd2P9rCHPooJgA" associations="_iAHekFmmEd2P9rCHPooJgA _iz_ykFmmEd2P9rCHPooJgA" outgoingEdges="_WBEPcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventStartMessage"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_OwuOUVmiEd2P9rCHPooJgA" iD="_OwuOUFmiEd2P9rCHPooJgA" outgoingEdges="_h4ty4VmiEd2P9rCHPooJgA _kUIscVmiEd2P9rCHPooJgA" incomingEdges="_W_ip4VmiEd2P9rCHPooJgA" name=" Price Calculated ?" lanes="_GO-2wVmiEd2P9rCHPooJgA _HHcIwVmiEd2P9rCHPooJgA" activityType="GatewayDataBasedExclusive"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_P2TWUVmiEd2P9rCHPooJgA" iD="_P2TWUFmiEd2P9rCHPooJgA" outgoingEdges="_lkjLcVmiEd2P9rCHPooJgA" incomingEdges="_kUIscVmiEd2P9rCHPooJgA" name="Review Pricing" lanes="_HHcIwVmiEd2P9rCHPooJgA"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_ZxYfYVmiEd2P9rCHPooJgA" iD="_ZxYfYFmiEd2P9rCHPooJgA" incomingEdges="_h4ty4VmiEd2P9rCHPooJgA _lkjLcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventEndEmpty"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_WBEPcVmiEd2P9rCHPooJgA" iD="_WBEPcFmiEd2P9rCHPooJgA" source="_A-sB0FmiEd2P9rCHPooJgA" target="_1ZpRU1mhEd2P9rCHPooJgA"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_W_ip4VmiEd2P9rCHPooJgA" iD="_W_ip4FmiEd2P9rCHPooJgA" source="_1ZpRU1mhEd2P9rCHPooJgA" target="_OwuOUVmiEd2P9rCHPooJgA"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_h4ty4VmiEd2P9rCHPooJgA" iD="_h4ty4FmiEd2P9rCHPooJgA" name="false" source="_OwuOUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_kUIscVmiEd2P9rCHPooJgA" iD="_kUIscFmiEd2P9rCHPooJgA" name="true" source="_OwuOUVmiEd2P9rCHPooJgA" target="_P2TWUVmiEd2P9rCHPooJgA"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_lkjLcVmiEd2P9rCHPooJgA" iD="_lkjLcFmiEd2P9rCHPooJgA" source="_P2TWUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/> + <lanes xmi:type="bpmn:Lane" xmi:id="_GO-2wVmiEd2P9rCHPooJgA" iD="_GO-2wFmiEd2P9rCHPooJgA" name="services-lane" activities="_1ZpRU1mhEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA _A-sB0FmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA"/> + <lanes xmi:type="bpmn:Lane" xmi:id="_HHcIwVmiEd2P9rCHPooJgA" iD="_HHcIwFmiEd2P9rCHPooJgA" name="loanprocessor" activities="_A-sB0FmiEd2P9rCHPooJgA _P2TWUVmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA"/> + </pools> +</bpmn:BpmnDiagram> Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram 2012-05-24 09:35:39 UTC (rev 41345) @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_1Ze5QFmhEd2P9rCHPooJgA" type="Bpmn" name="PolicyPricingProcess.bpmn_diagram" measurementUnit="Pixel"> + <children xmi:type="notation:Node" xmi:id="_1ZqfcFmhEd2P9rCHPooJgA" type="1001"> + <children xmi:type="notation:Node" xmi:id="_1ZrGgFmhEd2P9rCHPooJgA" type="4008"/> + <children xmi:type="notation:Node" xmi:id="_1ZrtkFmhEd2P9rCHPooJgA" type="5001"> + <children xmi:type="notation:Node" xmi:id="_1Zs7sFmhEd2P9rCHPooJgA" type="2001"> + <children xmi:type="notation:Node" xmi:id="_1Zs7tlmhEd2P9rCHPooJgA" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_1Zs7sVmhEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Zs7slmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_1Zs7s1mhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_1Zs7tFmhEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_1ZpRU1mhEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZtiwFmhEd2P9rCHPooJgA" x="144" width="133" height="61"/> + </children> + <children xmi:type="notation:Node" xmi:id="_A-so4FmiEd2P9rCHPooJgA" type="2001"> + <children xmi:type="notation:Node" xmi:id="_A-tP8FmiEd2P9rCHPooJgA" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_A-so4VmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_A-so4lmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_A-so41miEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_A-so5FmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_A-sB0FmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A-so5VmiEd2P9rCHPooJgA" x="16" y="80"/> + </children> + <children xmi:type="notation:Node" xmi:id="_GPAr8FmiEd2P9rCHPooJgA" type="2007"> + <children xmi:type="notation:Node" xmi:id="_GPBTAFmiEd2P9rCHPooJgA" type="4007"/> + <styles xmi:type="notation:FontStyle" xmi:id="_GPAr8VmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_GPAr8lmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_GPAr81miEd2P9rCHPooJgA" fillColor="16771304"/> + <styles xmi:type="notation:LineStyle" xmi:id="_GPAr9FmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_GO-2wVmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GPAr9VmiEd2P9rCHPooJgA" y="5" height="89"/> + </children> + <children xmi:type="notation:Node" xmi:id="_HHdW4FmiEd2P9rCHPooJgA" type="2007"> + <children xmi:type="notation:Node" xmi:id="_HHdW5lmiEd2P9rCHPooJgA" type="4007"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HHdW4VmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_HHdW4lmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_HHdW41miEd2P9rCHPooJgA" fillColor="16771304"/> + <styles xmi:type="notation:LineStyle" xmi:id="_HHdW5FmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_HHcIwVmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHdW5VmiEd2P9rCHPooJgA" y="96" height="103"/> + </children> + <children xmi:type="notation:Node" xmi:id="_OwvccFmiEd2P9rCHPooJgA" type="2001"> + <children xmi:type="notation:Node" xmi:id="_OwwDgFmiEd2P9rCHPooJgA" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_OwvccVmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_OwvcclmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_Owvcc1miEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_OwvcdFmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_OwuOUVmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OwvcdVmiEd2P9rCHPooJgA" x="373" y="16"/> + </children> + <children xmi:type="notation:Node" xmi:id="_P2UkcFmiEd2P9rCHPooJgA" type="2001"> + <children xmi:type="notation:Node" xmi:id="_P2VLgFmiEd2P9rCHPooJgA" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_P2UkcVmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_P2UkclmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_P2Ukc1miEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_P2UkdFmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_P2TWUVmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P2UkdVmiEd2P9rCHPooJgA" x="555" y="141"/> + </children> + <children xmi:type="notation:Node" xmi:id="_ZxZtgFmiEd2P9rCHPooJgA" type="2001"> + <children xmi:type="notation:Node" xmi:id="_ZxaUlFmiEd2P9rCHPooJgA" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_ZxZtgVmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_ZxaUkFmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_ZxaUkVmiEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_ZxaUklmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_ZxYfYVmiEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxaUk1miEd2P9rCHPooJgA" x="832" y="80"/> + </children> + <children xmi:type="notation:Node" xmi:id="_fli5kFmmEd2P9rCHPooJgA" type="1003"> + <children xmi:type="notation:Node" xmi:id="_fljgoFmmEd2P9rCHPooJgA" type="4010"/> + <styles xmi:type="notation:FontStyle" xmi:id="_fli5kVmmEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_fli5klmmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_fli5k1mmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_fli5lFmmEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_fliSgVmmEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fli5lVmmEd2P9rCHPooJgA" x="160" y="144"/> + </children> + <children xmi:type="notation:Node" xmi:id="_eFp0IFmmEd2P9rCHPooJgA" type="1003"> + <children xmi:type="notation:Node" xmi:id="_eFp0JlmmEd2P9rCHPooJgA" type="4010"/> + <styles xmi:type="notation:FontStyle" xmi:id="_eFp0IVmmEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_eFp0IlmmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_eFp0I1mmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:LineStyle" xmi:id="_eFp0JFmmEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_eFomAVmmEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eFp0JVmmEd2P9rCHPooJgA" x="64" y="144"/> + </children> + <styles xmi:type="notation:DrawerStyle" xmi:id="_1ZrtkVmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_1ZrtklmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zrtk1mhEd2P9rCHPooJgA"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_1ZqfcVmhEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_1ZqfclmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FillStyle" xmi:id="_1Zqfc1mhEd2P9rCHPooJgA" fillColor="16771304"/> + <styles xmi:type="notation:LineStyle" xmi:id="_1ZqfdFmhEd2P9rCHPooJgA" lineColor="11119017"/> + <element xmi:type="bpmn:Pool" href="PolicyPricingProcess.bpmn#_1ZpRUVmhEd2P9rCHPooJgA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZrtlFmhEd2P9rCHPooJgA" x="16" y="32" width="1500" height="214"/> + </children> + <styles xmi:type="notation:PageStyle" xmi:id="_1Ze5QVmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:GuideStyle" xmi:id="_1Ze5QlmhEd2P9rCHPooJgA"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Ze5Q1mhEd2P9rCHPooJgA"/> + <element xmi:type="bpmn:BpmnDiagram" href="PolicyPricingProcess.bpmn#_1ZcdAVmhEd2P9rCHPooJgA"/> + <edges xmi:type="notation:Edge" xmi:id="_WBGEoFmiEd2P9rCHPooJgA" type="3001" source="_A-so4FmiEd2P9rCHPooJgA" target="_1Zs7sFmhEd2P9rCHPooJgA"> + <children xmi:type="notation:Node" xmi:id="_WBHSwFmiEd2P9rCHPooJgA" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_WBHSwVmiEd2P9rCHPooJgA" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_WBHSwlmiEd2P9rCHPooJgA" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_WBHSw1miEd2P9rCHPooJgA" y="-10"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_WBGEoVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_WBGEolmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_WBGEo1miEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_WBEPcVmiEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WBGEpFmiEd2P9rCHPooJgA" points="[15, -6, -162, 45]$[113, -50, -64, 1]"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_W_kfEFmiEd2P9rCHPooJgA" type="3001" source="_1Zs7sFmhEd2P9rCHPooJgA" target="_OwvccFmiEd2P9rCHPooJgA"> + <children xmi:type="notation:Node" xmi:id="_W_kfFVmiEd2P9rCHPooJgA" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_W_kfFlmiEd2P9rCHPooJgA" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_W_kfF1miEd2P9rCHPooJgA" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_W_kfGFmiEd2P9rCHPooJgA" y="-10"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_W_kfEVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_W_kfElmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_W_kfE1miEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_W_ip4VmiEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W_kfFFmiEd2P9rCHPooJgA" points="[65, -4, -136, -1]$[185, -13, -16, -10]"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_h4uZ8FmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA"> + <children xmi:type="notation:Node" xmi:id="_h4vBBFmiEd2P9rCHPooJgA" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_h4vBBVmiEd2P9rCHPooJgA" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_h4vBBlmiEd2P9rCHPooJgA" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_h4vBB1miEd2P9rCHPooJgA" y="-10"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_h4vBAFmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_h4vBAVmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_h4vBAlmiEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_h4ty4VmiEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h4vBA1miEd2P9rCHPooJgA" points="[0, 1, -397, -70]$[397, 36, 0, -35]$[397, 71, 0, 0]"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_kUJ6kFmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_P2UkcFmiEd2P9rCHPooJgA"> + <children xmi:type="notation:Node" xmi:id="_kUKhoFmiEd2P9rCHPooJgA" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_kUKhoVmiEd2P9rCHPooJgA" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_kUKholmiEd2P9rCHPooJgA" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_kUKho1miEd2P9rCHPooJgA" y="-10"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_kUJ6kVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_kUJ6klmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_kUJ6k1miEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_kUIscVmiEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kUJ6lFmiEd2P9rCHPooJgA" points="[13, 11, -186, -101]$[165, 141, -34, 29]"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_lklnsFmiEd2P9rCHPooJgA" type="3001" source="_P2UkcFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA"> + <children xmi:type="notation:Node" xmi:id="_lklntVmiEd2P9rCHPooJgA" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_lklntlmiEd2P9rCHPooJgA" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_lklnt1miEd2P9rCHPooJgA" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_lklnuFmiEd2P9rCHPooJgA" y="-10"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_lklnsVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_lklnslmiEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_lklns1miEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_lkjLcVmiEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lklntFmiEd2P9rCHPooJgA" points="[54, -11, -185, 47]$[254, -43, 15, 15]"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_iAIFoFmmEd2P9rCHPooJgA" type="3003" source="_eFp0IFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA"> + <styles xmi:type="notation:RoutingStyle" xmi:id="_iAIFoVmmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_iAIFolmmEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_iAIFo1mmEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iAHekFmmEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iAIFpFmmEd2P9rCHPooJgA" points="[-9, -6, 39, 32]$[-63, -40, -15, -2]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iAJ60FmmEd2P9rCHPooJgA" id="(0.25,0.175)"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_i0AZoFmmEd2P9rCHPooJgA" type="3003" source="_fli5kFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA"> + <styles xmi:type="notation:RoutingStyle" xmi:id="_i0AZoVmmEd2P9rCHPooJgA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_i0AZolmmEd2P9rCHPooJgA" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_i0AZo1mmEd2P9rCHPooJgA" lineColor="0"/> + <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iz_ykFmmEd2P9rCHPooJgA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i0AZpFmmEd2P9rCHPooJgA" points="[-12, -3, 160, 36]$[-187, -27, -15, 12]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i0C14FmmEd2P9rCHPooJgA" id="(0.325,0.15)"/> + </edges> +</notation:Diagram>

12 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2012