Author: adietish Date: 2011-12-15 07:45:37 -0500 (Thu, 15 Dec 2011) New Revision: 37349 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-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/ui/OpenShiftUIException.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/wizard/AdapterWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.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/ApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.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/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/NewApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.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/appimport/AbstractImportApplicationStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java Log: [JBIDE-10455] switched to new client library branch (https://github.com/bdecoste/openshift-java-client) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-15 12:45:37 UTC (rev 37349) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar" sourcepath="/home/adietish/jboss-workspaces/openshift-java-client_andre/org.jboss.tools.openshift.express.client"/> + <classpathentry exported="true" kind="lib" path="openshift-java-client-1.0.1-SNAPSHOT.jar"/> <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Final.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"/> 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2011-12-15 12:45:37 UTC (rev 37349) @@ -7,15 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., jboss-dmr-1.0.0.Final.jar, - org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar -Export-Package: org.jboss.tools.openshift.express.client, - org.jboss.tools.openshift.express.client.configuration, - org.jboss.tools.openshift.express.client.utils, - org.jboss.tools.openshift.express.internal.client;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.httpclient;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.request;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.request.marshalling;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.response;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.response.unmarshalling;x-friends:="org.jboss.tools.openshift.express.ui", - org.jboss.tools.openshift.express.internal.client.utils;x-friends:="org.jboss.tools.openshift.express.ui" + openshift-java-client-1.0.1-SNAPSHOT.jar +Export-Package: com.openshift.express.client, + com.openshift.express.client.configuration, + com.openshift.express.client.utils Require-Bundle: com.jcraft.jsch;bundle-version="0.1.44" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2011-12-15 12:45:37 UTC (rev 37349) @@ -3,4 +3,6 @@ bin.includes = META-INF/,\ .,\ jboss-dmr-1.0.0.Final.jar,\ - org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar + openshift-java-client-1.0.1-SNAPSHOT.jar +src.includes = openshift-java-client-1.0.1-SNAPSHOT.jar,\ + jboss-dmr-1.0.0.Final.jar Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar =================================================================== (Binary files differ) 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -10,8 +10,11 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui; -import org.jboss.tools.openshift.express.client.OpenShiftException; +import com.openshift.express.client.OpenShiftException; +/** + * @author Andre Dietisheim + */ public class OpenShiftUIException extends OpenShiftException { private static final long serialVersionUID = 1L; 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -25,7 +25,6 @@ import org.eclipse.ui.views.IViewRegistry; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.IServerModule; -import org.jboss.tools.openshift.express.internal.client.utils.Base64Encoder; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker.JschToEclipseLogger; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; @@ -33,6 +32,7 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; +import com.openshift.express.client.utils.Base64Encoder; /** * The action associated with the "Show In>Remote Console" menu item. Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -48,12 +48,13 @@ import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter; import org.jboss.tools.common.ui.databinding.ValueBindingBuilder; import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.ValidationStatusControlDecoration; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim * @author Rob Stryker Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -12,11 +12,12 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.ICartridge; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim * @author Rob Stryker 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -28,13 +28,14 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.BrowserUtil; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IEmbeddableCartridge; -import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; 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.express.client.utils.RFC822DateUtils; + /** * @author André Dietisheim */ 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -12,13 +12,14 @@ import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftApplicationNotAvailableException; -import org.jboss.tools.openshift.express.client.OpenShiftException; 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.IUser; +import com.openshift.express.client.OpenShiftApplicationNotAvailableException; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -55,14 +55,15 @@ import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.common.ui.databinding.DataBindingUtils; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; -import org.jboss.tools.openshift.express.client.OpenShiftException; 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.wizard.appimport.ImportProjectWizardModel; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IDomain; +import com.openshift.express.client.NotFoundOpenShiftException; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -14,12 +14,13 @@ import java.util.List; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IDomain; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim * 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -16,17 +16,18 @@ import org.eclipse.core.runtime.Status; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; -import org.jboss.tools.openshift.express.client.OpenShiftException; -import org.jboss.tools.openshift.express.client.User; -import org.jboss.tools.openshift.express.client.configuration.DefaultConfiguration; -import org.jboss.tools.openshift.express.client.configuration.SystemConfiguration; -import org.jboss.tools.openshift.express.client.configuration.SystemProperties; -import org.jboss.tools.openshift.express.client.configuration.UserConfiguration; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; +import com.openshift.express.client.IUser; +import com.openshift.express.client.NotFoundOpenShiftException; +import com.openshift.express.client.OpenShiftException; +import com.openshift.express.client.User; +import com.openshift.express.client.configuration.DefaultConfiguration; +import com.openshift.express.client.configuration.SystemConfiguration; +import com.openshift.express.client.configuration.SystemProperties; +import com.openshift.express.client.configuration.UserConfiguration; + /** * @author André Dietisheim */ @@ -70,10 +71,11 @@ protected String getUserConfiguration() { String configuredUsername = null; try { - configuredUsername = new SystemProperties( - new UserConfiguration( - new SystemConfiguration( - new DefaultConfiguration()))).getRhlogin(); + configuredUsername = + new SystemProperties( + new UserConfiguration( + new SystemConfiguration( + new DefaultConfiguration()))).getRhlogin(); } catch (Exception e) { // do nothing } 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -11,9 +11,10 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import org.eclipse.jface.wizard.Wizard; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IUser; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + /** * @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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -50,14 +50,15 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IEmbeddableCartridge; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.ICartridge; +import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -19,12 +19,13 @@ import org.eclipse.core.databinding.observable.list.ListDiff; import org.eclipse.core.databinding.observable.list.ListDiffEntry; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IEmbeddableCartridge; -import org.jboss.tools.openshift.express.client.OpenShiftException; 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; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -11,9 +11,10 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import org.eclipse.jface.wizard.Wizard; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IUser; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -37,12 +37,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenShiftApplicationNotAvailableException; -import org.jboss.tools.openshift.express.client.OpenShiftException; -import org.jboss.tools.openshift.express.internal.client.Cartridge; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import com.openshift.express.client.Cartridge; +import com.openshift.express.client.ICartridge; +import com.openshift.express.client.OpenShiftApplicationNotAvailableException; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -15,10 +15,11 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import com.openshift.express.client.ICartridge; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -47,11 +47,12 @@ import org.jboss.tools.common.ui.databinding.MandatoryStringValidator; import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; 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; + /** * @author André Dietisheim */ 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 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -18,14 +18,15 @@ import org.eclipse.jsch.internal.core.IConstants; import org.eclipse.jsch.internal.core.JSchCorePlugin; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; -import org.jboss.tools.openshift.express.client.SSHKeyPair; -import org.jboss.tools.openshift.express.client.SSHPublicKey; 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.IUser; +import com.openshift.express.client.OpenShiftException; +import com.openshift.express.client.SSHKeyPair; +import com.openshift.express.client.SSHPublicKey; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationStrategy.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationStrategy.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -42,12 +42,13 @@ import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.Server; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim <adietish(a)redhat.com&gt; */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -28,11 +28,12 @@ import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.egit.core.GitIgnore; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim <adietish(a)redhat.com&gt; */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -27,14 +27,15 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerType; import org.jboss.tools.openshift.egit.core.EGitUtils; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; 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.IUser; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim <adietish(a)redhat.com&gt; */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -31,7 +31,6 @@ import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; @@ -39,6 +38,8 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationWizardPage; import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPage; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-15 12:08:14 UTC (rev 37348) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-15 12:45:37 UTC (rev 37349) @@ -21,12 +21,13 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerType; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.wizard.AdapterWizardPageModel; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.ICartridge; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + /** * @author André Dietisheim <adietish(a)redhat.com&gt; */