Author: xcoulon Date: 2012-04-19 17:40:04 -0400 (Thu, 19 Apr 2012) New Revision: 40359 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/jboss-dmr-1.0.0.Final.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/log4j-1.2.16.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT-sources.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-api-1.6.1.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-log4j12-1.6.1.jar Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.1-SNAPSHOT.jar Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 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/IPasswordPrompter.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/console/UserModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.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/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.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/EditCartridgesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 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/console/TailServerLogAction.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/viewer/OpenShiftExpressConsoleLabelProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.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/ApplicationDetailsContentProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.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/ApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.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/EmbedCartridgeWizard.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/GitCloningSettingsWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.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 trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java Log: In progress - https://issues.jboss.org/browse/JBIDE-11400 Migrate current openshift plugins to the new RESTful client library Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-04-19 21:40:04 UTC (rev 40359) @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="openshift-java-client-1.2.1-SNAPSHOT.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry exported="true" kind="lib" path="openshift-java-client-2.0.0-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="jboss-dmr-1.0.0.Final.jar"/> + <classpathentry kind="lib" path="log4j-1.2.16.jar"/> + <classpathentry kind="lib" path="slf4j-api-1.6.1.jar"/> + <classpathentry kind="lib" path="slf4j-log4j12-1.6.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-04-19 21:40:04 UTC (rev 40359) @@ -6,9 +6,13 @@ Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - openshift-java-client-1.2.1-SNAPSHOT.jar -Export-Package: com.openshift.express.client, - com.openshift.express.client.configuration, - com.openshift.express.client.utils + openshift-java-client-2.0.0-SNAPSHOT.jar, + jboss-dmr-1.0.0.Final.jar, + log4j-1.2.16.jar, + slf4j-api-1.6.1.jar, + slf4j-log4j12-1.6.1.jar +Export-Package: com.openshift.client, + com.openshift.client.configuration, + com.openshift.client.utils Require-Bundle: com.jcraft.jsch;bundle-version="0.1.44" Import-Package: org.jboss.dmr Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-04-19 21:40:04 UTC (rev 40359) @@ -2,4 +2,8 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - openshift-java-client-1.2.1-SNAPSHOT.jar + openshift-java-client-2.0.0-SNAPSHOT.jar,\ + slf4j-api-1.6.1.jar,\ + slf4j-log4j12-1.6.1.jar,\ + log4j-1.2.16.jar,\ + jboss-dmr-1.0.0.Final.jar Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/jboss-dmr-1.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/jboss-dmr-1.0.0.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/log4j-1.2.16.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/log4j-1.2.16.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.1-SNAPSHOT.jar =================================================================== (Binary files differ) Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-api-1.6.1.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-api-1.6.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-log4j12-1.6.1.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/slf4j-log4j12-1.6.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -16,8 +16,8 @@ import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; public class ExpressServerExtendedProperties extends ServerExtendedProperties { @@ -32,15 +32,9 @@ if (!ExpressServerUtils.isOpenShiftRuntime(server)) { return null; } - IApplication application = ExpressServerUtils.findApplicationForServer(server); + final IApplication application = ExpressServerUtils.findApplicationForServer(server); if (application != null) { - try { - return application.getApplicationUrl(); - } catch (OpenShiftException e) { - IStatus status = OpenShiftUIActivator.createErrorStatus( - NLS.bind("Could not get application url for server {0}", server.getName()), e); - OpenShiftUIActivator.log(status); - } + return application.getApplicationUrl(); } return null; } 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ *******************************************************************************/ 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; @@ -40,10 +41,9 @@ import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IDomain; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.IDomain; +import com.openshift.client.OpenShiftException; /** * This class holds the attribute names whose values will be @@ -52,6 +52,7 @@ * * @author Rob Stryker */ +@SuppressWarnings("restriction") public class ExpressServerUtils { public static final String ATTRIBUTE_EXPRESS_MODE = "org.jboss.tools.openshift.express.internal.core.behaviour.ExpressMode"; public static final String EXPRESS_BINARY_MODE = "publishBinary"; @@ -76,6 +77,7 @@ /* For use inside express wizard fragment */ public static final String TASK_WIZARD_ATTR_USER = "user"; + public static final String TASK_WIZARD_ATTR_DOMAIN = "domain"; public static final String TASK_WIZARD_ATTR_APP_LIST = "appList"; public static final String TASK_WIZARD_ATTR_SELECTED_APP = "application"; @@ -164,13 +166,14 @@ return wc.save(false, new NullProgressMonitor()); } + /* public static IServer fillServerWithOpenShiftDetails(IServer server, IApplication application, IUser user, String deployProject, String projectRelativeFolder, String mode, String remoteName) throws CoreException, OpenShiftException { return fillServerWithOpenShiftDetails(server, application.getApplicationUrl(), user.getRhlogin(), user.getPassword(), user.getDomain().getNamespace(), application.getName(), application.getUUID(), deployProject, projectRelativeFolder, mode, remoteName); - } + }*/ public static void fillServerWithOpenShiftDetails(IServerWorkingCopy wc, IApplication application, UserDelegate user, IDomain domain, String mode, String deployProject, @@ -178,7 +181,7 @@ fillServerWithOpenShiftDetails(wc, application == null ? null : application.getApplicationUrl(), user == null ? null : user.getRhlogin(), - domain == null ? null : domain.getNamespace(), + domain == null ? null : domain.getId(), application == null ? null : application.getName(), application == null ? null : application.getUUID(), deployProject, projectRelativeFolder, mode, remoteName); @@ -286,7 +289,7 @@ Iterator<IApplication> i = applications.iterator(); while(i.hasNext()) { IApplication a = i.next(); - String gitUri = a.getGitUri(); + String gitUri = a.getGitUrl(); Iterator<URIish> j = uris.iterator(); while(j.hasNext()) { String projUri = j.next().toPrivateString(); @@ -298,18 +301,12 @@ return null; } - public static IProject[] findProjectsForApplication(IApplication application) { - ArrayList<IProject> results = new ArrayList<IProject>(); + public static IProject[] findProjectsForApplication(final IApplication application) { + final ArrayList<IProject> results = new ArrayList<IProject>(); if( application ==null ) return null; - String gitUri = null; - try { - gitUri = application.getGitUri(); - } catch(OpenShiftException ose) { - return null; - } - - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + final String gitUri = application.getGitUrl(); + final IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); for( int i = 0; i < projects.length; i++ ) { List<URIish> uris = null; try { @@ -350,6 +347,9 @@ } 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/IPasswordPrompter.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IPasswordPrompter.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IPasswordPrompter.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -12,7 +12,7 @@ import java.util.Map; -import com.openshift.express.client.IUser; +import com.openshift.client.IUser; @Deprecated public interface IPasswordPrompter { 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.console; +import java.net.SocketTimeoutException; import java.util.List; import org.eclipse.jface.window.Window; @@ -22,13 +23,13 @@ import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IDomain; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.ISSHPublicKey; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.EnumApplicationScale; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IDomain; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IUser; +import com.openshift.client.OpenShiftException; public class UserDelegate { private IUser delegate; @@ -54,7 +55,7 @@ */ protected final void setDelegate(IUser delegate) { this.delegate = delegate; - } + } public String getRhlogin() { return delegate.getRhlogin(); @@ -111,115 +112,106 @@ return (delegate.getPassword() != null && !"".equals(delegate.getPassword())); } - public IApplication createApplication(String arg0, ICartridge arg1) - throws OpenShiftException { + public IApplication createApplication(String applicationName, ICartridge applicationType) + throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.createApplication(arg0, arg1); + return delegate.getDefaultDomain().createApplication(applicationName, applicationType, EnumApplicationScale.DEFAULT, null); } return null; } - public IDomain createDomain(String arg0, ISSHPublicKey arg1) - throws OpenShiftException { + /** + * Create a new domain with the given id + * @param id the domain id + * @return the created domain + * @throws OpenShiftException + * @throws SocketTimeoutException + */ + public IDomain createDomain(String id) + throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.createDomain(arg0, arg1); + return delegate.createDomain(id); } return null; } public IApplication getApplicationByName(String arg0) - throws OpenShiftException { - if(checkForPassword()) { - return delegate.getApplicationByName(arg0); + throws OpenShiftException, SocketTimeoutException { + if(checkForPassword() && delegate.hasDomain()) { + return delegate.getDefaultDomain().getApplicationByName(arg0); } return null; } - public List<IApplication> getApplications() throws OpenShiftException { + public List<IApplication> getApplications() throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.getApplications(); + return delegate.getDefaultDomain().getApplications(); } return null; } - public List<IApplication> getApplicationsByCartridge(ICartridge arg0) - throws OpenShiftException { - if(checkForPassword()) { - return delegate.getApplicationsByCartridge(arg0); - } - return null; - } + public String getAuthIV() { if(checkForPassword()) { return delegate.getAuthIV(); } return null; } + public String getAuthKey() { if(checkForPassword()) { return delegate.getAuthKey(); } return null; } - public ICartridge getCartridgeByName(String arg0) throws OpenShiftException { + + public List<ICartridge> getStandaloneCartridgeNames() throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.getCartridgeByName(arg0); + return delegate.getConnection().getStandaloneCartridges(); } return null; } - public List<ICartridge> getCartridges() throws OpenShiftException { + + public IDomain getDefaultDomain() throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.getCartridges(); + return delegate.getDefaultDomain(); } return null; } - public IDomain getDomain() throws OpenShiftException { - if(checkForPassword()) { - return delegate.getDomain(); - } - return null; - } + public List<IEmbeddableCartridge> getEmbeddableCartridges() - throws OpenShiftException { + throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.getEmbeddableCartridges(); + return delegate.getConnection().getEmbeddableCartridges(); } return null; } - public ISSHPublicKey getSshKey() throws OpenShiftException { + + public boolean hasApplication(String name) throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { - return delegate.getSshKey(); + return delegate.getDefaultDomain().hasApplicationByName(name); } - return null; - } - public String getUUID() throws OpenShiftException { - if(checkForPassword()) { - return delegate.getUUID(); - } - return null; - } - public boolean hasApplication(String arg0) throws OpenShiftException { - if(checkForPassword()) { - return delegate.hasApplication(arg0); - } return false; } - public boolean hasApplication(ICartridge arg0) throws OpenShiftException { - if(checkForPassword()) { - return delegate.hasApplication(arg0); + + public boolean hasApplicationOfType(ICartridge type) throws OpenShiftException, SocketTimeoutException { + if(hasDomain()) { + return delegate.getDefaultDomain().hasApplicationByCartridge(type); } return false; } - public boolean hasDomain() throws OpenShiftException { + + public boolean hasDomain() throws OpenShiftException, SocketTimeoutException { if(checkForPassword()) { return delegate.hasDomain(); } return false; - } + public boolean isValid() throws OpenShiftException { if(checkForPassword()) { - return delegate.isValid(); + return true;//delegate.isValid(); } return false; } + public void refresh() throws OpenShiftException { if(checkForPassword()) { delegate.refresh(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -26,10 +26,10 @@ import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStore; import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStoreException; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; -import com.openshift.express.client.User; -import com.openshift.express.client.configuration.OpenShiftConfiguration; +import com.openshift.client.IUser; +import com.openshift.client.OpenShiftConnectionFactory; +import com.openshift.client.OpenShiftException; +import com.openshift.client.configuration.OpenShiftConfiguration; public class UserModel { private static final String USER_ID = OpenShiftUIActivator.PLUGIN_ID + " " + @@ -69,7 +69,7 @@ * @throws IOException */ public IUser createUser(String username, String password) throws OpenShiftException, IOException { - return new User(username, password, USER_ID); + return new OpenShiftConnectionFactory().getConnection(USER_ID, username, password).getUser(); } private static final int ADDED = 0; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author Andre Dietisheim 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,8 @@ ******************************************************************************/ 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; @@ -21,8 +23,7 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.EditDomainDialog; import org.jboss.tools.openshift.express.internal.ui.wizard.NewDomainDialog; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -42,7 +43,7 @@ IWizard domainDialog = null; final UserDelegate user = (UserDelegate) treeSelection.getFirstElement(); try { - if (user.getDomain() == null || user.getDomain().getNamespace() == null) { + if (user.getDefaultDomain() == null || user.getDefaultDomain().getId() == null) { domainDialog = new NewDomainDialog(user); } else { domainDialog = new EditDomainDialog(user); @@ -51,6 +52,10 @@ Logger.warn("Failed to retrieve User domain, prompting for creation", e); // let's use the domain creation wizard, then. domainDialog = 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. + domainDialog = new NewDomainDialog(user); } WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), domainDialog); dialog.create(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; +import java.net.SocketTimeoutException; import java.util.List; import org.eclipse.core.runtime.Assert; @@ -33,8 +34,10 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; +import com.openshift.client.IApplication; +import com.openshift.client.IDomain; +import com.openshift.client.IUser; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -50,18 +53,26 @@ @Override public void run() { - final ITreeSelection treeSelection = (ITreeSelection) selection; - if (selection instanceof ITreeSelection - && treeSelection.getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) treeSelection.getFirstElement(); - IUser user = application.getUser(); - Assert.isNotNull(user, NLS.bind("application {0} does not reference any user", application.getName())); - UserDelegate userDelegate = UserModel.getDefault().findUser(user.getRhlogin()); - NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE); - w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, userDelegate); - w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w); - dialog.open(); + try { + final ITreeSelection treeSelection = (ITreeSelection) selection; + if (selection instanceof ITreeSelection + && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + final IDomain domain = application.getDomain(); + final IUser user = domain.getUser(); + Assert.isNotNull(user, NLS.bind("application {0} does not reference any user", application.getName())); + UserDelegate userDelegate = UserModel.getDefault().findUser(user.getRhlogin()); + NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE); + w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, userDelegate); + w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_DOMAIN, domain); + w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w); + dialog.open(); + } + } catch (SocketTimeoutException e) { + OpenShiftUIActivator.log("Could not create OpenShift server", e); + } catch (OpenShiftException e) { + OpenShiftUIActivator.log("Could not create OpenShift server", e); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -27,8 +28,8 @@ import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -90,6 +91,9 @@ } catch (OpenShiftException e) { MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage()); Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e); + } catch (SocketTimeoutException e) { + MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage()); + Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e); } } } finally { 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,8 @@ ******************************************************************************/ 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; @@ -25,8 +27,8 @@ import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IDomain; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IDomain; +import com.openshift.client.OpenShiftException; public class DeleteDomainAction extends AbstractAction { @@ -45,7 +47,7 @@ UserDelegate user = (UserDelegate) ((IStructuredSelection) selection) .getFirstElement(); try { - IDomain domain = user.getDomain(); + IDomain domain = user.getDefaultDomain(); if (domain != null && user.getApplications().size() == 0) { enable = true; @@ -54,6 +56,10 @@ 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); } } setEnabled(enable); @@ -66,14 +72,14 @@ && treeSelection.getFirstElement() instanceof UserDelegate) { UserDelegate user = (UserDelegate) treeSelection.getFirstElement(); try { - final IDomain domain = user.getDomain(); + final IDomain domain = user.getDefaultDomain(); if (domain != null) { boolean confirm = false; confirm = MessageDialog.openConfirm(Display.getCurrent() .getActiveShell(), "Domain deletion", NLS.bind( "You are about to delete the \"{0}\" domain.\n" + "Do you want to continue?", - domain.getNamespace())); + domain.getId())); if (confirm) { Job job = new Job("Deleting OpenShift Domain...") { @Override @@ -82,11 +88,9 @@ try { domain.destroy(); } catch (OpenShiftException e) { - Logger.error( - NLS.bind( - "Failed to delete domain \"{0}\"", - domain.getNamespace()), - e); + Logger.error(NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e); + } catch (SocketTimeoutException e) { + Logger.error(NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e); } } finally { monitor.done(); @@ -104,6 +108,10 @@ 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); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -20,7 +20,7 @@ import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; -import com.openshift.express.client.IApplication; +import com.openshift.client.IApplication; /** * @author Xavier Coulon Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -22,7 +22,7 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; -import com.openshift.express.client.IApplication; +import com.openshift.client.IApplication; /** * @author Xavier Coulon Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -14,10 +14,8 @@ import org.jboss.tools.common.ui.BrowserUtil; 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.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; /** * @author Xavier Coulon @@ -37,15 +35,11 @@ public void run() { if (selection != null && selection instanceof ITreeSelection && ((ITreeSelection) selection).getFirstElement() instanceof IApplication) { - try { - final IApplication application = (IApplication) ((ITreeSelection) selection).getFirstElement(); - final String appName = application.getName(); - final String appUrl = application.getApplicationUrl(); - BrowserUtil.checkedCreateInternalBrowser(appUrl, appName, - OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); - } catch (OpenShiftException e) { - Logger.error("Failed to open OpenShift Application in a browser", e); - } + final IApplication application = (IApplication) ((ITreeSelection) selection).getFirstElement(); + final String appName = application.getName(); + final String appUrl = application.getApplicationUrl(); + BrowserUtil.checkedCreateInternalBrowser(appUrl, appName, + OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); } } 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-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ *******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.behaviour; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -68,10 +69,10 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IDomain; -import com.openshift.express.client.NotFoundOpenShiftException; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.IDomain; +import com.openshift.client.NotFoundOpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author Rob Stryker @@ -156,6 +157,8 @@ showImportLink = p == null || p.length == 0; } catch( OpenShiftException ose ) { // ignore, allow appList and appListNames to be null / empty + } catch( SocketTimeoutException ste) { + // ignore, allow appList and appListNames to be null / empty } } else { // we may or may not have a user, clearly no app @@ -517,20 +520,21 @@ } catch(NotFoundOpenShiftException nose) { // Ignore this. It will be handled later } catch(OpenShiftException ose) { + } catch(SocketTimeoutException ose) { } } } }; } - private void updateModelForNewUser(UserDelegate user) throws OpenShiftException { + private void updateModelForNewUser(UserDelegate user) throws OpenShiftException, SocketTimeoutException { // Updating the model, some long-running projectsPerApp.clear(); try { // IF we load the applications first, domain gets loaded automatically this.appList = user.getApplications(); - fdomain = user.getDomain(); + fdomain = user.getDefaultDomain(); } catch(NotFoundOpenShiftException nfose) { // Credentials work, but no domain, so no applications either this.appList = new ArrayList<IApplication>(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -34,9 +34,9 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; -import com.openshift.express.client.utils.Base64Encoder; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; +import com.openshift.client.utils.Base64Coder; /** * The action associated with the "Show In>Remote Console" menu item. @@ -184,7 +184,7 @@ private String buildCommand(final String filePath, final String options) throws UnsupportedEncodingException { StringBuilder commandBuilder = new StringBuilder("tail "); if (options != null && !options.isEmpty()) { - final String opts = new String(Base64Encoder.encode(options.getBytes("UTF-8")), "UTF-8"); + final String opts = new String(Base64Coder.encode(options.getBytes())); commandBuilder.append("--opts ").append(opts).append(" "); } commandBuilder.append(filePath); 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-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.viewer; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.HashMap; @@ -26,9 +27,8 @@ import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -62,7 +62,7 @@ // Keep track of what's loading and what's finished private ArrayList<UserDelegate> loadedUsers = new ArrayList<UserDelegate>(); private ArrayList<UserDelegate> loadingUsers = new ArrayList<UserDelegate>(); - private HashMap<UserDelegate, OpenShiftException> errors = new HashMap<UserDelegate, OpenShiftException>(); + private HashMap<UserDelegate, Exception> errors = new HashMap<UserDelegate, Exception>(); @Override public Object[] getElements(final Object parentElement) { @@ -95,7 +95,7 @@ // return a stub object that says loading... return new Object[] { new LoadingStub() }; } - OpenShiftException ose = errors.get((UserDelegate)parentElement); + Exception ose = errors.get((UserDelegate)parentElement); if( ose != null ) { return new Object[]{ose}; } @@ -116,11 +116,13 @@ return getChildrenForElement(parentElement, recurse); } catch (OpenShiftException e) { Logger.error("Unable to retrieve OpenShift Express information", e); + } catch (SocketTimeoutException e) { + Logger.error("Unable to retrieve OpenShift Express information", e); } return new Object[0]; } - private Object[] getChildrenForElement(Object parentElement, boolean recurse) throws OpenShiftException { + private Object[] getChildrenForElement(Object parentElement, boolean recurse) throws OpenShiftException, SocketTimeoutException { // .... the actual work is done here... Object[] children = new Object[0]; // try { @@ -158,6 +160,8 @@ getChildrenForElement(user, true); } catch(OpenShiftException e) { errors.put(user, e); + } catch(SocketTimeoutException e) { + errors.put(user, e); } loadedUsers.add(user); loadingUsers.remove(user); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -23,9 +23,9 @@ import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub; import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.NotConnectedUserStub; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -64,7 +64,7 @@ if (element instanceof IApplication) { return OpenShiftUIActivator.getDefault().createImage("query.gif"); } - if (element instanceof IEmbeddableCartridge) { + if (element instanceof IEmbeddedCartridge) { return OpenShiftUIActivator.getDefault().createImage("task-repository.gif"); } if (element instanceof LoadingStub) { @@ -101,8 +101,8 @@ styledString.setStyle(appName.length() + 1, appType.length(), StyledString.QUALIFIER_STYLER); return styledString; } - if (element instanceof IEmbeddableCartridge) { - String message = ((IEmbeddableCartridge) element).getName(); + if (element instanceof IEmbeddedCartridge) { + String message = ((IEmbeddedCartridge) element).getName(); StyledString styledString = new StyledString(message); styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER); return new StyledString(message); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -17,8 +17,8 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -48,32 +48,27 @@ @Override public Object getPropertyValue(Object id) { - try { - if (id.equals("3.URL")) { - return application.getApplicationUrl().toString(); - } - if (id.equals("1.Name")) { - return application.getName(); - } - if (id.equals("6.UUID")) { - return application.getUUID(); - } - if (id.equals("4.Created on")) { - SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd 'at' HH:mm:ss"); - return format.format(application.getCreationTime()); - } - - if (id.equals("2.Type")) { - return application.getCartridge().getName(); - } - if (id.equals("5.Git URI")) { - return application.getGitUri(); - } - - - } catch (OpenShiftException e) { - Logger.error("Could not get selected object's property '" + id + "'.", e); + if (id.equals("3.URL")) { + return application.getApplicationUrl().toString(); } + if (id.equals("1.Name")) { + return application.getName(); + } + if (id.equals("6.UUID")) { + return application.getUUID(); + } + if (id.equals("4.Created on")) { + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd 'at' HH:mm:ss"); + return format.format(application.getCreationTime()); + } + + if (id.equals("2.Type")) { + return application.getCartridge(); + } + if (id.equals("5.Git URI")) { + return application.getGitUrl(); + } + return null; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -15,17 +15,17 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon */ public class EmbeddableCartridgePropertySource implements IPropertySource { - private final IEmbeddableCartridge cartridge; + private final IEmbeddedCartridge cartridge; - public EmbeddableCartridgePropertySource(IEmbeddableCartridge cartridge) { + public EmbeddableCartridgePropertySource(IEmbeddedCartridge cartridge) { this.cartridge = cartridge; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -14,8 +14,8 @@ import org.eclipse.ui.views.properties.IPropertySource; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.client.IApplication; +import com.openshift.client.IEmbeddedCartridge; /** * @author Xavier Coulon @@ -31,8 +31,8 @@ } if(adaptableObject instanceof IApplication) { return new ApplicationPropertySource((IApplication)adaptableObject); - }if(adaptableObject instanceof IEmbeddableCartridge) { - return new EmbeddableCartridgePropertySource((IEmbeddableCartridge)adaptableObject); + }if(adaptableObject instanceof IEmbeddedCartridge) { + return new EmbeddableCartridgePropertySource((IEmbeddedCartridge)adaptableObject); } } return null; 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,8 @@ ******************************************************************************/ 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; @@ -17,7 +19,7 @@ import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -58,9 +60,11 @@ return user.getRhlogin(); } if (id.equals(PROPERTY_DOMAIN) && user.hasDomain()) { - return user.getDomain().getNamespace() + "." + user.getDomain().getRhcDomain(); + return user.getDefaultDomain().getId() + "." + user.getDefaultDomain().getSuffix(); } } 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; import java.util.Collection; import java.util.Set; @@ -87,12 +88,12 @@ import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor; -import com.openshift.express.client.Cartridge; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.NotFoundOpenShiftException; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.NotFoundOpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author Andre Dietisheim @@ -124,6 +125,10 @@ IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); OpenShiftUIActivator.log(status); ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status); + } catch (SocketTimeoutException e) { + IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); + OpenShiftUIActivator.log(status); + ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status); } } @@ -213,6 +218,10 @@ OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind( "Could not get embedded cartridges for application {0}", selectedApplication.getName()), ex)); + } catch (SocketTimeoutException ex) { + OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not get embedded cartridges for application {0}", + selectedApplication.getName()), ex)); } } } @@ -259,7 +268,7 @@ WidgetProperties.selection().observe(newAppCartridgeCombo); final IObservableValue selectedCartridgeModelObservable = BeanProperties.value( ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel); - ValueBindingBuilder.bind(selectedCartridgeComboObservable).converting(new StringToCartridgeConverter()) + ValueBindingBuilder.bind(selectedCartridgeComboObservable) // .converting(new StringToCartridgeConverter()) .to(selectedCartridgeModelObservable).converting(new CartridgeToStringConverter()).in(dbc); final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn); @@ -285,8 +294,8 @@ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).span(1, 2).hint(400, 250) .applyTo(tableContainer); this.viewer = createTable(tableContainer); - dbc.bindSet(ViewerProperties.checkedElements(IEmbeddableCartridge.class).observe(viewer), - BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES) + dbc.bindSet(ViewerProperties.checkedElements(IEmbeddedCartridge.class).observe(viewer), + BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDED_CARTRIDGES) .observe(pageModel)); this.checkAllButton = new Button(newAppEmbeddableCartridgesGroup, SWT.PUSH); @@ -377,7 +386,7 @@ @Override public void update(ViewerCell cell) { - IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell.getElement(); + IEmbeddedCartridge cartridge = (IEmbeddedCartridge) cell.getElement(); cell.setText(cartridge.getName()); } }, viewer, tableLayout); @@ -398,17 +407,17 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { try { - IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); + IEmbeddedCartridge cartridge = (IEmbeddedCartridge) event.getElement(); if (event.getChecked()) { - if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) { + if (IEmbeddedCartridge.PHPMYADMIN_34.equals(cartridge)) { addPhpMyAdminCartridge(cartridge); - } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) { + } else if (IEmbeddedCartridge.JENKINS_14.equals(cartridge)) { addJenkinsCartridge(cartridge); } else { addCartridge(cartridge); } } else { - if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) { + if (IEmbeddedCartridge.MYSQL_51.equals(cartridge)) { removeMySQLCartridge(cartridge); } else { removeCartridge(cartridge); @@ -416,14 +425,16 @@ } } catch (OpenShiftException e) { OpenShiftUIActivator.log("Could not process embeddable cartridges", e); + } catch (SocketTimeoutException e) { + OpenShiftUIActivator.log("Could not process embeddable cartridges", e); } } }; } - private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException { - if (pageModel.hasApplication(ICartridge.JENKINS_14)) { - pageModel.getSelectedEmbeddableCartridges().add(cartridge); + private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + if (pageModel.hasApplicationOfType(ICartridge.JENKINS_14)) { + pageModel.getSelectedEmbeddedCartridges().add(cartridge); } else { final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell()); if (dialog.open() == Dialog.OK) { @@ -437,15 +448,12 @@ private void createJenkinsApplication(final IEmbeddableCartridge cartridge, final String name) { try { WizardUtils.runInWizard(new Job(NLS.bind("Creating jenkins application \"{0}\"...", name)) { - @Override protected IStatus run(IProgressMonitor monitor) { try { IApplication jenkinsApplication = pageModel.createJenkinsApplication(name, monitor); - pageModel.getSelectedEmbeddableCartridges().add(cartridge); - + pageModel.getSelectedEmbeddedCartridges().add(cartridge); openLogDialog(jenkinsApplication); - return Status.OK_STATUS; } catch (Exception e) { getShell().getDisplay().syncExec(new Runnable() { @@ -464,33 +472,33 @@ } } - private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) { + private void addPhpMyAdminCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException { + if (!viewer.getChecked(IEmbeddedCartridge.MYSQL_51)) { if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge", "To embed phpmyadmin, you'd also have to embed mysql.")) { - pageModel.getSelectedEmbeddableCartridges().add(IEmbeddableCartridge.MYSQL_51); - pageModel.getSelectedEmbeddableCartridges().add(cartridge); - viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true); + pageModel.selectEmbeddedCartridges(IEmbeddedCartridge.MYSQL_51); + pageModel.selectEmbeddedCartridges(cartridge); + viewer.setChecked(IEmbeddedCartridge.MYSQL_51, true); } else { viewer.setChecked(cartridge, false); } } else { - pageModel.getSelectedEmbeddableCartridges().add(cartridge); + pageModel.getSelectedEmbeddedCartridges().add(cartridge); } } - private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - pageModel.getSelectedEmbeddableCartridges().add(cartridge); + private void addCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException { + pageModel.getSelectedEmbeddedCartridges().add(cartridge); } - private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges(); - if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) { + private void removeMySQLCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException { + Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddedCartridges(); + if (viewer.getChecked(IEmbeddedCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) { - checkedCartridges.remove(IEmbeddableCartridge.PHPMYADMIN_34); + checkedCartridges.remove(IEmbeddedCartridge.PHPMYADMIN_34); checkedCartridges.remove(cartridge); - viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false); + viewer.setChecked(IEmbeddedCartridge.PHPMYADMIN_34, false); } else { viewer.setChecked(cartridge, true); } @@ -499,8 +507,8 @@ } } - private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - pageModel.getSelectedEmbeddableCartridges().remove(cartridge); + private void removeCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException { + pageModel.getSelectedEmbeddedCartridges().remove(cartridge); } private SelectionListener onCheckAll() { @@ -510,9 +518,11 @@ public void widgetSelected(SelectionEvent e) { viewer.setAllChecked(true); try { - addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14); + 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); } } @@ -555,6 +565,7 @@ } } + /* private static final class StringToCartridgeConverter extends Converter { private StringToCartridgeConverter() { super(String.class, ICartridge.class); @@ -567,7 +578,7 @@ } return null; } - } + }*/ private static class JenkinsApplicationDialog extends InputDialog { @@ -680,6 +691,8 @@ } } catch (OpenShiftException e) { Logger.error("Failed to refresh OpenShift account info", e); + } catch (SocketTimeoutException e) { + Logger.error("Failed to refresh OpenShift account info", e); } } @@ -704,7 +717,7 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { - pageModel.loadCartridges(); + pageModel.loadStandaloneCartridges(); return Status.OK_STATUS; } catch (NotFoundOpenShiftException e) { return Status.OK_STATUS; @@ -717,7 +730,7 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { - setViewerInput(pageModel.loadEmbeddableCartridges()); + setViewerInput(pageModel.loadEmbeddedCartridges()); return Status.OK_STATUS; } catch (NotFoundOpenShiftException e) { return Status.OK_STATUS; @@ -762,8 +775,14 @@ && !existingApplicationsLoaded) { return ValidationStatus.cancel("Existing applications are not loaded yet."); } else { - if (!pageModel.hasApplication(appName)) { - return ValidationStatus.error(NLS.bind("The application \"{0}\" does not exist.", appName)); + try { + 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -19,14 +20,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; 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.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.OpenShiftException; /** * @author Andre Dietisheim @@ -38,8 +38,8 @@ public static final String PROPERTY_USE_EXISTING_APPLICATION = "useExistingApplication"; public static final String PROPERTY_EXISTING_APPLICATION_NAME = "existingApplicationName"; public static final String PROPERTY_CARTRIDGES = "cartridges"; - public static final String PROPERTY_EMBEDDABLE_CARTRIDGES = "embeddableCartridges"; - public static final String PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; + public static final String PROPERTY_EMBEDDED_CARTRIDGES = "embeddedCartridges"; + public static final String PROPERTY_SELECTED_EMBEDDED_CARTRIDGES = "selectedEmbeddedCartridges"; public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge"; public static final String PROPERTY_APPLICATION_NAME = "applicationName"; public static final String PROPERTY_EXISTING_APPLICATIONS = "existingApplications"; @@ -51,12 +51,12 @@ // first pass validation) private List<IApplication> existingApplications = new ArrayList<IApplication>(); private List<ICartridge> cartridges = new ArrayList<ICartridge>(); - private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); + private List<IEmbeddableCartridge> embeddedCartridges = new ArrayList<IEmbeddableCartridge>(); private String existingApplicationName; private boolean existingApplicationsLoaded = false;; public ApplicationConfigurationWizardPageModel(OpenShiftExpressApplicationWizardModel wizardModel) - throws OpenShiftException { + throws OpenShiftException, SocketTimeoutException { this.wizardModel = wizardModel; setExistingApplication(wizardModel.getApplication()); } @@ -72,7 +72,7 @@ return wizardModel.getUser(); } - public List<IApplication> getApplications() throws OpenShiftException { + public List<IApplication> getApplications() throws OpenShiftException, SocketTimeoutException { UserDelegate user = getUser(); if (user == null || !user.hasDomain()) { return Collections.emptyList(); @@ -91,6 +91,9 @@ } catch (OpenShiftException e) { Logger.error("Failed to retrieve list of OpenShift applications", e); return new String[0]; + } catch (SocketTimeoutException e) { + Logger.error("Failed to retrieve list of OpenShift applications", e); + return new String[0]; } } @@ -119,10 +122,11 @@ * * @param applicationName * @throws OpenShiftException + * @throws SocketTimeoutException * * @see #doSetExistingApplication(IApplication) */ - public void setExistingApplicationName(String applicationName) throws OpenShiftException { + public void setExistingApplicationName(String applicationName) throws OpenShiftException, SocketTimeoutException { firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME , this.existingApplicationName, this.existingApplicationName = applicationName); @@ -132,7 +136,7 @@ } } - public void loadExistingApplications() throws OpenShiftException { + public void loadExistingApplications() throws OpenShiftException, SocketTimeoutException { UserDelegate user = getUser(); if (user != null) { setExistingApplications(user.getApplications()); @@ -177,8 +181,8 @@ return existingApplications; } - public void loadCartridges() throws OpenShiftException { - setCartridges(getUser().getCartridges()); + public void loadStandaloneCartridges() throws OpenShiftException, SocketTimeoutException { + setCartridges(getUser().getStandaloneCartridgeNames()); refreshSelectedCartridge(); } @@ -210,16 +214,13 @@ } protected void setSelectedCartridge(IApplication application) { - ICartridge applicationCartridge = null; - if (application != null) { - applicationCartridge = application.getCartridge(); - } + final ICartridge applicationCartridge = (application != null) ? application.getCartridge() : null; setSelectedCartridge(applicationCartridge); } - public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { + public List<IEmbeddableCartridge> loadEmbeddedCartridges() throws OpenShiftException, SocketTimeoutException { List<IEmbeddableCartridge> cartridges = getUser().getEmbeddableCartridges(); - setEmbeddableCartridges(cartridges); + setEmbeddedCartridges(cartridges); return cartridges; } @@ -229,6 +230,7 @@ * * @param application * @throws OpenShiftException + * @throws SocketTimeoutException * * @see #setExistingApplicationName(String) * @see #setApplicationName(IApplication) @@ -236,7 +238,7 @@ * @see #setSelectedEmbeddableCartridges(Set) * @see #wizardModel#setApplication */ - public void setExistingApplication(IApplication application) throws OpenShiftException { + public void setExistingApplication(IApplication application) throws OpenShiftException, SocketTimeoutException { if (application != null) { setExistingApplicationName(application.getName()); doSetExistingApplication(application); @@ -249,13 +251,14 @@ * * @param application * @throws OpenShiftException + * @throws SocketTimeoutException * * @see #setApplicationName(IApplication) * @see #setSelectedCartridge(IApplication) * @see #setSelectedEmbeddableCartridges(Set) * @see #wizardModel#setApplication */ - protected void doSetExistingApplication(IApplication application) throws OpenShiftException { + protected void doSetExistingApplication(IApplication application) throws OpenShiftException, SocketTimeoutException { if (application != null) { setApplicationName(application.getName()); setSelectedCartridge(application.getCartridge()); @@ -264,7 +267,7 @@ } } - public void resetExistingApplication() throws OpenShiftException { + public void resetExistingApplication() throws OpenShiftException, SocketTimeoutException { setExistingApplication((IApplication) null); } @@ -286,43 +289,35 @@ return wizardModel.getApplicationName(); } - public void setEmbeddableCartridges(List<IEmbeddableCartridge> cartridges) { + public void setEmbeddedCartridges(List<IEmbeddableCartridge> cartridges) { firePropertyChange( - PROPERTY_EMBEDDABLE_CARTRIDGES, this.embeddableCartridges, this.embeddableCartridges = cartridges); + PROPERTY_EMBEDDED_CARTRIDGES, this.embeddedCartridges, this.embeddedCartridges = cartridges); } - public List<IEmbeddableCartridge> getEmbeddableCartridges() { - return embeddableCartridges; + public List<IEmbeddableCartridge> getEmbeddedCartridges() { + return embeddedCartridges; } - public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException { + public Set<IEmbeddableCartridge> getSelectedEmbeddedCartridges() throws OpenShiftException { return wizardModel.getSelectedEmbeddableCartridges(); } + public void selectEmbeddedCartridges(IEmbeddableCartridge cartridge) { + + } + public void setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { - firePropertyChange(PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES, + firePropertyChange(PROPERTY_SELECTED_EMBEDDED_CARTRIDGES, wizardModel.getSelectedEmbeddableCartridges(), wizardModel.setSelectedEmbeddableCartridges(selectedEmbeddableCartridges)); } - public boolean hasApplication(ICartridge cartridge) { - try { - return getUser().hasApplication(cartridge); - } catch (OpenShiftException e) { - OpenShiftUIActivator.log( - OpenShiftUIActivator.createErrorStatus("Could not get application by cartridge", e)); - return false; - } + public boolean hasApplicationOfType(ICartridge cartridge) throws SocketTimeoutException, OpenShiftException { + return getUser().hasApplicationOfType(cartridge); } - public boolean hasApplication(String applicationName) { - try { - return getUser().hasApplication(applicationName); - } catch (OpenShiftException e) { - OpenShiftUIActivator.log( - OpenShiftUIActivator.createErrorStatus("Could not get application by name", e)); - return false; - } + public boolean hasApplication(String applicationName) throws SocketTimeoutException, OpenShiftException { + return getUser().hasApplication(applicationName); } public IApplication getApplication() { @@ -332,4 +327,5 @@ public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException { return wizardModel.createApplication(name, ICartridge.JENKINS_14, monitor); } + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -3,6 +3,7 @@ */ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -14,9 +15,9 @@ import org.jboss.tools.openshift.express.internal.ui.propertytable.StringElement; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; /** * @author Xavier Coulon @@ -39,7 +40,7 @@ elements.add( new StringElement("Created on", format.format(application.getCreationTime()))); elements.add(new StringElement("UUID", application.getUUID())); - elements.add(new StringElement("Git URL", application.getGitUri())); + elements.add(new StringElement("Git URL", application.getGitUrl())); elements.add(createCartridges(application)); } catch (Exception e) { @@ -51,9 +52,9 @@ } private ContainerElement createCartridges(IApplication application) - throws OpenShiftException { + throws OpenShiftException, SocketTimeoutException { ContainerElement cartridgesContainer = new ContainerElement("Cartridges"); - for (IEmbeddableCartridge cartridge : application.getEmbeddedCartridges()) { + for (IEmbeddedCartridge cartridge : application.getEmbeddedCartridges()) { cartridgesContainer.add( new StringElement(cartridge.getName(), cartridge.getUrl().toString(), true, cartridgesContainer)); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -34,7 +34,7 @@ import org.jboss.tools.openshift.express.internal.ui.propertytable.PropertyValueCellLabelProvider; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; -import com.openshift.express.client.IApplication; +import com.openshift.client.IApplication; /** * @author Andre Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -54,8 +54,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; /** * @author Andre Dietisheim @@ -194,7 +193,7 @@ createTableColumn("Name", 1, new CellLabelProvider() { @Override public void update(ViewerCell cell) { - IApplication application = (IApplication) cell.getElement(); + final IApplication application = (IApplication) cell.getElement(); cell.setText(application.getName()); } }, viewer, tableLayout); @@ -202,7 +201,7 @@ createTableColumn("Type", 1, new CellLabelProvider() { @Override public void update(ViewerCell cell) { - IApplication application = (IApplication) cell.getElement(); + final IApplication application = (IApplication) cell.getElement(); cell.setText(application.getCartridge().getName()); } }, viewer, tableLayout); @@ -210,11 +209,8 @@ createTableColumn("URL", 3, new CellLabelProvider() { @Override public void update(ViewerCell cell) { - IApplication application = (IApplication) cell.getElement(); - try { - cell.setText(application.getApplicationUrl()); - } catch (OpenShiftException e) { - } + final IApplication application = (IApplication) cell.getElement(); + cell.setText(application.getApplicationUrl()); } }, viewer, tableLayout); 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; import java.util.Collections; import java.util.List; @@ -17,8 +18,8 @@ import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author Andre Dietisheim @@ -55,6 +56,8 @@ 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/ApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,16 +10,18 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.OpenShiftApplicationNotAvailableException; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.OpenShiftApplicationNotAvailableException; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim @@ -73,18 +75,18 @@ return application; } - public void createApplication(IProgressMonitor monitor) throws OpenShiftException { + public void createApplication(IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException { IApplication application = createApplication(name, cartridge, monitor); setApplication(application); } - public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftException { + public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException { // monitor.subTask("creating application..."); IApplication application = getUser().createApplication(name, cartridge); waitForAccessible(application, monitor); return application; } - public boolean hasApplication(String name) throws OpenShiftException { + public boolean hasApplication(String name) throws OpenShiftException, SocketTimeoutException { return user.hasApplication(name); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -35,8 +35,8 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.client.IApplication; +import com.openshift.client.IEmbeddedCartridge; /** * @author André Dietisheim @@ -45,11 +45,11 @@ private static final Pattern HTTP_LINK_REGEX = Pattern.compile("(http[^ |\n]+)"); - private Collection<IEmbeddableCartridge> cartridges; + private Collection<IEmbeddedCartridge> cartridges; private IApplication application; private List<LinkSubstring> linkSubstrings; - public CreationLogDialog(Shell parentShell, Collection<IEmbeddableCartridge> cartridges) { + public CreationLogDialog(Shell parentShell, Collection<IEmbeddedCartridge> cartridges) { this(parentShell); this.cartridges = cartridges; } @@ -102,13 +102,13 @@ } } - private LogEntry[] createLogEntries(Collection<IEmbeddableCartridge> cartridges) { + private LogEntry[] createLogEntries(Collection<IEmbeddedCartridge> cartridges) { if (cartridges == null || cartridges.isEmpty()) { return new LogEntry[] {}; } ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>(); - for (IEmbeddableCartridge cartridge : cartridges) { + for (IEmbeddedCartridge cartridge : cartridges) { logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog())); } return logEntries.toArray(new LogEntry[cartridges.size()]); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -20,12 +20,10 @@ 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.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStore; -import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStoreException; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; -import com.openshift.express.client.NotFoundOpenShiftException; -import com.openshift.express.client.configuration.OpenShiftConfiguration; +import com.openshift.client.NotFoundOpenShiftException; +import com.openshift.client.configuration.OpenShiftConfiguration; /** * @author Andre Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -21,7 +21,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.OpenShiftEndpointException; +import com.openshift.client.OpenShiftEndpointException; /** * @author Andre Dietisheim @@ -49,10 +49,10 @@ return Status.OK_STATUS; } catch(OpenShiftEndpointException e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not rename domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e); + "Could not rename domain \"{0}\": {1}", model.getDomainId(), e.getRestResponseMessages()), e); } catch (Exception e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not rename domain {0}", model.getNamespace()), e); + "Could not rename domain {0}", model.getDomainId()), e); } } }, getContainer()); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -65,7 +65,7 @@ ControlDecorationSupport.create(namespaceValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); final IObservableValue namespaceModelObservable = BeanProperties.value( - EditDomainWizardPageModel.PROPERTY_NAMESPACE).observe(pageModel); + EditDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel); ValueBindingBuilder.bind(namespaceTextObservable).to(namespaceModelObservable).in(dbc); } 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; + import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim @@ -22,35 +24,37 @@ */ public class EditDomainWizardPageModel extends ObservableUIPojo { - public static final String PROPERTY_NAMESPACE = "namespace"; + public static final String PROPERTY_DOMAIN_ID = "domainId"; - private String namespace; + private String domainId; private final UserDelegate user; public EditDomainWizardPageModel(UserDelegate user) { this.user = user; try { - if (user.getDomain() != null) { - setNamespace(user.getDomain().getNamespace()); + if (user.getDefaultDomain() != null) { + setDomainId(user.getDefaultDomain().getId()); } } catch (OpenShiftException e) { Logger.error("Fail to retrieve OpenShift domain", e); + } catch (SocketTimeoutException e) { + Logger.error("Fail to retrieve OpenShift domain", e); } } - public String getNamespace() { - return this.namespace; + public String getDomainId() { + return this.domainId; } - public void setNamespace(String namespace) { - firePropertyChange(PROPERTY_NAMESPACE, this.namespace, - this.namespace = namespace); + public void setDomainId(String namespace) { + firePropertyChange(PROPERTY_DOMAIN_ID, this.domainId, + this.domainId = namespace); } - public void renameDomain() throws OpenShiftException { - if (user.getDomain() != null) { - user.getDomain().setNamespace(namespace); + public void renameDomain() throws OpenShiftException, SocketTimeoutException { + if (user.getDefaultDomain() != null) { + user.getDefaultDomain().rename(domainId); } else { Logger.warn("Attempting to rename missing user domain..."); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -13,7 +13,7 @@ import org.eclipse.jface.wizard.Wizard; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import com.openshift.express.client.IApplication; +import com.openshift.client.IApplication; /** * @author André Dietisheim 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ 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; @@ -53,10 +54,11 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim @@ -116,7 +118,7 @@ @Override public void update(ViewerCell cell) { - IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell.getElement(); + IEmbeddedCartridge cartridge = (IEmbeddedCartridge) cell.getElement(); cell.setText(cartridge.getName()); } }, viewer, tableLayout); @@ -138,17 +140,17 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { try { - IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); + IEmbeddedCartridge cartridge = (IEmbeddedCartridge) event.getElement(); if (event.getChecked()) { - if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) { + if (IEmbeddedCartridge.PHPMYADMIN_34.equals(cartridge)) { addPhpMyAdminCartridge(cartridge); - } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) { + } else if (IEmbeddedCartridge.JENKINS_14.equals(cartridge)) { addJenkinsCartridge(cartridge); } else { addCartridge(cartridge); } } else { - if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) { + if (IEmbeddedCartridge.MYSQL_51.equals(cartridge)) { removeMySQLCartridge(cartridge); } else { removeCartridge(cartridge); @@ -156,12 +158,14 @@ } } catch (OpenShiftException e) { OpenShiftUIActivator.log("Could not process embeddable cartridges", e); + } catch (SocketTimeoutException e) { + OpenShiftUIActivator.log("Could not process embeddable cartridges", e); } } }; } - private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException { + private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { if (model.hasApplication(ICartridge.JENKINS_14)) { model.getSelectedEmbeddableCartridges().add(cartridge); } else { @@ -206,13 +210,13 @@ } } - private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) { + private void addPhpMyAdminCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + if (!viewer.getChecked(IEmbeddedCartridge.MYSQL_51)) { if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge", "To embed phpmyadmin, you'd also have to embed mysql.")) { - model.getSelectedEmbeddableCartridges().add(IEmbeddableCartridge.MYSQL_51); + model.getSelectedEmbeddableCartridges().add(IEmbeddedCartridge.MYSQL_51); model.getSelectedEmbeddableCartridges().add(cartridge); - viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true); + viewer.setChecked(IEmbeddedCartridge.MYSQL_51, true); } else { viewer.setChecked(cartridge, false); } @@ -221,18 +225,18 @@ } } - private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { + private void addCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().add(cartridge); } - private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { + private void removeMySQLCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { List<IEmbeddableCartridge> checkedCartridges = model.getSelectedEmbeddableCartridges(); - if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) { + if (viewer.getChecked(IEmbeddedCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) { - checkedCartridges.remove(IEmbeddableCartridge.PHPMYADMIN_34); + checkedCartridges.remove(IEmbeddedCartridge.PHPMYADMIN_34); checkedCartridges.remove(cartridge); - viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false); + viewer.setChecked(IEmbeddedCartridge.PHPMYADMIN_34, false); } else { viewer.setChecked(cartridge, true); } @@ -241,7 +245,7 @@ } } - private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { + private void removeCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().remove(cartridge); } @@ -252,9 +256,11 @@ public void widgetSelected(SelectionEvent e) { viewer.setAllChecked(true); try { - addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14); + 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); } } @@ -352,7 +358,7 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { - List<IEmbeddableCartridge> addedCartridges = model.embedCartridges(); + List<IEmbeddedCartridge> addedCartridges = model.embedCartridges(); openLogDialog(addedCartridges); queue.offer(true); } catch (OpenShiftException e) { @@ -360,6 +366,11 @@ return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Could not embed cartridges to application {0}", model.getApplication().getName()), e); + } catch (SocketTimeoutException e) { + queue.offer(false); + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + NLS.bind("Could not embed cartridges to application {0}", + model.getApplication().getName()), e); } return Status.OK_STATUS; } @@ -370,7 +381,7 @@ } } - private void openLogDialog(final List<IEmbeddableCartridge> cartridges) { + 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -20,12 +21,12 @@ import org.eclipse.core.databinding.observable.list.ListDiffEntry; import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.IEmbeddedCartridge; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim @@ -40,25 +41,26 @@ private ApplicationWizardModel wizardModel; - private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); + private List<IEmbeddableCartridge> embeddedCartridges = new ArrayList<IEmbeddableCartridge>(); private List<IEmbeddableCartridge> selectedCartridges; public EmbedCartridgeWizardPageModel(ApplicationWizardModel wizardModel) { this.wizardModel = wizardModel; } - public void loadSelectedEmbeddableCartridges() throws OpenShiftException { + public void loadConfiguredEmbeddedCartridges() throws OpenShiftException, SocketTimeoutException { selectedCartridges = new ArrayList<IEmbeddableCartridge>(); IApplication application = wizardModel.getApplication(); if (application == null || application.getEmbeddedCartridges() == null) { return; } - List<IEmbeddableCartridge> embeddedCartridges = application.getEmbeddedCartridges(); - selectedCartridges.addAll(embeddedCartridges); + for(IEmbeddedCartridge configuredCartridge : application.getEmbeddedCartridges()) { + selectedCartridges.add(configuredCartridge); + } } - public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { + public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException, SocketTimeoutException { List<IEmbeddableCartridge> cartridges = wizardModel.getUser().getEmbeddableCartridges(); setEmbeddableCartridges(cartridges); return cartridges; @@ -66,35 +68,29 @@ public void setEmbeddableCartridges(List<IEmbeddableCartridge> cartridges) { firePropertyChange( - PROPERTY_EMBEDDABLE_CARTRIDGES, this.embeddableCartridges, this.embeddableCartridges = cartridges); + PROPERTY_EMBEDDABLE_CARTRIDGES, this.embeddedCartridges, this.embeddedCartridges = cartridges); } - public List<IEmbeddableCartridge> getEmbeddableCartridges() { - return embeddableCartridges; + public List<IEmbeddableCartridge> getEmbeddedCartridges() { + return embeddedCartridges; } - public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException { + public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException, SocketTimeoutException { if (selectedCartridges == null) { - loadSelectedEmbeddableCartridges(); + loadConfiguredEmbeddedCartridges(); } return selectedCartridges; } - public boolean hasApplication(ICartridge cartridge) { - try { - return wizardModel.getUser().hasApplication(cartridge); - } catch (OpenShiftException e) { - OpenShiftUIActivator.log( - OpenShiftUIActivator.createErrorStatus("Could not get application by cartridge", e)); - return false; - } + public boolean hasApplication(ICartridge cartridge) throws SocketTimeoutException, OpenShiftException { + return wizardModel.getUser().hasApplicationOfType(cartridge); } public IApplication getApplication() { return wizardModel.getApplication(); } - public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException { + public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException { return wizardModel.createApplication(name, ICartridge.JENKINS_14, monitor); } @@ -102,58 +98,64 @@ * Embeds/removes the cartridges that were added/removed in this wizard * page. * - * @return the cartridges that were added. + * @return the cartridges that were added (embedded). * @throws OpenShiftException + * @throws SocketTimeoutException */ - public List<IEmbeddableCartridge> embedCartridges() throws OpenShiftException { + public List<IEmbeddedCartridge> embedCartridges() throws OpenShiftException, SocketTimeoutException { if (selectedCartridges == null) { return Collections.emptyList(); } - List<IEmbeddableCartridge> addedCartridges = new ArrayList<IEmbeddableCartridge>(); - List<IEmbeddableCartridge> removedCartridges = new ArrayList<IEmbeddableCartridge>(); - computeAdditionsAndRemovals(addedCartridges, removedCartridges, selectedCartridges); - addEmbeddedCartridges(addedCartridges); - removeEmbeddedCartridges(removedCartridges); + List<IEmbeddableCartridge> cartridgesToAdd = new ArrayList<IEmbeddableCartridge>(); + List<IEmbeddableCartridge> cartridgesToRemove = new ArrayList<IEmbeddableCartridge>(); + computeAdditionsAndRemovals(cartridgesToAdd, cartridgesToRemove, selectedCartridges); + final List<IEmbeddedCartridge> addedCartridges = addEmbeddedCartridges(cartridgesToAdd); + removeEmbeddedCartridges(cartridgesToRemove); return addedCartridges; } - private void removeEmbeddedCartridges(List<IEmbeddableCartridge> removedCartridges) throws OpenShiftException { - if (removedCartridges.isEmpty()) { + private void removeEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToRemove) throws OpenShiftException, SocketTimeoutException { + if (cartridgesToRemove.isEmpty()) { return; } - Collections.sort(removedCartridges, new CartridgeComparator()); - getApplication().removeEmbbedCartridges(removedCartridges); + //Collections.sort(removedCartridges, new CartridgeComparator()); + for(IEmbeddableCartridge cartridgeToRemove : cartridgesToRemove) { + final IEmbeddedCartridge embeddedCartridge = getApplication().getEmbeddedCartridge(cartridgeToRemove); + if(embeddedCartridge != null) { + embeddedCartridge.destroy(); + } + } } - private void addEmbeddedCartridges(List<IEmbeddableCartridge> addedCartridges) throws OpenShiftException { - if (addedCartridges.isEmpty()) { - return; + private List<IEmbeddedCartridge> addEmbeddedCartridges(List<IEmbeddableCartridge> cartridgesToAdd) throws OpenShiftException, SocketTimeoutException { + if (cartridgesToAdd.isEmpty()) { + return Collections.emptyList(); } - Collections.sort(addedCartridges, new CartridgeComparator()); - getApplication().addEmbbedCartridges(addedCartridges); + //Collections.sort(addedCartridges, new CartridgeComparator()); + return getApplication().addEmbeddableCartridges(cartridgesToAdd); } private void computeAdditionsAndRemovals(List<IEmbeddableCartridge> addedCartridges, List<IEmbeddableCartridge> removedCartridges, List<IEmbeddableCartridge> selectedCartridges) - throws OpenShiftException { + throws OpenShiftException, SocketTimeoutException { ListDiff listDiff = Diffs.computeListDiff(getApplication().getEmbeddedCartridges(), selectedCartridges); for (ListDiffEntry entry : listDiff.getDifferences()) { if (entry.isAddition()) { - addedCartridges.add((IEmbeddableCartridge) entry.getElement()); + addedCartridges.add((IEmbeddedCartridge) entry.getElement()); } else { - removedCartridges.add((IEmbeddableCartridge) entry.getElement()); + removedCartridges.add((IEmbeddedCartridge) entry.getElement()); } } } - private static class CartridgeComparator implements Comparator<IEmbeddableCartridge> { + private static class CartridgeComparator implements Comparator<IEmbeddedCartridge> { @Override - public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) { + public int compare(IEmbeddedCartridge thisCartridge, IEmbeddedCartridge thatCartridge) { // mysql has to be added/removed before phpmyadmin - if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { + if (thisCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { return -1; - } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { + } else if (thatCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { return 1; } return 0; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -21,8 +21,8 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; /** * @author Andre Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -25,10 +25,10 @@ import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -6,7 +6,7 @@ import org.eclipse.core.resources.IProject; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import com.openshift.express.client.IApplication; +import com.openshift.client.IApplication; /** * @author Xavier Coulon Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -21,7 +21,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import com.openshift.express.client.OpenShiftEndpointException; +import com.openshift.client.OpenShiftEndpointException; /** * @author André Dietisheim @@ -47,7 +47,7 @@ result[0] = true; } catch (OpenShiftEndpointException e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e); + "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getRestResponseMessages()), e); } catch (Exception e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( "Could not create domain \"{0}\"", model.getNamespace()), e); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -56,7 +56,7 @@ import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim @@ -90,7 +90,7 @@ ControlDecorationSupport.create(namespaceValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); final IObservableValue namespaceModelObservable = BeanProperties.value( - EditDomainWizardPageModel.PROPERTY_NAMESPACE).observe(pageModel); + EditDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel); ValueBindingBuilder.bind(namespaceTextObservable).to(namespaceModelObservable).in(dbc); /*DataBindingUtils.bindMandatoryTextField( Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -21,11 +21,11 @@ import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; -import com.openshift.express.client.IDomain; -import com.openshift.express.client.ISSHPublicKey; -import com.openshift.express.client.OpenShiftException; -import com.openshift.express.client.SSHKeyPair; -import com.openshift.express.client.SSHPublicKey; +import com.openshift.client.IDomain; +import com.openshift.client.ISSHPublicKey; +import com.openshift.client.OpenShiftException; +import com.openshift.client.SSHKeyPair; +import com.openshift.client.SSHPublicKey; /** * @author André Dietisheim @@ -99,7 +99,7 @@ } public void createDomain() throws OpenShiftException, IOException { - IDomain domain = user.createDomain(namespace, loadSshKey()); + IDomain domain = user.createDomain(namespace); } public String getSshKey() { 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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -12,6 +12,7 @@ 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; @@ -42,10 +43,11 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftEndpointException; -import com.openshift.express.client.OpenShiftException; +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; /** * @author Andre Dietisheim @@ -181,7 +183,7 @@ } catch (OpenShiftEndpointException e) { // TODO: refresh user return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\": {1}", - e, applicationName, e.getResponseResult()); + e, applicationName, e.getRestResponseMessages()); } catch (OpenShiftException e) { // TODO: refresh user return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\"", @@ -209,17 +211,21 @@ if (selectedCartridges != null && !selectedCartridges.isEmpty()) { List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); embeddableCartridges.addAll(selectedCartridges); - application.addEmbbedCartridges(embeddableCartridges); - openCreationLogDialog(embeddableCartridges); + final List<IEmbeddedCartridge> embeddedCartridges = application.addEmbeddableCartridges(embeddableCartridges); + openCreationLogDialog(embeddedCartridges); } } catch (OpenShiftEndpointException e) { // TODO: refresh user return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not embed cartridges to application {0}: {1}", applicationName, e.getResponseResult())); + "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; } @@ -230,7 +236,7 @@ } } - private void openCreationLogDialog(final List<IEmbeddableCartridge> embeddableCartridges) { + private void openCreationLogDialog(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-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -34,11 +34,11 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportNewProject; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ServerAdapterFactory; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.OpenShiftApplicationNotAvailableException; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.ICartridge; +import com.openshift.client.IEmbeddableCartridge; +import com.openshift.client.OpenShiftApplicationNotAvailableException; +import com.openshift.client.OpenShiftException; public class OpenShiftExpressApplicationWizardModel extends ObservableUIPojo implements IOpenShiftExpressWizardModel { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -35,8 +35,8 @@ import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim <adietish(a)redhat.com&gt; @@ -87,10 +87,10 @@ EGitUIUtils.ensureEgitUIIsStarted(); if (addToRepoView) { EGitUtils.cloneRepository( - application.getGitUri(), remoteName, destination, EGitUIUtils.ADD_TO_REPOVIEW_TASK, monitor); + application.getGitUrl(), remoteName, destination, EGitUIUtils.ADD_TO_REPOVIEW_TASK, monitor); } else { EGitUtils.cloneRepository( - application.getGitUri(), remoteName, destination, monitor); + application.getGitUrl(), remoteName, destination, monitor); } return destination; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -37,8 +37,8 @@ import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * Strategy that enables the given git shared project to be used on the chosen @@ -118,7 +118,7 @@ RemoteConfig config = EGitUtils.getRemoteByName(remoteName, repository); if (config != null) { if (EGitUtils.hasRemoteUrl( - Pattern.compile(RegExUtils.escapeRegex(getApplication().getGitUri())), config)) { + Pattern.compile(RegExUtils.escapeRegex(getApplication().getGitUrl())), config)) { return; } // we shouldn't get here, the UI should validate the remote name and @@ -128,7 +128,7 @@ project.getName(), remoteName); } - EGitUtils.addRemoteTo(getRemoteName(), getApplication().getGitUri(), repository); + EGitUtils.addRemoteTo(getRemoteName(), getApplication().getGitUrl(), repository); } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -29,8 +29,8 @@ import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * Strategy that enables the given git shared project to be used on the chosen @@ -97,7 +97,7 @@ createGitIgnore(project, monitor); setupOpenShiftMavenProfile(project, monitor); shareProject(project, monitor); - addRemoteRepo(getRemoteName(), getApplication().getGitUri(), EGitUtils.getRepository(project)); + addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project)); return Collections.singletonList(project); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -30,8 +30,8 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.GeneralProjectImportOperation; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.MavenProjectImportOperation; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim <adietish(a)redhat.com&gt; @@ -94,7 +94,7 @@ IProgressMonitor monitor) throws MalformedURLException, URISyntaxException, IOException, OpenShiftException, CoreException, InvocationTargetException { - URIish uri = new URIish(application.getGitUri()); + URIish uri = new URIish(application.getGitUrl()); EGitUtils.addRemoteTo("openshift", uri, repository); EGitUtils.mergeWithRemote(uri, "refs/remotes/openshift/HEAD", repository, monitor); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-04-19 21:26:15 UTC (rev 40358) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-04-19 21:40:04 UTC (rev 40359) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard.appimport; +import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,8 +38,8 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel; -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; /** * @author André Dietisheim <adietish(a)redhat.com&gt; @@ -88,6 +89,10 @@ IStatus s = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Cannot create openshift server adapter", ose); OpenShiftUIActivator.getDefault().getLog().log(s); + } catch (SocketTimeoutException ste) { + IStatus s = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + "Cannot create openshift server adapter", ste); + OpenShiftUIActivator.getDefault().getLog().log(s); } } @@ -99,7 +104,7 @@ private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt, String mode, IApplication application, UserDelegate user, String deployProject, String remoteName) throws CoreException, - OpenShiftException { + OpenShiftException, SocketTimeoutException { Assert.isLegal(serverType != null); Assert.isLegal(mode != null); Assert.isLegal(application != null); @@ -110,7 +115,7 @@ IServer server = ExpressServerUtils.createServer(rt, serverType, serverName); ExpressServerUtils.fillServerWithOpenShiftDetails(server, application.getApplicationUrl(), - user.getRhlogin(), user.getPassword(), user.getDomain().getNamespace(), + user.getRhlogin(), user.getPassword(), user.getDefaultDomain().getId(), application.getName(), application.getUUID(), deployProject, ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT, mode, remoteName); return server;