Author: max.andersen(a)jboss.com Date: 2012-04-26 06:12:40 -0400 (Thu, 26 Apr 2012) New Revision: 40514 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.properties trunk/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 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/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: JBIDE-11475 remove mention of Express in UI and tests 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-04-26 10:10:09 UTC (rev 40513) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -51,8 +51,8 @@ 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()); + assertTrue("New OpenShift Application window should have appeared", bot.activeShell().getText().equals(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD)); + //assertTrue("New OpenShift Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive()); bot.activeShell().close(); //check Project example and detection of server Modified: trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.properties =================================================================== --- trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.properties 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.properties 2012-04-26 10:12:40 UTC (rev 40514) @@ -15,13 +15,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=JBoss OpenShift Express EGit Utils Test +featureName=JBoss OpenShift EGit Utils Test # "providerName" property - name of the company that provides the feature providerName=JBoss by Red Hat # "description" property - description of the feature -description=Tests for EGit utils that deal with OpenShift Express git operations. +description=Tests for EGit utils that deal with OpenShift git operations. # "copyright" property - text of the "Feature Update Copyright" copyright=Copyright (c) 2008-2012 Red Hat, Inc. and others.\n\ Modified: trunk/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.properties =================================================================== --- trunk/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.properties 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/features/org.jboss.tools.openshift.express.test.feature/feature.properties 2012-04-26 10:12:40 UTC (rev 40514) @@ -15,13 +15,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=JBoss OpenShift Express Tools Test +featureName=JBoss OpenShift Tools Test # "providerName" property - name of the company that provides the feature providerName=JBoss by Red Hat # "description" property - description of the feature -description=Tests for Tooling to deal with OpenShift Express. It will allow you to sign into your OpenShift Express account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the OpenShift Express PaaS platform.. +description=Tests for Tooling to deal with OpenShift. It will allow you to sign into your OpenShift account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the OpenShift PaaS platform.. # "copyright" property - text of the "Feature Update Copyright" copyright=Copyright (c) 2008-2012 Red Hat, Inc. and others.\n\ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties 2012-04-26 10:12:40 UTC (rev 40514) @@ -3,6 +3,6 @@ providerName=JBoss Community # Version Delegates -openshift.express.name=OpenShift Express Server -openshift.express.description=A server adapter for use interfacing with the OpenShift Express Framework -openshift.express.runtime.name = OpenShift Express Runtime +openshift.express.name=OpenShift Server +openshift.express.description=A server adapter for use with OpenShift Applications +openshift.express.runtime.name = OpenShift Server Runtime Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties 2012-04-26 10:12:40 UTC (rev 40514) @@ -2,7 +2,7 @@ requestCommitAndPushMsg=There are {0} local changes in "{1}". Do you want to publish to OpenShift by commiting the changes and pushing its Git repository? requestPushTitle=Publish {0}? requestPushMsg=The are no local changes in "{0}". Do you want to publish to OpenShift by pushing its Git repository? -cannotModifyModules=Openshift Express servers cannot be modified. +cannotModifyModules=OpenShift servers cannot be modified. additionNotRequiredModule=This server requires the {0} application. shareProjectTitle=Share projects? shareProjectMessage="There are {0} projects that are not connected to any git repository. Would you like to share them now? Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -486,7 +486,7 @@ } else if( appList == null ) { error = "Please click \"verify\" to test your credentials."; } else if( fdomain == null ) { - error = "Your OpenShift Express account has not been configured with a domain."; + error = "Your OpenShift account has not been configured with a domain."; } else if( app == null || app.equals("")) { error = "Please select an application from the combo below."; } else { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -65,7 +65,7 @@ FormToolkit toolkit = new FormToolkit(parent.getDisplay()); Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR); - section.setText("Openshift Express Server"); + section.setText("Openshift Server"); section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL| GridData.GRAB_VERTICAL)); Composite c = new Composite(section, SWT.NONE); c.setLayout(new GridLayout(2,true)); 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-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -115,9 +115,9 @@ try { return getChildrenForElement(parentElement, recurse); } catch (OpenShiftException e) { - Logger.error("Unable to retrieve OpenShift Express information", e); + Logger.error("Unable to retrieve OpenShift information", e); } catch (SocketTimeoutException e) { - Logger.error("Unable to retrieve OpenShift Express information", e); + Logger.error("Unable to retrieve OpenShift information", e); } return new Object[0]; } @@ -142,17 +142,17 @@ getChildrenFor(children); } // } catch (OpenShiftException e) { -// Logger.error("Unable to retrieve OpenShift Express information", e); +// Logger.error("Unable to retrieve OpenShift information", e); // } return children; } private void launchLoadingUserJob(final UserDelegate user) { - Job job = new Job("Loading OpenShift Express User information...") { + Job job = new Job("Loading OpenShift User information...") { @Override protected IStatus run(IProgressMonitor monitor) { - monitor.beginTask("Loading OpenShift Express information...", IProgressMonitor.UNKNOWN); + monitor.beginTask("Loading OpenShift information...", IProgressMonitor.UNKNOWN); monitor.worked(1); // Get the actual children, with the delay loadingUsers.add(user); 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-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -116,7 +116,7 @@ public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) { super("Setup OpenShift Application", - "Enter a name and select a type for your new OpenShift Express application.", + "Enter a name and select a type for your new OpenShift application.", "Setup OpenShift Application", wizard); try { this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -62,7 +62,7 @@ private Text passwordText = null; public CredentialsWizardPage(IWizard wizard, IUserAwareModel wizardModel) { - super("Sign in to OpenShift", "Please provide your OpenShift Express credentials.", "Server Connection", + super("Sign in to OpenShift", "Please provide your OpenShift credentials.", "Server Connection", wizard); this.pageModel = new CredentialsWizardPageModel(wizardModel); } @@ -71,7 +71,7 @@ GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(container); Link signupLink = new Link(container, SWT.WRAP); - signupLink.setText("If you do not have an account on OpenShift Express, please sign up <a>here</a>."); + signupLink.setText("If you do not have an account on OpenShift, please sign up <a>here</a>."); GridDataFactory.fillDefaults() .align(SWT.LEFT, SWT.CENTER).span(2, 1).applyTo(signupLink); signupLink.addSelectionListener(onSignupLinkClicked()); @@ -210,7 +210,7 @@ && !StringUtils.isEmpty(passwordValue)) { return ValidationStatus.ok(); } - return ValidationStatus.cancel("Please provide your OpenShift Express user credentials"); + return ValidationStatus.cancel("Please provide your OpenShift user credentials"); } } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -53,7 +53,7 @@ log.info("OpenShift SWTBot Tests: Domain created."); log.info("OpenShift SWTBot Tests: Waiting for 'New Application wizard'."); - bot.waitForShell("New OpenShift Express Application", 100); + bot.waitForShell("New OpenShift Application", 100); log.info("OpenShift SWTBot Tests: 'New Application wizard' created."); Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -17,7 +17,7 @@ /** * <b>OpenShift SWTBot TestSuite</b> * <br> - * This bot test will try to demonstrate a new OpenShift Express Application and domain life cycle. + * This bot test will try to demonstrate a new OpenShift Application and domain life cycle. * * <br> * TestSuite covers following test cases : @@ -27,7 +27,7 @@ * <li>JBDS50_XXXX Domain is created, renamed correctly</li> * <li>JBDS50_XXXX App with JBossAS7 cartridge is created correctly via * OpenShift wizards</li> - * <li>JBDS50_XXXX Embed jenkins etc. into OpenShift Express applications</li> + * <li>JBDS50_XXXX Embed jenkins etc. into OpenShift applications</li> * <li>JBDS50_XXXX App with JBossAS7 cartridge can be deleted</li> * <li>JBDS50_XXXX JBoss server adapter is created successfully</li> * <li>JBDS50_XXXX App with JBossAS7 cartridge can be modified and republished</li> Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -32,7 +32,7 @@ @Test public void canValidateCredentials() throws InterruptedException { - // create new OpenShift Express Application + // create new OpenShift Application SWTBot wiz = open.newObject(OpenShiftUI.NewApplication.iNewObject); storePasswordThenForward(); Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -13,7 +13,7 @@ /** * - * Destroys registered domain on OpenShift Express + * Destroys registered domain on OpenShift * * @param domain * @param login Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -25,7 +25,7 @@ public static final IView iView = new IView() { @Override public String getName() { - return "OpenShift Express Console"; + return "OpenShift Explorer"; } @Override @@ -39,7 +39,7 @@ /** * - * Class representing "navigation" to new OpenShift Express Application + * Class representing "navigation" to new OpenShift Application * */ public static class NewApplication { Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-26 10:10:09 UTC (rev 40513) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-26 10:12:40 UTC (rev 40514) @@ -839,7 +839,7 @@ public static final String NEW_DYNAMIC_WEB_PROJECT = "New Dynamic Web Project"; public static final String PROJECT_EXAMPLE = "New Project Example"; public static final String NEW_JBOSS_PROJECT = "New JBoss Project"; - public static final String OPENSHIFT_APP_WIZARD = "New OpenShift Express Application"; + public static final String OPENSHIFT_APP_WIZARD = "New OpenShift Application"; } public static class NewViewDialog{