Author: adietish Date: 2011-10-18 08:40:18 -0400 (Tue, 18 Oct 2011) New Revision: 35759 Added: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenShiftService.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenShiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenShiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftEndpointException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftService.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenShiftJsonConstants.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenShiftCoreActivator.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenShiftRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequestFactory.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenShiftEnvelopeFactory.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenShiftMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenShiftMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenShiftResponse.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenShiftJsonResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenShiftTestService.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftIntegrationTestSuite.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftTestSuite.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenShiftServiceFake.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftCredentials.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftTestService.java Removed: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenshiftService.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenshiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenshiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftEndpointException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftException.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenshiftJsonConstants.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenshiftCoreActivator.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenshiftRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequestFactory.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenshiftEnvelopeFactory.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenshiftMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenshiftMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenshiftResponse.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenshiftJsonResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftImages.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenshiftTestService.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftIntegrationTestSuite.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftTestSuite.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenshiftServiceFake.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftCredentials.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftTestService.java Modified: trunk/as/features/org.jboss.tools.openshift.express.feature/ trunk/as/features/org.jboss.tools.openshift.express.feature/feature.properties trunk/as/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ApplicationLogReader.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IApplication.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IDomain.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ISSHPublicKey.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHKeyPair.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHPublicKey.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/UserConfiguration.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Domain.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/UserInfoAware.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractDomainRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ApplicationRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ListCartridgesRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/UserInfoRequest.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractJsonMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ApplicationRequestJsonMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/DomainRequestJsonMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ListCartridgesRequestJsonMarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationStatusResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/DomainResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ListCartridgesResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/UserInfoResponseUnmarshaller.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImageRepository.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgeTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgesIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/JsonSanitizerTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserConfigurationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserIntegrationTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserTest.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestSSHKey.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/UserConfigurationFake.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationAsserts.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationInfoAsserts.java trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationUtils.java Log: [JBIDE-9925] renamed "Openshift" to "OpenShift" in code, comment, xml etc. Property changes on: trunk/as/features/org.jboss.tools.openshift.express.feature ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/as/features/org.jboss.tools.openshift.express.feature/feature.properties =================================================================== --- trunk/as/features/org.jboss.tools.openshift.express.feature/feature.properties 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/features/org.jboss.tools.openshift.express.feature/feature.properties 2011-10-18 12:40:18 UTC (rev 35759) @@ -15,7 +15,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=JBoss Openshift Express Tools +featureName=JBoss OpenShift Express Tools # "providerName" property - name of the company that provides the feature providerName=JBoss by Red Hat @@ -26,7 +26,7 @@ devUpdateSiteName=JBossTools Development Update Site # "description" property - description of the feature -description=Provides Tooling to deal with Openshift Express. It will allow you to sign into your Openshift Express account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the Openshift Express PaaS platform.. +description=Provides Tooling to deal with OpenShift Express. It will allow you to sign into your OpenShift Express account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the OpenShift Express PaaS platform.. copyright=Red Hat, Inc. licenses these features and plugins to you under \ certain open source licenses (or aggregations of such licenses), \ Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Openshift Core Plugin +Bundle-Name: OpenShift Core Plugin Bundle-SymbolicName: org.jboss.tools.openshift.express.client Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.jboss.tools.openshift.express.internal.client.OpenshiftCoreActivator +Bundle-Activator: org.jboss.tools.openshift.express.internal.client.OpenShiftCoreActivator Bundle-Vendor: JBoss by Red Hat Require-Bundle: org.eclipse.core.runtime, com.jcraft.jsch;bundle-version="[0.1.41,2.0.0)" Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ApplicationLogReader.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ApplicationLogReader.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ApplicationLogReader.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -28,13 +28,13 @@ private static final long STATUS_REQUEST_DELAY = 4 * 1024; - private IOpenshiftService service; + private IOpenShiftService service; private Reader logReader; private Application application; private InternalUser user; private String currentStatus; - public ApplicationLogReader(Application application, InternalUser user, IOpenshiftService service) { + public ApplicationLogReader(Application application, InternalUser user, IOpenShiftService service) { this.application = application; this.user = user; this.service = service; @@ -54,7 +54,7 @@ } } return charactersRead; - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { throw new IOException(e); } catch (InterruptedException e) { return -1; @@ -76,7 +76,7 @@ return status.substring(logStart); } - protected String requestStatus() throws InterruptedException, OpenshiftException { + protected String requestStatus() throws InterruptedException, OpenShiftException { String status = null; while (status == null) { status = service.getStatus(application.getName(), application.getCartridge(), user); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IApplication.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IApplication.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IApplication.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -19,26 +19,26 @@ public String getName(); - public String getUUID() throws OpenshiftException; + public String getUUID() throws OpenShiftException; public ICartridge getCartridge(); - public String getEmbedded() throws OpenshiftException; + public String getEmbedded() throws OpenShiftException; - public Date getCreationTime() throws OpenshiftException; + public Date getCreationTime() throws OpenShiftException; - public void destroy() throws OpenshiftException; + public void destroy() throws OpenShiftException; - public void start() throws OpenshiftException; + public void start() throws OpenShiftException; - public void restart() throws OpenshiftException; + public void restart() throws OpenShiftException; - public void stop() throws OpenshiftException; + public void stop() throws OpenShiftException; - public ApplicationLogReader getLogReader() throws OpenshiftException; + public ApplicationLogReader getLogReader() throws OpenShiftException; - public String getGitUri() throws OpenshiftException; + public String getGitUri() throws OpenShiftException; - public String getApplicationUrl() throws OpenshiftException; + public String getApplicationUrl() throws OpenShiftException; } \ No newline at end of file Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IDomain.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IDomain.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IDomain.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -15,10 +15,10 @@ */ public interface IDomain { - public void setNamespace(String namespace) throws OpenshiftException; + public void setNamespace(String namespace) throws OpenShiftException; public String getNamespace(); - public String getRhcDomain() throws OpenshiftException; + public String getRhcDomain() throws OpenShiftException; } \ No newline at end of file Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenShiftService.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenshiftService.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenShiftService.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenShiftService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,244 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + +import java.net.MalformedURLException; +import java.util.List; + +import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; +import org.jboss.tools.openshift.express.internal.client.InternalUser; +import org.jboss.tools.openshift.express.internal.client.UserInfo; + +/** + * @author André Dietisheim + */ +public interface IOpenShiftService { + + /** + * The platform base url + */ + public static final String BASE_URL = "https://openshift.redhat.com"; + + /** + * The path (url path addition) to the service + */ + public static final String SERVICE_PATH = "/broker"; + + /** + * Returns the url at which the service is reachable. + * + * @return + */ + public String getServiceUrl(); + + /** + * Returns the url at which the platform is reachable. + * + * @return + */ + public String getPlatformUrl(); + + /** + * Returns <code>true</code> if given user has valid credentials. Returns + * <code>false</code> otherwise. + * + * @return + * @throws OpenShiftException + * @throws MalformedURLException + */ + public boolean isValid(InternalUser user) throws OpenShiftException; + + /** + * List all cartridges that are available on the OpenShift Express platform. + * + * @param user + * the user account that shall be used + * @return the list of cartridges available on the platform + * @throws OpenShiftException + * @throws MalformedURLException + * + * @see InternalUser + */ + public List<ICartridge> getCartridges(InternalUser user) throws OpenShiftException; + + /** + * Creates an application with the given name and cartridge for the given + * user. + * + * @param name + * the application name + * @param cartridge + * the cartridge to use + * @param user + * the user account + * @return the application that was created + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see IApplication + */ + public IApplication createApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException; + + /** + * Destroys the application with the given name and cartridge for the given + * user. + * + * @param name + * the name of the application that shall be destroyed + * @param cartridge + * the cartridge that the application is running on + * @param user + * the user account + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + */ + public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException; + + /** + * Starts the application with the given name and cartridge for the given + * user account. Starting an application that is already started has no + * effect. + * + * @param name + * of the application that shall be started + * @param cartridge + * the cartridge the application is running on + * @param user + * the user account to use + * @return the application that was started + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see IApplication + */ + public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException; + + /** + * Restarts the application with the given name and cartridge for the given + * user account. + * + * @param name + * the name of the application that shall be restarted + * @param cartridge + * the cartridge the application is running on + * @param user + * the user account to use + * @return the application that was started + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see IApplication + */ + public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException; + + /** + * Stops the application with the given name and cartridge for the given + * user account. Stopping an application that is already stopped has no + * effect. + * + * @param name + * the name of the application that shall be restarted + * @param cartridge + * the cartridge the application is running on + * @param user + * the user account to use + * @return the application that was stopped + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see IApplication + */ + public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException; + + /** + * Returns the log of the application with the given name and cartridge. + * Returns the whole log if no new log entry was created since the last + * call. Returns the new entries otherwise. + * + * @param name + * of the application that the log shall be returned of + * @param cartridge + * the cartridge the application is running on + * @param user + * the user account to use + * @return the log of the application + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + */ + public String getStatus(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException; + + /** + * Changes the current domain (namespace) to the given name. + * + * @param name + * the new domain name(-space) + * @param sshKey + * the ssh key that shall be used. + * @param user + * the user account to use + * @return the domain that was changed + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see SSHKeyPair + * @see ISSHPublicKey + * @see IDomain + */ + public IDomain changeDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenShiftException; + + /** + * Creates a domain (namespace) with the given name for the given user + * account with the given ssh public key. If a domain already exists an + * OpenShiftEndpointException is thrown. + * + * @param name + * the new domain name(-space) + * @param sshKey + * the ssh key that shall be used. + * @param user + * the user account to use + * @return the domain that was changed + * @throws OpenShiftException + * + * @see ICartridge + * @see InternalUser + * @see SSHKeyPair + * @see ISSHPublicKey + * @see IDomain + */ + public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenShiftException; + + /** + * Returns all informations for the given user and its applications. + * + * @param user + * the user account to use + * @return all user informations (user related info and applications) + * @throws OpenShiftException + * + * @see InternalUser + * @see InternalUserInfo + * @see ApplicationInfo + */ + public UserInfo getUserInfo(InternalUser user) throws OpenShiftException; +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenShiftService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenshiftService.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IOpenshiftService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,244 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - -import java.net.MalformedURLException; -import java.util.List; - -import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; -import org.jboss.tools.openshift.express.internal.client.InternalUser; -import org.jboss.tools.openshift.express.internal.client.UserInfo; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftService { - - /** - * The platform base url - */ - public static final String BASE_URL = "https://openshift.redhat.com"; - - /** - * The path (url path addition) to the service - */ - public static final String SERVICE_PATH = "/broker"; - - /** - * Returns the url at which the service is reachable. - * - * @return - */ - public String getServiceUrl(); - - /** - * Returns the url at which the platform is reachable. - * - * @return - */ - public String getPlatformUrl(); - - /** - * Returns <code>true</code> if given user has valid credentials. Returns - * <code>false</code> otherwise. - * - * @return - * @throws OpenshiftException - * @throws MalformedURLException - */ - public boolean isValid(InternalUser user) throws OpenshiftException; - - /** - * List all cartridges that are available on the Openshift Express platform. - * - * @param user - * the user account that shall be used - * @return the list of cartridges available on the platform - * @throws OpenshiftException - * @throws MalformedURLException - * - * @see InternalUser - */ - public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException; - - /** - * Creates an application with the given name and cartridge for the given - * user. - * - * @param name - * the application name - * @param cartridge - * the cartridge to use - * @param user - * the user account - * @return the application that was created - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see IApplication - */ - public IApplication createApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException; - - /** - * Destroys the application with the given name and cartridge for the given - * user. - * - * @param name - * the name of the application that shall be destroyed - * @param cartridge - * the cartridge that the application is running on - * @param user - * the user account - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - */ - public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException; - - /** - * Starts the application with the given name and cartridge for the given - * user account. Starting an application that is already started has no - * effect. - * - * @param name - * of the application that shall be started - * @param cartridge - * the cartridge the application is running on - * @param user - * the user account to use - * @return the application that was started - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see IApplication - */ - public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException; - - /** - * Restarts the application with the given name and cartridge for the given - * user account. - * - * @param name - * the name of the application that shall be restarted - * @param cartridge - * the cartridge the application is running on - * @param user - * the user account to use - * @return the application that was started - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see IApplication - */ - public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException; - - /** - * Stops the application with the given name and cartridge for the given - * user account. Stopping an application that is already stopped has no - * effect. - * - * @param name - * the name of the application that shall be restarted - * @param cartridge - * the cartridge the application is running on - * @param user - * the user account to use - * @return the application that was stopped - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see IApplication - */ - public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException; - - /** - * Returns the log of the application with the given name and cartridge. - * Returns the whole log if no new log entry was created since the last - * call. Returns the new entries otherwise. - * - * @param name - * of the application that the log shall be returned of - * @param cartridge - * the cartridge the application is running on - * @param user - * the user account to use - * @return the log of the application - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - */ - public String getStatus(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException; - - /** - * Changes the current domain (namespace) to the given name. - * - * @param name - * the new domain name(-space) - * @param sshKey - * the ssh key that shall be used. - * @param user - * the user account to use - * @return the domain that was changed - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see SSHKeyPair - * @see ISSHPublicKey - * @see IDomain - */ - public IDomain changeDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException; - - /** - * Creates a domain (namespace) with the given name for the given user - * account with the given ssh public key. If a domain already exists an - * OpenshiftEndpointException is thrown. - * - * @param name - * the new domain name(-space) - * @param sshKey - * the ssh key that shall be used. - * @param user - * the user account to use - * @return the domain that was changed - * @throws OpenshiftException - * - * @see ICartridge - * @see InternalUser - * @see SSHKeyPair - * @see ISSHPublicKey - * @see IDomain - */ - public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException; - - /** - * Returns all informations for the given user and its applications. - * - * @param user - * the user account to use - * @return all user informations (user related info and applications) - * @throws OpenshiftException - * - * @see InternalUser - * @see InternalUserInfo - * @see ApplicationInfo - */ - public UserInfo getUserInfo(InternalUser user) throws OpenshiftException; -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ISSHPublicKey.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ISSHPublicKey.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/ISSHPublicKey.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -21,8 +21,8 @@ * * @return the content of the public key (without signature, without * comment) - * @throws OpenshiftException + * @throws OpenShiftException */ - public String getPublicKey() throws OpenshiftException ; + public String getPublicKey() throws OpenShiftException ; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -22,37 +22,37 @@ public String getPassword(); - public boolean isValid() throws OpenshiftException; + public boolean isValid() throws OpenShiftException; - public String getUUID() throws OpenshiftException; + public String getUUID() throws OpenShiftException; - public IDomain createDomain(String name, ISSHPublicKey key) throws OpenshiftException; + public IDomain createDomain(String name, ISSHPublicKey key) throws OpenShiftException; /** * Returns the domain that this user created previously. Returns * <code>null</code> if no domain was created. * * @return the domain that this user created - * @throws OpenshiftException + * @throws OpenShiftException * * @see #createDomain */ - public IDomain getDomain() throws OpenshiftException; + public IDomain getDomain() throws OpenShiftException; - public boolean hasDomain() throws OpenshiftException; + public boolean hasDomain() throws OpenShiftException; - public ISSHPublicKey getSshKey() throws OpenshiftException; + public ISSHPublicKey getSshKey() throws OpenShiftException; - public List<ICartridge> getCartridges() throws OpenshiftException; + public List<ICartridge> getCartridges() throws OpenShiftException; - public ICartridge getCartridgeByName(String name) throws OpenshiftException; + public ICartridge getCartridgeByName(String name) throws OpenShiftException; - public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException; + public IApplication createApplication(String name, ICartridge cartridge) throws OpenShiftException; - public Collection<IApplication> getApplications() throws OpenshiftException; + public Collection<IApplication> getApplications() throws OpenShiftException; - public IApplication getApplicationByName(String name) throws OpenshiftException; + public IApplication getApplicationByName(String name) throws OpenShiftException; - public void refresh() throws OpenshiftException; + public void refresh() throws OpenShiftException; } \ No newline at end of file Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenShiftException.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenshiftException.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenShiftException.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenShiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + + +/** + * @author André Dietisheim + */ +public class InvalidCredentialsOpenShiftException extends OpenShiftEndpointException { + + private static final long serialVersionUID = 1L; + + public InvalidCredentialsOpenShiftException(String url, Throwable cause) { + super(url, cause, "Your credentials are not authorized to access \"{0}\"", url); + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenShiftException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenshiftException.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/InvalidCredentialsOpenshiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - - -/** - * @author André Dietisheim - */ -public class InvalidCredentialsOpenshiftException extends OpenshiftEndpointException { - - private static final long serialVersionUID = 1L; - - public InvalidCredentialsOpenshiftException(String url, Throwable cause) { - super(url, cause, "Your credentials are not authorized to access \"{0}\"", url); - } -} Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenShiftException.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenshiftException.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenShiftException.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenShiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + + +/** + * @author André Dietisheim + */ +public class NotFoundOpenShiftException extends OpenShiftEndpointException { + + private static final long serialVersionUID = 1L; + + public NotFoundOpenShiftException(String url, Throwable cause) { + super(url, cause, "Could not find any OpenShift Express resource at \"{0}\"", url); + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenShiftException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenshiftException.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/NotFoundOpenshiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - - -/** - * @author André Dietisheim - */ -public class NotFoundOpenshiftException extends OpenshiftEndpointException { - - private static final long serialVersionUID = 1L; - - public NotFoundOpenshiftException(String url, Throwable cause) { - super(url, cause, "Could not find any Openshift Express resource at \"{0}\"", url); - } -} Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftEndpointException.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftEndpointException.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftEndpointException.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftEndpointException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + + +/** + * @author André Dietisheim + */ +public class OpenShiftEndpointException extends OpenShiftException { + + private static final long serialVersionUID = 1L; + + private String url; + + public OpenShiftEndpointException(String url, Throwable cause, String message, Object... arguments) { + super(cause, message, arguments); + this.url = url; + } + + protected String getUrl() { + return url; + } + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftEndpointException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftException.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftException.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftException.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + +import java.text.MessageFormat; + +/** + * @author André Dietisheim + */ +public class OpenShiftException extends Exception { + + private static final long serialVersionUID = 1L; + + public OpenShiftException(Throwable cause, String message, Object... arguments) { + super(MessageFormat.format(message, arguments), cause); + } + + public OpenShiftException(String message, Object... arguments) { + super(MessageFormat.format(message, arguments)); + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftService.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftService.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,267 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.client; + +import java.net.MalformedURLException; +import java.net.URL; +import java.text.MessageFormat; +import java.util.List; + +import org.jboss.tools.openshift.express.internal.client.Application; +import org.jboss.tools.openshift.express.internal.client.InternalUser; +import org.jboss.tools.openshift.express.internal.client.UserInfo; +import org.jboss.tools.openshift.express.internal.client.httpclient.HttpClientException; +import org.jboss.tools.openshift.express.internal.client.httpclient.NotFoundException; +import org.jboss.tools.openshift.express.internal.client.httpclient.UnauthorizedException; +import org.jboss.tools.openshift.express.internal.client.httpclient.UrlConnectionHttpClient; +import org.jboss.tools.openshift.express.internal.client.request.AbstractDomainRequest; +import org.jboss.tools.openshift.express.internal.client.request.ApplicationAction; +import org.jboss.tools.openshift.express.internal.client.request.ApplicationRequest; +import org.jboss.tools.openshift.express.internal.client.request.ChangeDomainRequest; +import org.jboss.tools.openshift.express.internal.client.request.CreateDomainRequest; +import org.jboss.tools.openshift.express.internal.client.request.ListCartridgesRequest; +import org.jboss.tools.openshift.express.internal.client.request.OpenShiftEnvelopeFactory; +import org.jboss.tools.openshift.express.internal.client.request.UserInfoRequest; +import org.jboss.tools.openshift.express.internal.client.request.marshalling.ApplicationRequestJsonMarshaller; +import org.jboss.tools.openshift.express.internal.client.request.marshalling.DomainRequestJsonMarshaller; +import org.jboss.tools.openshift.express.internal.client.request.marshalling.ListCartridgesRequestJsonMarshaller; +import org.jboss.tools.openshift.express.internal.client.request.marshalling.UserInfoRequestJsonMarshaller; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationResponseUnmarshaller; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationStatusResponseUnmarshaller; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.DomainResponseUnmarshaller; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ListCartridgesResponseUnmarshaller; +import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.UserInfoResponseUnmarshaller; + +/** + * @author André Dietisheim + */ +public class OpenShiftService implements IOpenShiftService { + + // TODO extract to properties file + public static final String VERSION = "0.1.0"; + private static final String USERAGENT_FORMAT = "Java OpenShift/{0} ({1})"; + + private String baseUrl; + private String id; + + public OpenShiftService(String id) { + this(id, BASE_URL); + } + + public OpenShiftService(String id, String baseUrl) { + this.id = id; + this.baseUrl = baseUrl; + } + + @Override + public String getServiceUrl() { + return baseUrl + SERVICE_PATH; + } + + @Override + public String getPlatformUrl() { + return baseUrl; + } + + @Override + public boolean isValid(InternalUser user) throws OpenShiftException { + return getUserInfo(user) != null; + } + + @Override + public UserInfo getUserInfo(InternalUser user) throws OpenShiftException { + UserInfoRequest request = new UserInfoRequest(user.getRhlogin(), true); + String url = request.getUrlString(getServiceUrl()); + try { + String requestString = new UserInfoRequestJsonMarshaller().marshall(request); + String openShiftRequestString = new OpenShiftEnvelopeFactory(user.getPassword(), requestString) + .createString(); + String responseString = createHttpClient(id, url).post(openShiftRequestString); + responseString = JsonSanitizer.sanitize(responseString); + OpenShiftResponse<UserInfo> response = + new UserInfoResponseUnmarshaller().unmarshall(responseString); + return response.getOpenShiftObject(); + } catch (MalformedURLException e) { + throw new OpenShiftEndpointException( + url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url); + } catch (UnauthorizedException e) { + throw new InvalidCredentialsOpenShiftException(url, e); + } catch (NotFoundException e) { + throw new NotFoundOpenShiftException(url, e); + } catch (HttpClientException e) { + throw new OpenShiftEndpointException( + url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url); + } + } + + @Override + public List<ICartridge> getCartridges(InternalUser user) throws OpenShiftException { + ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(user.getRhlogin(), true); + String url = listCartridgesRequest.getUrlString(getServiceUrl()); + try { + String listCartridgesRequestString = + new ListCartridgesRequestJsonMarshaller().marshall(listCartridgesRequest); + String request = new OpenShiftEnvelopeFactory(user.getPassword(), listCartridgesRequestString) + .createString(); + String listCatridgesReponse = createHttpClient(id, url).post(request); + listCatridgesReponse = JsonSanitizer.sanitize(listCatridgesReponse); + OpenShiftResponse<List<ICartridge>> response = + new ListCartridgesResponseUnmarshaller().unmarshall(listCatridgesReponse); + return response.getOpenShiftObject(); + /** + * always allowed to list cartridges, even with invalid credentials + */ + } catch (MalformedURLException e) { + throw new OpenShiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); + } catch (NotFoundException e) { + throw new NotFoundOpenShiftException(url, e); + } catch (HttpClientException e) { + throw new OpenShiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); + } + } + + @Override + public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenShiftException { + return requestDomainAction(new CreateDomainRequest(name, sshKey, user.getRhlogin(), true), user); + } + + @Override + public IDomain changeDomain(String newName, ISSHPublicKey sshKey, InternalUser user) throws OpenShiftException { + return requestDomainAction(new ChangeDomainRequest(newName, sshKey, user.getRhlogin(), true), user); + } + + protected IDomain requestDomainAction(AbstractDomainRequest request, InternalUser user) throws OpenShiftException { + String url = request.getUrlString(getServiceUrl()); + try { + String requestString = + new OpenShiftEnvelopeFactory( + user.getPassword(), + new DomainRequestJsonMarshaller().marshall(request)) + .createString(); + String responseString = createHttpClient(id, url).post(requestString); + responseString = JsonSanitizer.sanitize(responseString); + OpenShiftResponse<IDomain> response = + new DomainResponseUnmarshaller(request.getName(), user, this).unmarshall(responseString); + return response.getOpenShiftObject(); + } catch (MalformedURLException e) { + throw new OpenShiftEndpointException(url, e, "Could reach openshift platform at \"{0}\"", url); + } catch (UnauthorizedException e) { + throw new InvalidCredentialsOpenShiftException(url, e); + } catch (NotFoundException e) { + throw new NotFoundOpenShiftException(url, e); + } catch (HttpClientException e) { + throw new OpenShiftEndpointException(url, e, "Could not {0}", request.toHumanReadable()); + } + } + + @Override + public Application createApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException { + Application application = requestApplicationAction(new ApplicationRequest(name, cartridge, + ApplicationAction.CONFIGURE, + user.getRhlogin(), true), user); + return application; + } + + @Override + public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + IApplication application = requestApplicationAction(new ApplicationRequest(name, cartridge, + ApplicationAction.DECONFIGURE, + user.getRhlogin(), true), user); + user.remove(application); + } + + @Override + public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException { + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.START, + user.getRhlogin(), true), user); + } + + @Override + public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) + throws OpenShiftException { + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.RESTART, + user.getRhlogin(), true), user); + } + + @Override + public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.STOP, + user.getRhlogin(), true), user); + } + + @Override + public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenShiftException { + ApplicationRequest applicationRequest = + new ApplicationRequest(applicationName, cartridge, ApplicationAction.STATUS, user.getRhlogin(), true); + String url = applicationRequest.getUrlString(getServiceUrl()); + try { + String applicationRequestString = + new ApplicationRequestJsonMarshaller().marshall(applicationRequest); + String request = new OpenShiftEnvelopeFactory(user.getPassword(), applicationRequestString).createString(); + String response = createHttpClient(id, url).post(request); + + response = JsonSanitizer.sanitize(response); + OpenShiftResponse<String> openshiftResponse = + new ApplicationStatusResponseUnmarshaller().unmarshall(response); + return openshiftResponse.getOpenShiftObject(); + } catch (MalformedURLException e) { + throw new OpenShiftException( + e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); + } catch (UnauthorizedException e) { + throw new InvalidCredentialsOpenShiftException(url, e); + } catch (NotFoundException e) { + throw new NotFoundOpenShiftException(url, e); + } catch (HttpClientException e) { + throw new OpenShiftEndpointException( + url, e, "Could not {0} application \"{1}\" at \"{2}\"", + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); + } + } + + protected Application requestApplicationAction(ApplicationRequest applicationRequest, InternalUser user) + throws OpenShiftException { + String url = applicationRequest.getUrlString(getServiceUrl()); + try { + String applicationRequestString = + new ApplicationRequestJsonMarshaller().marshall(applicationRequest); + String request = new OpenShiftEnvelopeFactory(user.getPassword(), applicationRequestString).createString(); + String response = createHttpClient(id, url).post(request); + + response = JsonSanitizer.sanitize(response); + OpenShiftResponse<Application> openshiftResponse = + new ApplicationResponseUnmarshaller(applicationRequest.getName(), + applicationRequest.getCartridge(), user, this).unmarshall(response); + return openshiftResponse.getOpenShiftObject(); + } catch (MalformedURLException e) { + throw new OpenShiftException( + e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); + } catch (UnauthorizedException e) { + throw new InvalidCredentialsOpenShiftException(url, e); + } catch (NotFoundException e) { + throw new NotFoundOpenShiftException(url, e); + } catch (HttpClientException e) { + throw new OpenShiftEndpointException( + url, e, "Could not {0} application \"{1}\" at \"{2}\"", + applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); + } + } + + private IHttpClient createHttpClient(String id, String url) throws MalformedURLException { + String userAgent = MessageFormat.format(USERAGENT_FORMAT, VERSION, id); + return new UrlConnectionHttpClient(userAgent, new URL(url)); + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenShiftService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftEndpointException.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftEndpointException.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftEndpointException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - - -/** - * @author André Dietisheim - */ -public class OpenshiftEndpointException extends OpenshiftException { - - private static final long serialVersionUID = 1L; - - private String url; - - public OpenshiftEndpointException(String url, Throwable cause, String message, Object... arguments) { - super(cause, message, arguments); - this.url = url; - } - - protected String getUrl() { - return url; - } - -} Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftException.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftException.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - -import java.text.MessageFormat; - -/** - * @author André Dietisheim - */ -public class OpenshiftException extends Exception { - - private static final long serialVersionUID = 1L; - - public OpenshiftException(Throwable cause, String message, Object... arguments) { - super(MessageFormat.format(message, arguments), cause); - } - - public OpenshiftException(String message, Object... arguments) { - super(MessageFormat.format(message, arguments)); - } -} Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,267 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.client; - -import java.net.MalformedURLException; -import java.net.URL; -import java.text.MessageFormat; -import java.util.List; - -import org.jboss.tools.openshift.express.internal.client.Application; -import org.jboss.tools.openshift.express.internal.client.InternalUser; -import org.jboss.tools.openshift.express.internal.client.UserInfo; -import org.jboss.tools.openshift.express.internal.client.httpclient.HttpClientException; -import org.jboss.tools.openshift.express.internal.client.httpclient.NotFoundException; -import org.jboss.tools.openshift.express.internal.client.httpclient.UnauthorizedException; -import org.jboss.tools.openshift.express.internal.client.httpclient.UrlConnectionHttpClient; -import org.jboss.tools.openshift.express.internal.client.request.AbstractDomainRequest; -import org.jboss.tools.openshift.express.internal.client.request.ApplicationAction; -import org.jboss.tools.openshift.express.internal.client.request.ApplicationRequest; -import org.jboss.tools.openshift.express.internal.client.request.ChangeDomainRequest; -import org.jboss.tools.openshift.express.internal.client.request.CreateDomainRequest; -import org.jboss.tools.openshift.express.internal.client.request.ListCartridgesRequest; -import org.jboss.tools.openshift.express.internal.client.request.OpenshiftEnvelopeFactory; -import org.jboss.tools.openshift.express.internal.client.request.UserInfoRequest; -import org.jboss.tools.openshift.express.internal.client.request.marshalling.ApplicationRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.request.marshalling.DomainRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.request.marshalling.ListCartridgesRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.request.marshalling.UserInfoRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationResponseUnmarshaller; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationStatusResponseUnmarshaller; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.DomainResponseUnmarshaller; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ListCartridgesResponseUnmarshaller; -import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.UserInfoResponseUnmarshaller; - -/** - * @author André Dietisheim - */ -public class OpenshiftService implements IOpenshiftService { - - // TODO extract to properties file - public static final String VERSION = "0.1.0"; - private static final String USERAGENT_FORMAT = "Java Openshift/{0} ({1})"; - - private String baseUrl; - private String id; - - public OpenshiftService(String id) { - this(id, BASE_URL); - } - - public OpenshiftService(String id, String baseUrl) { - this.id = id; - this.baseUrl = baseUrl; - } - - @Override - public String getServiceUrl() { - return baseUrl + SERVICE_PATH; - } - - @Override - public String getPlatformUrl() { - return baseUrl; - } - - @Override - public boolean isValid(InternalUser user) throws OpenshiftException { - return getUserInfo(user) != null; - } - - @Override - public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { - UserInfoRequest request = new UserInfoRequest(user.getRhlogin(), true); - String url = request.getUrlString(getServiceUrl()); - try { - String requestString = new UserInfoRequestJsonMarshaller().marshall(request); - String openShiftRequestString = new OpenshiftEnvelopeFactory(user.getPassword(), requestString) - .createString(); - String responseString = createHttpClient(id, url).post(openShiftRequestString); - responseString = JsonSanitizer.sanitize(responseString); - OpenshiftResponse<UserInfo> response = - new UserInfoResponseUnmarshaller().unmarshall(responseString); - return response.getOpenshiftObject(); - } catch (MalformedURLException e) { - throw new OpenshiftEndpointException( - url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url); - } catch (UnauthorizedException e) { - throw new InvalidCredentialsOpenshiftException(url, e); - } catch (NotFoundException e) { - throw new NotFoundOpenshiftException(url, e); - } catch (HttpClientException e) { - throw new OpenshiftEndpointException( - url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url); - } - } - - @Override - public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException { - ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(user.getRhlogin(), true); - String url = listCartridgesRequest.getUrlString(getServiceUrl()); - try { - String listCartridgesRequestString = - new ListCartridgesRequestJsonMarshaller().marshall(listCartridgesRequest); - String request = new OpenshiftEnvelopeFactory(user.getPassword(), listCartridgesRequestString) - .createString(); - String listCatridgesReponse = createHttpClient(id, url).post(request); - listCatridgesReponse = JsonSanitizer.sanitize(listCatridgesReponse); - OpenshiftResponse<List<ICartridge>> response = - new ListCartridgesResponseUnmarshaller().unmarshall(listCatridgesReponse); - return response.getOpenshiftObject(); - /** - * always allowed to list cartridges, even with invalid credentials - */ - } catch (MalformedURLException e) { - throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); - } catch (NotFoundException e) { - throw new NotFoundOpenshiftException(url, e); - } catch (HttpClientException e) { - throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); - } - } - - @Override - public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException { - return requestDomainAction(new CreateDomainRequest(name, sshKey, user.getRhlogin(), true), user); - } - - @Override - public IDomain changeDomain(String newName, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException { - return requestDomainAction(new ChangeDomainRequest(newName, sshKey, user.getRhlogin(), true), user); - } - - protected IDomain requestDomainAction(AbstractDomainRequest request, InternalUser user) throws OpenshiftException { - String url = request.getUrlString(getServiceUrl()); - try { - String requestString = - new OpenshiftEnvelopeFactory( - user.getPassword(), - new DomainRequestJsonMarshaller().marshall(request)) - .createString(); - String responseString = createHttpClient(id, url).post(requestString); - responseString = JsonSanitizer.sanitize(responseString); - OpenshiftResponse<IDomain> response = - new DomainResponseUnmarshaller(request.getName(), user, this).unmarshall(responseString); - return response.getOpenshiftObject(); - } catch (MalformedURLException e) { - throw new OpenshiftEndpointException(url, e, "Could reach openshift platform at \"{0}\"", url); - } catch (UnauthorizedException e) { - throw new InvalidCredentialsOpenshiftException(url, e); - } catch (NotFoundException e) { - throw new NotFoundOpenshiftException(url, e); - } catch (HttpClientException e) { - throw new OpenshiftEndpointException(url, e, "Could not {0}", request.toHumanReadable()); - } - } - - @Override - public Application createApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException { - Application application = requestApplicationAction(new ApplicationRequest(name, cartridge, - ApplicationAction.CONFIGURE, - user.getRhlogin(), true), user); - return application; - } - - @Override - public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - IApplication application = requestApplicationAction(new ApplicationRequest(name, cartridge, - ApplicationAction.DECONFIGURE, - user.getRhlogin(), true), user); - user.remove(application); - } - - @Override - public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException { - return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.START, - user.getRhlogin(), true), user); - } - - @Override - public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) - throws OpenshiftException { - return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.RESTART, - user.getRhlogin(), true), user); - } - - @Override - public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - return requestApplicationAction(new ApplicationRequest(name, cartridge, ApplicationAction.STOP, - user.getRhlogin(), true), user); - } - - @Override - public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenshiftException { - ApplicationRequest applicationRequest = - new ApplicationRequest(applicationName, cartridge, ApplicationAction.STATUS, user.getRhlogin(), true); - String url = applicationRequest.getUrlString(getServiceUrl()); - try { - String applicationRequestString = - new ApplicationRequestJsonMarshaller().marshall(applicationRequest); - String request = new OpenshiftEnvelopeFactory(user.getPassword(), applicationRequestString).createString(); - String response = createHttpClient(id, url).post(request); - - response = JsonSanitizer.sanitize(response); - OpenshiftResponse<String> openshiftResponse = - new ApplicationStatusResponseUnmarshaller().unmarshall(response); - return openshiftResponse.getOpenshiftObject(); - } catch (MalformedURLException e) { - throw new OpenshiftException( - e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", - applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); - } catch (UnauthorizedException e) { - throw new InvalidCredentialsOpenshiftException(url, e); - } catch (NotFoundException e) { - throw new NotFoundOpenshiftException(url, e); - } catch (HttpClientException e) { - throw new OpenshiftEndpointException( - url, e, "Could not {0} application \"{1}\" at \"{2}\"", - applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); - } - } - - protected Application requestApplicationAction(ApplicationRequest applicationRequest, InternalUser user) - throws OpenshiftException { - String url = applicationRequest.getUrlString(getServiceUrl()); - try { - String applicationRequestString = - new ApplicationRequestJsonMarshaller().marshall(applicationRequest); - String request = new OpenshiftEnvelopeFactory(user.getPassword(), applicationRequestString).createString(); - String response = createHttpClient(id, url).post(request); - - response = JsonSanitizer.sanitize(response); - OpenshiftResponse<Application> openshiftResponse = - new ApplicationResponseUnmarshaller(applicationRequest.getName(), - applicationRequest.getCartridge(), user, this).unmarshall(response); - return openshiftResponse.getOpenshiftObject(); - } catch (MalformedURLException e) { - throw new OpenshiftException( - e, "Could not {0} application \"{1}\" at \"{2}\": Invalid url \"{2}\"", - applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); - } catch (UnauthorizedException e) { - throw new InvalidCredentialsOpenshiftException(url, e); - } catch (NotFoundException e) { - throw new NotFoundOpenshiftException(url, e); - } catch (HttpClientException e) { - throw new OpenshiftEndpointException( - url, e, "Could not {0} application \"{1}\" at \"{2}\"", - applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url); - } - } - - private IHttpClient createHttpClient(String id, String url) throws MalformedURLException { - String userAgent = MessageFormat.format(USERAGENT_FORMAT, VERSION, id); - return new UrlConnectionHttpClient(userAgent, new URL(url)); - } -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHKeyPair.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHKeyPair.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHKeyPair.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.client; -import org.jboss.tools.openshift.express.internal.client.OpenshiftCoreActivator; +import org.jboss.tools.openshift.express.internal.client.OpenShiftCoreActivator; import org.jboss.tools.openshift.express.internal.client.utils.Base64Encoder; import com.jcraft.jsch.JSch; @@ -36,7 +36,7 @@ private String publicKeyPath; - private SSHKeyPair(KeyPair keyPair, String privateKeyPath, String publicKeyPath) throws OpenshiftException { + private SSHKeyPair(KeyPair keyPair, String privateKeyPath, String publicKeyPath) throws OpenShiftException { this.keyPair = keyPair; this.privateKeyPath = privateKeyPath; this.publicKeyPath = publicKeyPath; @@ -53,19 +53,19 @@ * @param publicKeyPath * the path where the new public key gets stored * @return - * @throws OpenshiftException + * @throws OpenShiftException * if the key could not be created */ public static SSHKeyPair create(String passPhrase, String privateKeyPath, String publicKeyPath) - throws OpenshiftException { + throws OpenShiftException { try { KeyPair keyPair = KeyPair.genKeyPair(new JSch(), KeyPair.RSA, KEYLENGTH); keyPair.setPassphrase(passPhrase); - keyPair.writePublicKey(publicKeyPath, "created by " + OpenshiftCoreActivator.PLUGIN_ID); + keyPair.writePublicKey(publicKeyPath, "created by " + OpenShiftCoreActivator.PLUGIN_ID); keyPair.writePrivateKey(privateKeyPath); return new SSHKeyPair(keyPair, privateKeyPath, publicKeyPath); } catch (Exception e) { - throw new OpenshiftException(e, "Could not create new rsa key", e); + throw new OpenShiftException(e, "Could not create new rsa key", e); } } @@ -77,19 +77,19 @@ * @param publicKeyPath * the path to the public key * @return - * @throws OpenshiftException + * @throws OpenShiftException */ public static SSHKeyPair load(String privateKeyPath, String publicKeyPath) - throws OpenshiftException { + throws OpenShiftException { try { KeyPair keyPair = KeyPair.load(new JSch(), privateKeyPath, publicKeyPath); return new SSHKeyPair(keyPair, privateKeyPath, publicKeyPath); } catch (JSchException e) { - throw new OpenshiftException(e, "Could not create new rsa key"); + throw new OpenShiftException(e, "Could not create new rsa key"); } } - public String getPublicKey() throws OpenshiftException { + public String getPublicKey() throws OpenShiftException { return new String(Base64Encoder.encode(keyPair.getPublicKeyBlob())); } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHPublicKey.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHPublicKey.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/SSHPublicKey.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -28,7 +28,7 @@ private String publicKey; - public SSHPublicKey(File publicKeyFilePath) throws IOException, OpenshiftException { + public SSHPublicKey(File publicKeyFilePath) throws IOException, OpenShiftException { this.publicKey = extractPublicKey(publicKeyFilePath); } @@ -36,12 +36,12 @@ this.publicKey = publicKey; } - private String extractPublicKey(File file) throws OpenshiftException, FileNotFoundException, IOException { + private String extractPublicKey(File file) throws OpenShiftException, FileNotFoundException, IOException { String keyWithIdAndComment = StreamUtils.readToString(new FileReader(file)); Matcher matcher = PUBLICKEY_PATTERN.matcher(keyWithIdAndComment); if (!matcher.find() || matcher.groupCount() < 1) { - throw new OpenshiftException("Could not load public key from file \"{0}\"", file.getAbsolutePath()); + throw new OpenShiftException("Could not load public key from file \"{0}\"", file.getAbsolutePath()); } return matcher.group(1); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/UserConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/UserConfiguration.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/UserConfiguration.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -33,15 +33,15 @@ private Properties properties; protected File file; - public UserConfiguration() throws OpenshiftException, IOException { + public UserConfiguration() throws OpenShiftException, IOException { this.file = getUserConfigurationFile(); this.properties = getUserProperties(file); } - protected File getUserConfigurationFile() throws OpenshiftException, IOException { + protected File getUserConfigurationFile() throws OpenShiftException, IOException { String userHome = System.getProperty(PROPERTY_USERHOME); if (userHome == null) { - throw new OpenshiftException("Could not read user configuration: user home directory not found"); + throw new OpenShiftException("Could not read user configuration: user home directory not found"); } return new File(userHome + File.separatorChar + CONFIGURATION_FOLDER, CONFIGURATION_FILE); } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -17,8 +17,8 @@ import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; /** * @author André Dietisheim @@ -30,16 +30,16 @@ private String name; private ICartridge cartridge; - private IOpenshiftService service; + private IOpenShiftService service; private ApplicationLogReader logReader; private ApplicationInfo applicationInfo; - public Application(String name, ICartridge cartridge, InternalUser user, IOpenshiftService service) { + public Application(String name, ICartridge cartridge, InternalUser user, IOpenShiftService service) { this(name, cartridge, null, user, service); } public Application(String name, ICartridge cartridge, ApplicationInfo applicationInfo, InternalUser user, - IOpenshiftService service) { + IOpenShiftService service) { super(user); this.name = name; this.cartridge = cartridge; @@ -52,7 +52,7 @@ } @Override - public String getUUID() throws OpenshiftException { + public String getUUID() throws OpenShiftException { return getApplicationInfo().getUuid(); } @@ -62,41 +62,41 @@ } @Override - public String getEmbedded() throws OpenshiftException { + public String getEmbedded() throws OpenShiftException { return getApplicationInfo().getEmbedded(); } @Override - public Date getCreationTime() throws OpenshiftException { + public Date getCreationTime() throws OpenShiftException { ApplicationInfo applicationInfo = getApplicationInfo(); if (applicationInfo == null) { - throw new OpenshiftException("Could not find info for application {0}", getName()); + throw new OpenShiftException("Could not find info for application {0}", getName()); } return applicationInfo.getCreationTime(); } @Override - public void destroy() throws OpenshiftException { + public void destroy() throws OpenShiftException { service.destroyApplication(name, cartridge, getUser()); } @Override - public void start() throws OpenshiftException { + public void start() throws OpenShiftException { service.startApplication(name, cartridge, getUser()); } @Override - public void restart() throws OpenshiftException { + public void restart() throws OpenShiftException { service.restartApplication(name, cartridge, getUser()); } @Override - public void stop() throws OpenshiftException { + public void stop() throws OpenShiftException { service.stopApplication(name, cartridge, getUser()); } @Override - public ApplicationLogReader getLogReader() throws OpenshiftException { + public ApplicationLogReader getLogReader() throws OpenShiftException { if (logReader == null) { this.logReader = new ApplicationLogReader(this, getUser(), service); } @@ -104,7 +104,7 @@ } @Override - public String getGitUri() throws OpenshiftException { + public String getGitUri() throws OpenShiftException { IDomain domain = getUser().getDomain(); if (domain == null) { return null; @@ -114,7 +114,7 @@ } @Override - public String getApplicationUrl() throws OpenshiftException { + public String getApplicationUrl() throws OpenShiftException { IDomain domain = getUser().getDomain(); if (domain == null) { return null; @@ -122,11 +122,11 @@ return MessageFormat.format(APPLICATION_URL_PATTERN, name, domain.getNamespace(), domain.getRhcDomain()); } - protected IOpenshiftService getService() { + protected IOpenShiftService getService() { return service; } - protected ApplicationInfo getApplicationInfo() throws OpenshiftException { + protected ApplicationInfo getApplicationInfo() throws OpenShiftException { if (applicationInfo == null) { this.applicationInfo = getUserInfo().getApplicationInfoByName(getName()); } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Domain.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Domain.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Domain.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -11,8 +11,8 @@ package org.jboss.tools.openshift.express.internal.client; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; /** @@ -21,13 +21,13 @@ public class Domain extends UserInfoAware implements IDomain { private String namespace; - private IOpenshiftService service; + private IOpenShiftService service; - public Domain(String namespace, InternalUser user, IOpenshiftService service) { + public Domain(String namespace, InternalUser user, IOpenShiftService service) { this(namespace, null, user, service); } - public Domain(String namespace, String rhcDomain, InternalUser user, IOpenshiftService service) { + public Domain(String namespace, String rhcDomain, InternalUser user, IOpenShiftService service) { super(user); this.namespace = namespace; this.service = service; @@ -39,12 +39,12 @@ } @Override - public String getRhcDomain() throws OpenshiftException { + public String getRhcDomain() throws OpenShiftException { return getUserInfo().getRhcDomain(); } @Override - public void setNamespace(String namespace) throws OpenshiftException { + public void setNamespace(String namespace) throws OpenShiftException { InternalUser user = getUser(); IDomain domain = service.changeDomain(namespace, user.getSshKey(), user); update(domain); Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenShiftJsonConstants.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenshiftJsonConstants.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenShiftJsonConstants.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenShiftJsonConstants.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client; + +/** + * @author André Dietisheim + */ +public class IOpenShiftJsonConstants { + + public static final String PROPERTY_DEBUG = "debug"; + public static final String PROPERTY_RHLOGIN = "rhlogin"; + + public static final String PROPERTY_CART_TYPE = "cart_type"; + + public static final String PROPERTY_MESSAGES = "messages"; + public static final String PROPERTY_RESULT = "result"; + public static final String PROPERTY_EXIT_CODE = "exit_code"; + public static final String PROPERTY_DATA = "data"; + public static final String PROPERTY_APP_NAME = "app_name"; + public static final String PROPERTY_ACTION = "action"; + public static final String PROPERTY_CARTRIDGE = "cartridge"; + public static final String PROPERTY_CARTS = "carts"; + public static final String PROPERTY_NAMESPACE = "namespace"; + public static final String PROPERTY_ALTER = "alter"; + public static final String PROPERTY_SSH = "ssh"; + public static final String PROPERTY_UUID = "uuid"; + public static final String PROPERTY_USER_INFO = "user_info"; + public static final String PROPERTY_APP_INFO = "app_info"; + public static final String PROPERTY_RHC_DOMAIN = "rhc_domain"; + public static final String PROPERTY_EMBEDDED = "embedded"; + public static final String PROPERTY_FRAMEWORK = "framework"; + public static final String PROPERTY_CREATION_TIME = "creation_time"; + public static final String PROPERTY_SSH_KEY = "ssh_key"; + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenShiftJsonConstants.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenshiftJsonConstants.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenshiftJsonConstants.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/IOpenshiftJsonConstants.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client; - -/** - * @author André Dietisheim - */ -public class IOpenshiftJsonConstants { - - public static final String PROPERTY_DEBUG = "debug"; - public static final String PROPERTY_RHLOGIN = "rhlogin"; - - public static final String PROPERTY_CART_TYPE = "cart_type"; - - public static final String PROPERTY_MESSAGES = "messages"; - public static final String PROPERTY_RESULT = "result"; - public static final String PROPERTY_EXIT_CODE = "exit_code"; - public static final String PROPERTY_DATA = "data"; - public static final String PROPERTY_APP_NAME = "app_name"; - public static final String PROPERTY_ACTION = "action"; - public static final String PROPERTY_CARTRIDGE = "cartridge"; - public static final String PROPERTY_CARTS = "carts"; - public static final String PROPERTY_NAMESPACE = "namespace"; - public static final String PROPERTY_ALTER = "alter"; - public static final String PROPERTY_SSH = "ssh"; - public static final String PROPERTY_UUID = "uuid"; - public static final String PROPERTY_USER_INFO = "user_info"; - public static final String PROPERTY_APP_INFO = "app_info"; - public static final String PROPERTY_RHC_DOMAIN = "rhc_domain"; - public static final String PROPERTY_EMBEDDED = "embedded"; - public static final String PROPERTY_FRAMEWORK = "framework"; - public static final String PROPERTY_CREATION_TIME = "creation_time"; - public static final String PROPERTY_SSH_KEY = "ssh_key"; - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -19,13 +19,13 @@ import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IOpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; import org.jboss.tools.openshift.express.client.ISSHPublicKey; import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenshiftException; -import org.jboss.tools.openshift.express.client.NotFoundOpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenShiftException; +import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.UserConfiguration; /** @@ -41,29 +41,29 @@ private List<ICartridge> cartridges; private List<IApplication> applications = new ArrayList<IApplication>(); - private IOpenshiftService service; + private IOpenShiftService service; - public InternalUser(String password, String id) throws OpenshiftException, IOException { + public InternalUser(String password, String id) throws OpenShiftException, IOException { this(new UserConfiguration(), password, id); } public InternalUser(UserConfiguration configuration, String password, String id) { - this(configuration.getRhlogin(), password, (ISSHPublicKey) null, new OpenshiftService(id)); + this(configuration.getRhlogin(), password, (ISSHPublicKey) null, new OpenShiftService(id)); } public InternalUser(String rhlogin, String password, String id) { - this(rhlogin, password, (ISSHPublicKey) null, new OpenshiftService(id)); + this(rhlogin, password, (ISSHPublicKey) null, new OpenShiftService(id)); } public InternalUser(String rhlogin, String password, String id, String url) { - this(rhlogin, password, (ISSHPublicKey) null, new OpenshiftService(id, url)); + this(rhlogin, password, (ISSHPublicKey) null, new OpenShiftService(id, url)); } - public InternalUser(String rhlogin, String password, IOpenshiftService service) { + public InternalUser(String rhlogin, String password, IOpenShiftService service) { this(rhlogin, password, (ISSHPublicKey) null, service); } - public InternalUser(String rhlogin, String password, ISSHPublicKey sshKey, IOpenshiftService service) { + public InternalUser(String rhlogin, String password, ISSHPublicKey sshKey, IOpenShiftService service) { this.rhlogin = rhlogin; this.password = password; this.sshKey = sshKey; @@ -71,23 +71,23 @@ } @Override - public boolean isValid() throws OpenshiftException { + public boolean isValid() throws OpenShiftException { try { return service.isValid(this); - } catch (InvalidCredentialsOpenshiftException e) { + } catch (InvalidCredentialsOpenShiftException e) { return false; } } @Override - public IDomain createDomain(String name, ISSHPublicKey key) throws OpenshiftException { + public IDomain createDomain(String name, ISSHPublicKey key) throws OpenShiftException { setSshKey(key); this.domain = getService().createDomain(name, key, this); return domain; } @Override - public IDomain getDomain() throws OpenshiftException { + public IDomain getDomain() throws OpenShiftException { if (domain == null) { try { this.domain = new Domain( @@ -95,14 +95,14 @@ , getUserInfo().getRhcDomain() , this , service); - } catch (NotFoundOpenshiftException e) { + } catch (NotFoundOpenShiftException e) { return null; } } return domain; } - public boolean hasDomain() throws OpenshiftException { + public boolean hasDomain() throws OpenShiftException { return getDomain() != null; } @@ -111,7 +111,7 @@ } @Override - public ISSHPublicKey getSshKey() throws OpenshiftException { + public ISSHPublicKey getSshKey() throws OpenShiftException { if (sshKey == null) { this.sshKey = getUserInfo().getSshPublicKey(); } @@ -129,12 +129,12 @@ } @Override - public String getUUID() throws OpenshiftException { + public String getUUID() throws OpenShiftException { return getUserInfo().getUuid(); } @Override - public List<ICartridge> getCartridges() throws OpenshiftException { + public List<ICartridge> getCartridges() throws OpenShiftException { if (cartridges == null) { this.cartridges = service.getCartridges(this); } @@ -142,7 +142,7 @@ } @Override - public ICartridge getCartridgeByName(String name) throws OpenshiftException { + public ICartridge getCartridgeByName(String name) throws OpenShiftException { ICartridge matchingCartridge = null; for(ICartridge cartridge : getCartridges()) { if (name.equals(cartridge.getName())) { @@ -154,14 +154,14 @@ } @Override - public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException { + public IApplication createApplication(String name, ICartridge cartridge) throws OpenShiftException { IApplication application = service.createApplication(name, cartridge, this); add(application); return application; } @Override - public Collection<IApplication> getApplications() throws OpenshiftException { + public Collection<IApplication> getApplications() throws OpenShiftException { if (getUserInfo().getApplicationInfos().size() > applications.size()) { update(getUserInfo().getApplicationInfos()); } @@ -169,7 +169,7 @@ } @Override - public IApplication getApplicationByName(String name) throws OpenshiftException { + public IApplication getApplicationByName(String name) throws OpenShiftException { return getApplicationByName(name, getApplications()); } @@ -195,12 +195,12 @@ this.sshKey = key; } - protected UserInfo refreshUserInfo() throws OpenshiftException { + protected UserInfo refreshUserInfo() throws OpenShiftException { this.userInfo = null; return getUserInfo(); } - protected UserInfo getUserInfo() throws OpenshiftException { + protected UserInfo getUserInfo() throws OpenShiftException { if (userInfo == null) { this.userInfo = service.getUserInfo(this); } @@ -208,7 +208,7 @@ } @Override - public void refresh() throws OpenshiftException { + public void refresh() throws OpenShiftException { this.domain = null; this.sshKey = null; getUserInfo(); @@ -230,7 +230,7 @@ , this, service); } - protected IOpenshiftService getService() { + protected IOpenShiftService getService() { return service; } } Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenShiftCoreActivator.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenshiftCoreActivator.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenShiftCoreActivator.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenShiftCoreActivator.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OpenShiftCoreActivator implements BundleActivator { + + public static final String PLUGIN_ID = "org.jboss.tools.openshift.express.client"; + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + public void start(BundleContext bundleContext) throws Exception { + OpenShiftCoreActivator.context = bundleContext; + } + + public void stop(BundleContext bundleContext) throws Exception { + OpenShiftCoreActivator.context = null; + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenShiftCoreActivator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenshiftCoreActivator.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenshiftCoreActivator.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/OpenshiftCoreActivator.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class OpenshiftCoreActivator implements BundleActivator { - - public static final String PLUGIN_ID = "org.jboss.tools.openshift.express.client"; - - private static BundleContext context; - - static BundleContext getContext() { - return context; - } - - public void start(BundleContext bundleContext) throws Exception { - OpenshiftCoreActivator.context = bundleContext; - } - - public void stop(BundleContext bundleContext) throws Exception { - OpenshiftCoreActivator.context = null; - } -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/UserInfoAware.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/UserInfoAware.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/UserInfoAware.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.client; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; public class UserInfoAware { @@ -21,7 +21,7 @@ this.user = user; } - protected UserInfo getUserInfo() throws OpenshiftException { + protected UserInfo getUserInfo() throws OpenShiftException { if (userInfo == null) { this.userInfo = user.refreshUserInfo(); } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractDomainRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractDomainRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -16,7 +16,7 @@ /** * @author André Dietisheim */ -public abstract class AbstractDomainRequest extends AbstractOpenshiftRequest { +public abstract class AbstractDomainRequest extends AbstractOpenShiftRequest { private String name; private ISSHPublicKey sshKey; Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenShiftRequest.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenshiftRequest.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenShiftRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenShiftRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.request; + +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.tools.openshift.express.internal.client.utils.UrlBuilder; + +/** + * @author André Dietisheim + */ +public abstract class AbstractOpenShiftRequest implements IOpenShiftRequest { + + private String rhlogin; + private boolean debug; + + public AbstractOpenShiftRequest(String username) { + this(username, false); + } + + public AbstractOpenShiftRequest(String username, boolean debug) { + this.rhlogin = username; + this.debug = debug; + } + + public String getRhLogin() { + return rhlogin; + } + + public boolean isDebug() { + return debug; + } + + public URL getUrl(String baseUrl) throws MalformedURLException { + return new UrlBuilder(baseUrl).path(getResourcePath()).toUrl(); + } + + public String getUrlString(String baseUrl) { + return new UrlBuilder(baseUrl).path(getResourcePath()).toString(); + } + + protected abstract String getResourcePath(); + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenShiftRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenshiftRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/AbstractOpenshiftRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.request; - -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.tools.openshift.express.internal.client.utils.UrlBuilder; - -/** - * @author André Dietisheim - */ -public abstract class AbstractOpenshiftRequest implements IOpenshiftRequest { - - private String rhlogin; - private boolean debug; - - public AbstractOpenshiftRequest(String username) { - this(username, false); - } - - public AbstractOpenshiftRequest(String username, boolean debug) { - this.rhlogin = username; - this.debug = debug; - } - - public String getRhLogin() { - return rhlogin; - } - - public boolean isDebug() { - return debug; - } - - public URL getUrl(String baseUrl) throws MalformedURLException { - return new UrlBuilder(baseUrl).path(getResourcePath()).toUrl(); - } - - public String getUrlString(String baseUrl) { - return new UrlBuilder(baseUrl).path(getResourcePath()).toString(); - } - - protected abstract String getResourcePath(); - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ApplicationRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ApplicationRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ApplicationRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -15,7 +15,7 @@ /** * @author André Dietisheim */ -public class ApplicationRequest extends AbstractOpenshiftRequest { +public class ApplicationRequest extends AbstractOpenShiftRequest { private String name; private ICartridge cartridge ; Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequest.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequest.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.request; + +/** + * @author André Dietisheim + */ +public interface IOpenShiftRequest { + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequestFactory.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequestFactory.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequestFactory.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequestFactory.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.request; + +import org.jboss.tools.openshift.express.client.OpenShiftException; + +/** + * @author André Dietisheim + */ +public interface IOpenShiftRequestFactory { + + /** + * Creates an request String that may be sent to the openshift server + * @return + * @throws OpenShiftException + */ + public String createString() throws OpenShiftException; + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenShiftRequestFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.request; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftRequest { - -} Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequestFactory.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequestFactory.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/IOpenshiftRequestFactory.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.request; - -import org.jboss.tools.openshift.express.client.OpenshiftException; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftRequestFactory { - - /** - * Creates an request String that may be sent to the openshift server - * @return - * @throws OpenshiftException - */ - public String createString() throws OpenshiftException; - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ListCartridgesRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ListCartridgesRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/ListCartridgesRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -13,7 +13,7 @@ /** * @author André Dietisheim */ -public class ListCartridgesRequest extends AbstractOpenshiftRequest { +public class ListCartridgesRequest extends AbstractOpenShiftRequest { private static final String CART_TYPE_STANDALONE = "standalone"; Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenShiftEnvelopeFactory.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenshiftEnvelopeFactory.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenShiftEnvelopeFactory.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenShiftEnvelopeFactory.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.request; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +import org.jboss.tools.openshift.express.client.OpenShiftException; + +/** + * A factory that creates the json string that the openshift rest service + * would consume. + * + * @author André Dietisheim + */ +public class OpenShiftEnvelopeFactory implements IOpenShiftRequestFactory { + + private static final char EQ = '='; + private static final String PROPERTY_PASSWORD = "password"; + private static final String PROPERTY_JSON_DATA = "json_data"; + private static final String DATA_ENCODING = "UTF-8"; + private static final char AMP = '&'; + + private String[] payloads; + private String password; + + public OpenShiftEnvelopeFactory(String password, String... payloads) { + this.password = password; + this.payloads = payloads; + } + + public String createString() throws OpenShiftException { + try { + StringBuilder builder = new StringBuilder(); + appendPassword(builder); + builder.append(AMP); + appendPayload(builder); + return builder.toString(); + } catch (UnsupportedEncodingException e) { + throw new OpenShiftException(e, "Could not create request"); + } + } + + private void appendPassword(StringBuilder builder) throws UnsupportedEncodingException { + builder.append(PROPERTY_PASSWORD) + .append(EQ) + .append(URLEncoder.encode(password, DATA_ENCODING)); + } + + private void appendPayload(StringBuilder builder) throws UnsupportedEncodingException { + StringBuilder payloadBuilder = new StringBuilder(); + for (int i = 0; i < payloads.length; i++) { + if (i > 0 + && i < payloads.length + 1) { + payloadBuilder.append(AMP); + } + payloadBuilder.append(payloads[i]); + } + + if (builder.length() > 0) { + builder + .append(PROPERTY_JSON_DATA) + .append(EQ) + .append(URLEncoder.encode(payloadBuilder.toString(), DATA_ENCODING)); + } + + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenShiftEnvelopeFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenshiftEnvelopeFactory.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenshiftEnvelopeFactory.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/OpenshiftEnvelopeFactory.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.request; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - -import org.jboss.tools.openshift.express.client.OpenshiftException; - -/** - * A factory that creates the json string that the openshift rest service - * would consume. - * - * @author André Dietisheim - */ -public class OpenshiftEnvelopeFactory implements IOpenshiftRequestFactory { - - private static final char EQ = '='; - private static final String PROPERTY_PASSWORD = "password"; - private static final String PROPERTY_JSON_DATA = "json_data"; - private static final String DATA_ENCODING = "UTF-8"; - private static final char AMP = '&'; - - private String[] payloads; - private String password; - - public OpenshiftEnvelopeFactory(String password, String... payloads) { - this.password = password; - this.payloads = payloads; - } - - public String createString() throws OpenshiftException { - try { - StringBuilder builder = new StringBuilder(); - appendPassword(builder); - builder.append(AMP); - appendPayload(builder); - return builder.toString(); - } catch (UnsupportedEncodingException e) { - throw new OpenshiftException(e, "Could not create request"); - } - } - - private void appendPassword(StringBuilder builder) throws UnsupportedEncodingException { - builder.append(PROPERTY_PASSWORD) - .append(EQ) - .append(URLEncoder.encode(password, DATA_ENCODING)); - } - - private void appendPayload(StringBuilder builder) throws UnsupportedEncodingException { - StringBuilder payloadBuilder = new StringBuilder(); - for (int i = 0; i < payloads.length; i++) { - if (i > 0 - && i < payloads.length + 1) { - payloadBuilder.append(AMP); - } - payloadBuilder.append(payloads[i]); - } - - if (builder.length() > 0) { - builder - .append(PROPERTY_JSON_DATA) - .append(EQ) - .append(URLEncoder.encode(payloadBuilder.toString(), DATA_ENCODING)); - } - - } -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/UserInfoRequest.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/UserInfoRequest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/UserInfoRequest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -13,7 +13,7 @@ /** * @author André Dietisheim */ -public class UserInfoRequest extends AbstractOpenshiftRequest { +public class UserInfoRequest extends AbstractOpenShiftRequest { public UserInfoRequest(String username) { this(username, false); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractJsonMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractJsonMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -11,25 +11,25 @@ package org.jboss.tools.openshift.express.internal.client.request.marshalling; import org.jboss.dmr.ModelNode; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; -import org.jboss.tools.openshift.express.internal.client.request.AbstractOpenshiftRequest; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.request.AbstractOpenShiftRequest; /** * @author André Dietisheim */ -public abstract class AbstractJsonMarshaller<REQUEST extends AbstractOpenshiftRequest> implements - IOpenshiftMarshaller<REQUEST> { +public abstract class AbstractJsonMarshaller<REQUEST extends AbstractOpenShiftRequest> implements + IOpenShiftMarshaller<REQUEST> { - public String marshall(REQUEST request) throws OpenshiftException { + public String marshall(REQUEST request) throws OpenShiftException { ModelNode node = new ModelNode(); - setStringProperty(IOpenshiftJsonConstants.PROPERTY_RHLOGIN, request.getRhLogin(), node); - setStringProperty(IOpenshiftJsonConstants.PROPERTY_DEBUG, String.valueOf(request.isDebug()), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_RHLOGIN, request.getRhLogin(), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_DEBUG, String.valueOf(request.isDebug()), node); setJsonDataProperties(node, request); return node.toJSONString(true); } - protected void setJsonDataProperties(ModelNode node, REQUEST request) throws OpenshiftException { + protected void setJsonDataProperties(ModelNode node, REQUEST request) throws OpenShiftException { // empty default implementation } Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenShiftMarshaller.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenshiftMarshaller.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenShiftMarshaller.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenShiftMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,17 @@ +package org.jboss.tools.openshift.express.internal.client.request.marshalling; + +import org.jboss.tools.openshift.express.internal.client.request.IOpenShiftRequest; + + +public abstract class AbstractOpenShiftMarshaller<REQUEST extends IOpenShiftRequest> implements IOpenShiftMarshaller<REQUEST> { + + @Override + public String marshall(REQUEST object) { + StringBuilder builder = new StringBuilder(); + append(builder); + return builder.toString(); + } + + protected abstract void append(StringBuilder builder); + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenShiftMarshaller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenshiftMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/AbstractOpenshiftMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,17 +0,0 @@ -package org.jboss.tools.openshift.express.internal.client.request.marshalling; - -import org.jboss.tools.openshift.express.internal.client.request.IOpenshiftRequest; - - -public abstract class AbstractOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> { - - @Override - public String marshall(REQUEST object) { - StringBuilder builder = new StringBuilder(); - append(builder); - return builder.toString(); - } - - protected abstract void append(StringBuilder builder); - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ApplicationRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ApplicationRequestJsonMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ApplicationRequestJsonMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -12,7 +12,7 @@ import org.jboss.dmr.ModelNode; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; import org.jboss.tools.openshift.express.internal.client.request.ApplicationAction; import org.jboss.tools.openshift.express.internal.client.request.ApplicationRequest; @@ -23,9 +23,9 @@ @Override protected void setJsonDataProperties(ModelNode node, ApplicationRequest request) { - setStringProperty(IOpenshiftJsonConstants.PROPERTY_CARTRIDGE, getCartridgeName(request.getCartridge()), node); - setStringProperty(IOpenshiftJsonConstants.PROPERTY_ACTION, getActionName(request.getAction()), node); - setStringProperty(IOpenshiftJsonConstants.PROPERTY_APP_NAME, request.getName(), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_CARTRIDGE, getCartridgeName(request.getCartridge()), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_ACTION, getActionName(request.getAction()), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_APP_NAME, request.getName(), node); } private String getCartridgeName(ICartridge cartridge) { Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/DomainRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/DomainRequestJsonMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/DomainRequestJsonMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -11,8 +11,8 @@ package org.jboss.tools.openshift.express.internal.client.request.marshalling; import org.jboss.dmr.ModelNode; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; import org.jboss.tools.openshift.express.internal.client.request.AbstractDomainRequest; /** @@ -21,9 +21,9 @@ public class DomainRequestJsonMarshaller extends AbstractJsonMarshaller<AbstractDomainRequest> { @Override - protected void setJsonDataProperties(ModelNode node, AbstractDomainRequest request) throws OpenshiftException { - node.get(IOpenshiftJsonConstants.PROPERTY_NAMESPACE).set(request.getName()); - node.get(IOpenshiftJsonConstants.PROPERTY_ALTER).set(String.valueOf(request.isAlter())); - node.get(IOpenshiftJsonConstants.PROPERTY_SSH).set(request.getSshKey().getPublicKey()); + protected void setJsonDataProperties(ModelNode node, AbstractDomainRequest request) throws OpenShiftException { + node.get(IOpenShiftJsonConstants.PROPERTY_NAMESPACE).set(request.getName()); + node.get(IOpenShiftJsonConstants.PROPERTY_ALTER).set(String.valueOf(request.isAlter())); + node.get(IOpenShiftJsonConstants.PROPERTY_SSH).set(request.getSshKey().getPublicKey()); } } Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenShiftMarshaller.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenshiftMarshaller.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenShiftMarshaller.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenShiftMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.request.marshalling; + +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.client.request.IOpenShiftRequest; + +/** + * @author André Dietisheim + */ +public interface IOpenShiftMarshaller<REQUEST extends IOpenShiftRequest> { + + public String marshall(REQUEST object) throws OpenShiftException; + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenShiftMarshaller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenshiftMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/IOpenshiftMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.request.marshalling; - -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.client.request.IOpenshiftRequest; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> { - - public String marshall(REQUEST object) throws OpenshiftException; - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ListCartridgesRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/request/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -11,7 +11,7 @@ package org.jboss.tools.openshift.express.internal.client.request.marshalling; import org.jboss.dmr.ModelNode; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; import org.jboss.tools.openshift.express.internal.client.request.ListCartridgesRequest; /** @@ -21,6 +21,6 @@ @Override protected void setJsonDataProperties(ModelNode node, ListCartridgesRequest request) { - setStringProperty(IOpenshiftJsonConstants.PROPERTY_CART_TYPE, request.getCartType(), node); + setStringProperty(IOpenShiftJsonConstants.PROPERTY_CART_TYPE, request.getCartType(), node); } } Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenShiftResponse.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenshiftResponse.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenShiftResponse.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenShiftResponse.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.response; + + +/** + * @author André Dietisheim + */ +public class OpenShiftResponse<OPENSHIFTOBJECT> { + + private boolean debug; + private String messages; + private String result; + private OPENSHIFTOBJECT openshiftObject; + private int exitCode; + + public OpenShiftResponse(boolean debug, String messages, String result, OPENSHIFTOBJECT openshiftObject, int exitCode) { + this.debug = debug; + this.messages = messages; + this.result = result; + this.openshiftObject = openshiftObject; + this.exitCode = exitCode; + } + + public boolean isDebug() { + return debug; + } + + public String getMessages() { + return messages; + } + + public String getResult() { + return result; + } + + public OPENSHIFTOBJECT getOpenShiftObject() { + return openshiftObject; + } + + public int getExitCode() { + return exitCode; + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenShiftResponse.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenshiftResponse.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenshiftResponse.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/OpenshiftResponse.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.response; - - -/** - * @author André Dietisheim - */ -public class OpenshiftResponse<OPENSHIFTOBJECT> { - - private boolean debug; - private String messages; - private String result; - private OPENSHIFTOBJECT openshiftObject; - private int exitCode; - - public OpenshiftResponse(boolean debug, String messages, String result, OPENSHIFTOBJECT openshiftObject, int exitCode) { - this.debug = debug; - this.messages = messages; - this.result = result; - this.openshiftObject = openshiftObject; - this.exitCode = exitCode; - } - - public boolean isDebug() { - return debug; - } - - public String getMessages() { - return messages; - } - - public String getResult() { - return result; - } - - public OPENSHIFTOBJECT getOpenshiftObject() { - return openshiftObject; - } - - public int getExitCode() { - return exitCode; - } -} Copied: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenShiftJsonResponseUnmarshaller.java (from rev 35747, trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenshiftJsonResponseUnmarshaller.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenShiftJsonResponseUnmarshaller.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenShiftJsonResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.response.unmarshalling; + +import java.util.Date; + +import javax.xml.datatype.DatatypeConfigurationException; + +import org.jboss.dmr.ModelNode; +import org.jboss.dmr.ModelType; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; + +/** + * @author André Dietisheim + */ +public abstract class AbstractOpenShiftJsonResponseUnmarshaller<OPENSHIFTOBJECT> { + + private String response; + + public OpenShiftResponse<OPENSHIFTOBJECT> unmarshall(String response) throws OpenShiftException { + try { + ModelNode node = ModelNode.fromJSONString(response); + boolean debug = node.get(IOpenShiftJsonConstants.PROPERTY_DEBUG).asBoolean(); + String messages = getString(IOpenShiftJsonConstants.PROPERTY_MESSAGES, node); + String result = getString(IOpenShiftJsonConstants.PROPERTY_RESULT, node); + int exitCode = node.get(IOpenShiftJsonConstants.PROPERTY_EXIT_CODE).asInt(); + OPENSHIFTOBJECT openshiftObject = createOpenShiftObject(node); + return new OpenShiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode); + } catch (IllegalArgumentException e) { + throw new OpenShiftException(e, "Could not parse response \"{0}\"", response); + } catch (Exception e) { + throw new OpenShiftException(e, "Could not unmarshall response \"{0}\"", response); + } + } + + protected abstract OPENSHIFTOBJECT createOpenShiftObject(ModelNode responseNode) throws Exception; + + protected String getResponse() { + return response; + } + + protected String getString(String property, ModelNode node) { + ModelNode propertyNode = node.get(property); + if (!isSet(propertyNode)) { + // replace "undefined" by null + return null; + } + return propertyNode.asString(); + } + + protected boolean isSet(ModelNode node) { + return node != null + && node.getType() != ModelType.UNDEFINED; + } + + protected Date getDate(String property, ModelNode node) throws DatatypeConfigurationException { + ModelNode propertyNode = node.get(property); + return RFC822DateUtils.getDate(propertyNode.asString()); + } + + protected long getLong(String property, ModelNode node) { + ModelNode propertyNode = node.get(property); + return propertyNode.asLong(-1); + } +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenShiftJsonResponseUnmarshaller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenshiftJsonResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.response.unmarshalling; - -import java.util.Date; - -import javax.xml.datatype.DatatypeConfigurationException; - -import org.jboss.dmr.ModelNode; -import org.jboss.dmr.ModelType; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; - -/** - * @author André Dietisheim - */ -public abstract class AbstractOpenshiftJsonResponseUnmarshaller<OPENSHIFTOBJECT> { - - private String response; - - public OpenshiftResponse<OPENSHIFTOBJECT> unmarshall(String response) throws OpenshiftException { - try { - ModelNode node = ModelNode.fromJSONString(response); - boolean debug = node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).asBoolean(); - String messages = getString(IOpenshiftJsonConstants.PROPERTY_MESSAGES, node); - String result = getString(IOpenshiftJsonConstants.PROPERTY_RESULT, node); - int exitCode = node.get(IOpenshiftJsonConstants.PROPERTY_EXIT_CODE).asInt(); - OPENSHIFTOBJECT openshiftObject = createOpenshiftObject(node); - return new OpenshiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode); - } catch (IllegalArgumentException e) { - throw new OpenshiftException(e, "Could not parse response \"{0}\"", response); - } catch (Exception e) { - throw new OpenshiftException(e, "Could not unmarshall response \"{0}\"", response); - } - } - - protected abstract OPENSHIFTOBJECT createOpenshiftObject(ModelNode responseNode) throws Exception; - - protected String getResponse() { - return response; - } - - protected String getString(String property, ModelNode node) { - ModelNode propertyNode = node.get(property); - if (!isSet(propertyNode)) { - // replace "undefined" by null - return null; - } - return propertyNode.asString(); - } - - protected boolean isSet(ModelNode node) { - return node != null - && node.getType() != ModelType.UNDEFINED; - } - - protected Date getDate(String property, ModelNode node) throws DatatypeConfigurationException { - ModelNode propertyNode = node.get(property); - return RFC822DateUtils.getDate(propertyNode.asString()); - } - - protected long getLong(String property, ModelNode node) { - ModelNode propertyNode = node.get(property); - return propertyNode.asLong(-1); - } -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -12,21 +12,21 @@ import org.jboss.dmr.ModelNode; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.internal.client.Application; import org.jboss.tools.openshift.express.internal.client.InternalUser; /** * @author André Dietisheim */ -public class ApplicationResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<Application> { +public class ApplicationResponseUnmarshaller extends AbstractOpenShiftJsonResponseUnmarshaller<Application> { private InternalUser user; private String applicationName; private ICartridge cartridge; - private OpenshiftService service; + private OpenShiftService service; - public ApplicationResponseUnmarshaller(String applicationName, ICartridge cartridge, InternalUser user, OpenshiftService service) { + public ApplicationResponseUnmarshaller(String applicationName, ICartridge cartridge, InternalUser user, OpenShiftService service) { this.applicationName = applicationName; this.cartridge = cartridge; this.user = user; @@ -34,7 +34,7 @@ } @Override - protected Application createOpenshiftObject(ModelNode node) { + protected Application createOpenShiftObject(ModelNode node) { return new Application(applicationName, cartridge, user, service); } } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationStatusResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationStatusResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ApplicationStatusResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -11,17 +11,17 @@ package org.jboss.tools.openshift.express.internal.client.response.unmarshalling; import org.jboss.dmr.ModelNode; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; /** * @author André Dietisheim */ -public class ApplicationStatusResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> { +public class ApplicationStatusResponseUnmarshaller extends AbstractOpenShiftJsonResponseUnmarshaller<String> { @Override - protected String createOpenshiftObject(ModelNode responseNode) { - ModelNode resultNode = responseNode.get(IOpenshiftJsonConstants.PROPERTY_RESULT); + protected String createOpenShiftObject(ModelNode responseNode) { + ModelNode resultNode = responseNode.get(IOpenShiftJsonConstants.PROPERTY_RESULT); return resultNode.asString(); } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/DomainResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/DomainResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/DomainResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -12,27 +12,27 @@ import org.jboss.dmr.ModelNode; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IOpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; import org.jboss.tools.openshift.express.internal.client.Domain; import org.jboss.tools.openshift.express.internal.client.InternalUser; /** * @author André Dietisheim */ -public class DomainResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<IDomain> { +public class DomainResponseUnmarshaller extends AbstractOpenShiftJsonResponseUnmarshaller<IDomain> { private String domainName; private InternalUser user; - private IOpenshiftService service; + private IOpenShiftService service; - public DomainResponseUnmarshaller(String domainName, InternalUser user, IOpenshiftService service) { + public DomainResponseUnmarshaller(String domainName, InternalUser user, IOpenShiftService service) { this.domainName = domainName; this.user = user; this.service = service; } @Override - protected IDomain createOpenshiftObject(ModelNode node) { + protected IDomain createOpenShiftObject(ModelNode node) { return new Domain(domainName, user, service); } } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ListCartridgesResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ListCartridgesResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/ListCartridgesResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -16,7 +16,7 @@ import org.jboss.dmr.ModelNode; import org.jboss.tools.openshift.express.client.Cartridge; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; /** * WARNING: the current (9-7-2011) response from the openshift rest service is @@ -25,16 +25,16 @@ * * @author André Dietisheim */ -public class ListCartridgesResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<List<ICartridge>> { +public class ListCartridgesResponseUnmarshaller extends AbstractOpenShiftJsonResponseUnmarshaller<List<ICartridge>> { @Override - protected List<ICartridge> createOpenshiftObject(ModelNode responseNode) { + protected List<ICartridge> createOpenShiftObject(ModelNode responseNode) { List<ICartridge> cartridges = new ArrayList<ICartridge>(); - ModelNode dataNode = responseNode.get(IOpenshiftJsonConstants.PROPERTY_DATA); + ModelNode dataNode = responseNode.get(IOpenShiftJsonConstants.PROPERTY_DATA); if (dataNode == null) { return cartridges; } - ModelNode cartridgesNode = dataNode.get(IOpenshiftJsonConstants.PROPERTY_CARTS); + ModelNode cartridgesNode = dataNode.get(IOpenShiftJsonConstants.PROPERTY_CARTS); if (cartridgesNode == null) { return cartridges; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/UserInfoResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/UserInfoResponseUnmarshaller.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/response/unmarshalling/UserInfoResponseUnmarshaller.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,33 +20,33 @@ import org.jboss.tools.openshift.express.client.Cartridge; import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; -import org.jboss.tools.openshift.express.internal.client.IOpenshiftJsonConstants; +import org.jboss.tools.openshift.express.internal.client.IOpenShiftJsonConstants; import org.jboss.tools.openshift.express.internal.client.UserInfo; /** * @author André Dietisheim */ -public class UserInfoResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<UserInfo> { +public class UserInfoResponseUnmarshaller extends AbstractOpenShiftJsonResponseUnmarshaller<UserInfo> { @Override - protected UserInfo createOpenshiftObject(ModelNode node) throws DatatypeConfigurationException { - ModelNode dataNode = node.get(IOpenshiftJsonConstants.PROPERTY_DATA); + protected UserInfo createOpenShiftObject(ModelNode node) throws DatatypeConfigurationException { + ModelNode dataNode = node.get(IOpenShiftJsonConstants.PROPERTY_DATA); if (!isSet(dataNode)) { return null; } - ModelNode userInfoNode = dataNode.get(IOpenshiftJsonConstants.PROPERTY_USER_INFO); + ModelNode userInfoNode = dataNode.get(IOpenShiftJsonConstants.PROPERTY_USER_INFO); if (!isSet(userInfoNode)) { return null; } - String sshPublicKey = getString(IOpenshiftJsonConstants.PROPERTY_SSH_KEY, userInfoNode); - String rhlogin = getString(IOpenshiftJsonConstants.PROPERTY_RHLOGIN, userInfoNode); - String uuid = getString(IOpenshiftJsonConstants.PROPERTY_UUID, userInfoNode); - String namespace = getString(IOpenshiftJsonConstants.PROPERTY_NAMESPACE, userInfoNode); - String rhcDomain = getString(IOpenshiftJsonConstants.PROPERTY_RHC_DOMAIN, userInfoNode); + String sshPublicKey = getString(IOpenShiftJsonConstants.PROPERTY_SSH_KEY, userInfoNode); + String rhlogin = getString(IOpenShiftJsonConstants.PROPERTY_RHLOGIN, userInfoNode); + String uuid = getString(IOpenShiftJsonConstants.PROPERTY_UUID, userInfoNode); + String namespace = getString(IOpenShiftJsonConstants.PROPERTY_NAMESPACE, userInfoNode); + String rhcDomain = getString(IOpenShiftJsonConstants.PROPERTY_RHC_DOMAIN, userInfoNode); - List<ApplicationInfo> applicationInfos = createApplicationInfos(dataNode.get(IOpenshiftJsonConstants.PROPERTY_APP_INFO)); + List<ApplicationInfo> applicationInfos = createApplicationInfos(dataNode.get(IOpenShiftJsonConstants.PROPERTY_APP_INFO)); return new UserInfo(rhlogin, uuid, sshPublicKey, rhcDomain, namespace, applicationInfos); } @@ -64,10 +64,10 @@ } private ApplicationInfo createApplicationInfo(String name, ModelNode appNode) throws DatatypeConfigurationException { - String uuid = getString(IOpenshiftJsonConstants.PROPERTY_UUID, appNode); - String embedded = getString(IOpenshiftJsonConstants.PROPERTY_EMBEDDED, appNode); - ICartridge cartrdige = new Cartridge(getString(IOpenshiftJsonConstants.PROPERTY_FRAMEWORK, appNode)); - Date creationTime = getDate(IOpenshiftJsonConstants.PROPERTY_CREATION_TIME, appNode); + String uuid = getString(IOpenShiftJsonConstants.PROPERTY_UUID, appNode); + String embedded = getString(IOpenShiftJsonConstants.PROPERTY_EMBEDDED, appNode); + ICartridge cartrdige = new Cartridge(getString(IOpenShiftJsonConstants.PROPERTY_FRAMEWORK, appNode)); + Date creationTime = getDate(IOpenShiftJsonConstants.PROPERTY_CREATION_TIME, appNode); return new ApplicationInfo(name, uuid, embedded, cartrdige, creationTime); } } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Openshift UI +Bundle-Name: OpenShift UI Bundle-SymbolicName: org.jboss.tools.openshift.express.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator +Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0", org.jboss.ide.eclipse.as.egit.core;bundle-version="2.3.0", org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)", Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,7 +20,7 @@ <behaviour behaviourDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBehaviourDelegate" launchDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressLaunchDelegate" - name="Openshift" + name="OpenShift Express" publishMethod="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressPublishMethod" serverTypes="org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60" typeId="openshift"> @@ -29,7 +29,7 @@ <extension point="org.jboss.ide.eclipse.as.ui.DeployMethodUI"> <ui - class="org.jboss.tools.openshift.express.internal.ui.behaviour.OpenshiftDeployUI" + class="org.jboss.tools.openshift.express.internal.ui.behaviour.OpenShiftDeployUI" deployMethodId="openshift"> </ui> </extension> Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -104,7 +104,7 @@ * @return * @throws CoreException */ - public static IServer createAS7OpenshiftServer( + public static IServer createAS7OpenShiftServer( String host, String username, String password, String domain, String app, String sourceOrBinary, @@ -112,7 +112,7 @@ IServer server = createServerAndRuntime(IJBossToolingConstants.AS_70, IJBossToolingConstants.SERVER_AS_70, localRuntimeHomeDir, /* irrelevant */ "default"); - return fillServerWithOpenshiftDetails(server, host, username, password, domain, app, sourceOrBinary); + return fillServerWithOpenShiftDetails(server, host, username, password, domain, app, sourceOrBinary); } /** @@ -129,12 +129,12 @@ * @return * @throws CoreException */ - public static IServer createAS7OpenshiftServer( + public static IServer createAS7OpenShiftServer( String host, String username, String password, String domain, String app, String sourceOrBinary, IRuntime runtime) throws CoreException { IServer server = createServer(runtime, IJBossToolingConstants.SERVER_AS_70); - return fillServerWithOpenshiftDetails(server, host, username, password, domain, app, sourceOrBinary); + return fillServerWithOpenShiftDetails(server, host, username, password, domain, app, sourceOrBinary); } /** @@ -150,7 +150,7 @@ * @return * @throws CoreException */ - public static IServer fillServerWithOpenshiftDetails(IServer server, + public static IServer fillServerWithOpenShiftDetails(IServer server, String host, String username, String password, String domain, String app, String mode) throws CoreException { if( host.indexOf("://") != -1) Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java (from rev 35757, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftImages.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.openshift.express.internal.ui.common.ImageRepository; + +public class OpenShiftImages { + + private static final String ICONS_FOLDER = "icons/"; + + private static final ImageRepository repo = + new ImageRepository(ICONS_FOLDER, OpenShiftUIActivator.getDefault(), OpenShiftUIActivator.getDefault().getImageRegistry()); + + public static final ImageDescriptor OPENSHIFT_LOGO_DARK = repo.create("openshift-logo-dark.png"); //$NON-NLS-1$ + public static final ImageDescriptor OPENSHIFT_LOGO_WHITE = repo.create("openshift-logo-white.png"); //$NON-NLS-1$ + public static final ImageDescriptor OPENSHIFT_LOGO_WHITE_MEDIUM = repo.create("openshift-logo-white-medium.png"); //$NON-NLS-1$ + public static final Image OPENSHIFT_LOGO_WHITE_MEDIUM_IMG = repo.getImage("openshift-logo-white-medium.png"); //$NON-NLS-1$ +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java (from rev 35757, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,65 @@ +package org.jboss.tools.openshift.express.internal.ui; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class OpenShiftUIActivator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.openshift.express.ui"; //$NON-NLS-1$ + + // The shared instance + private static OpenShiftUIActivator plugin; + + /** + * The constructor + */ + public OpenShiftUIActivator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static OpenShiftUIActivator getDefault() { + return plugin; + } + + public static void log(IStatus status) { + plugin.getLog().log(status); + } + + public static void log(Throwable e) { + log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, e.getMessage(), e)); + } + + public static IStatus createErrorStatus(String message, Throwable throwable) { + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + message, throwable); + } + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftImages.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftImages.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftImages.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat Inc.. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat Incorporated - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.openshift.express.internal.ui; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.jboss.tools.openshift.express.internal.ui.common.ImageRepository; - -public class OpenshiftImages { - - private static final String ICONS_FOLDER = "icons/"; - - private static final ImageRepository repo = - new ImageRepository(ICONS_FOLDER, OpenshiftUIActivator.getDefault(), OpenshiftUIActivator.getDefault().getImageRegistry()); - - public static final ImageDescriptor OPENSHIFT_LOGO_DARK = repo.create("openshift-logo-dark.png"); //$NON-NLS-1$ - public static final ImageDescriptor OPENSHIFT_LOGO_WHITE = repo.create("openshift-logo-white.png"); //$NON-NLS-1$ - public static final ImageDescriptor OPENSHIFT_LOGO_WHITE_MEDIUM = repo.create("openshift-logo-white-medium.png"); //$NON-NLS-1$ - public static final Image OPENSHIFT_LOGO_WHITE_MEDIUM_IMG = repo.getImage("openshift-logo-white-medium.png"); //$NON-NLS-1$ -} Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,65 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class OpenshiftUIActivator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.openshift.express.ui"; //$NON-NLS-1$ - - // The shared instance - private static OpenshiftUIActivator plugin; - - /** - * The constructor - */ - public OpenshiftUIActivator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static OpenshiftUIActivator getDefault() { - return plugin; - } - - public static void log(IStatus status) { - plugin.getLog().log(status); - } - - public static void log(Throwable e) { - log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, e.getMessage(), e)); - } - - public static IStatus createErrorStatus(String message, Throwable throwable) { - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, - message, throwable); - } - -} Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java (from rev 35757, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,78 @@ +package org.jboss.tools.openshift.express.internal.ui.behaviour; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.jboss.ide.eclipse.as.ui.UIUtil; +import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; +import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; + +public class OpenShiftDeployUI implements IDeploymentTypeUI { + + public OpenShiftDeployUI() { + // TODO Auto-generated constructor stub + } + + @Override + public void fillComposite(Composite parent, IServerModeUICallback callback) { + createWidgets(parent, callback); + addListeners(callback); + } + + private void addListeners(IServerModeUICallback callback) { + + } + + //private Text userText, passText; + private Text userText, passText; + private Combo modeCombo; + + private void createWidgets(Composite parent, IServerModeUICallback callback) { + // TODO Auto-generated method stub + parent.setLayout(new FillLayout()); + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayout(new FormLayout()); + + Label nameLabel = new Label(composite, SWT.NONE); + nameLabel.setText("OpenShift Username:"); + userText = new Text(composite, SWT.BORDER); + Label passLabel = new Label(composite, SWT.NONE); + passLabel.setText("OpenShift Password:"); + passText = new Text(composite, SWT.BORDER | SWT.PASSWORD); + + Label domainLabel = new Label(composite, SWT.NONE); + domainLabel.setText("Domain: " + ExpressServerUtils.getExpressDomain(callback.getServer())); + Label appLabel = new Label(composite, SWT.NONE); + appLabel.setText("App: " + ExpressServerUtils.getExpressApplication(callback.getServer())); + + Label modeLabel = new Label(composite, SWT.NONE); + modeLabel.setText("Mode: " + ExpressServerUtils.getExpressModeAsString(callback.getServer())); + + userText.setText(ExpressServerUtils.getExpressUsername(callback.getServer())); + passText.setText(ExpressServerUtils.getExpressPassword(callback.getServer())); + userText.setEnabled(false); + passText.setEnabled(false); + // Maybe just make this a label ?? +// modeCombo = new Combo(composite, SWT.READ_ONLY); +// modeCombo.setItems(new String[]{ +// "Source", "Binary" +// }); +// modeCombo.select(0); + + nameLabel.setLayoutData(UIUtil.createFormData2(0, 5,null,0,0,5,null,0)); + userText.setLayoutData(UIUtil.createFormData2(0,3,null,0,nameLabel,5,100,-5)); + + passLabel.setLayoutData(UIUtil.createFormData2(userText, 5,null,0,0,5,null,0)); + passText.setLayoutData(UIUtil.createFormData2(userText,5,null,0,nameLabel,5,100,-5)); + + domainLabel.setLayoutData(UIUtil.createFormData2(passText,5,null,0,0,5,null,0)); + appLabel.setLayoutData(UIUtil.createFormData2(domainLabel,5,null,0,0,5,null,0)); + modeLabel.setLayoutData(UIUtil.createFormData2(appLabel,5,null,0,0,5,null,0)); +// modeCombo.setLayoutData(UIUtil.createFormData2(appLabel,3,null,0,modeLabel,5,100,-5)); + } + +} Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,78 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.behaviour; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.jboss.ide.eclipse.as.ui.UIUtil; -import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; -import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; - -public class OpenshiftDeployUI implements IDeploymentTypeUI { - - public OpenshiftDeployUI() { - // TODO Auto-generated constructor stub - } - - @Override - public void fillComposite(Composite parent, IServerModeUICallback callback) { - createWidgets(parent, callback); - addListeners(callback); - } - - private void addListeners(IServerModeUICallback callback) { - - } - - //private Text userText, passText; - private Text userText, passText; - private Combo modeCombo; - - private void createWidgets(Composite parent, IServerModeUICallback callback) { - // TODO Auto-generated method stub - parent.setLayout(new FillLayout()); - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new FormLayout()); - - Label nameLabel = new Label(composite, SWT.NONE); - nameLabel.setText("Openshift Username:"); - userText = new Text(composite, SWT.BORDER); - Label passLabel = new Label(composite, SWT.NONE); - passLabel.setText("Openshift Password:"); - passText = new Text(composite, SWT.BORDER | SWT.PASSWORD); - - Label domainLabel = new Label(composite, SWT.NONE); - domainLabel.setText("Domain: " + ExpressServerUtils.getExpressDomain(callback.getServer())); - Label appLabel = new Label(composite, SWT.NONE); - appLabel.setText("App: " + ExpressServerUtils.getExpressApplication(callback.getServer())); - - Label modeLabel = new Label(composite, SWT.NONE); - modeLabel.setText("Mode: " + ExpressServerUtils.getExpressModeAsString(callback.getServer())); - - userText.setText(ExpressServerUtils.getExpressUsername(callback.getServer())); - passText.setText(ExpressServerUtils.getExpressPassword(callback.getServer())); - userText.setEnabled(false); - passText.setEnabled(false); - // Maybe just make this a label ?? -// modeCombo = new Combo(composite, SWT.READ_ONLY); -// modeCombo.setItems(new String[]{ -// "Source", "Binary" -// }); -// modeCombo.select(0); - - nameLabel.setLayoutData(UIUtil.createFormData2(0, 5,null,0,0,5,null,0)); - userText.setLayoutData(UIUtil.createFormData2(0,3,null,0,nameLabel,5,100,-5)); - - passLabel.setLayoutData(UIUtil.createFormData2(userText, 5,null,0,0,5,null,0)); - passText.setLayoutData(UIUtil.createFormData2(userText,5,null,0,nameLabel,5,100,-5)); - - domainLabel.setLayoutData(UIUtil.createFormData2(passText,5,null,0,0,5,null,0)); - appLabel.setLayoutData(UIUtil.createFormData2(domainLabel,5,null,0,0,5,null,0)); - modeLabel.setLayoutData(UIUtil.createFormData2(appLabel,5,null,0,0,5,null,0)); -// modeCombo.setLayoutData(UIUtil.createFormData2(appLabel,3,null,0,modeLabel,5,100,-5)); - } - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImageRepository.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImageRepository.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImageRepository.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,7 +20,7 @@ import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; public class ImageRepository { @@ -42,7 +42,7 @@ } return baseUrl; } catch (MalformedURLException e) { - OpenshiftUIActivator.log(e); + OpenShiftUIActivator.log(e); return null; } } Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java (from rev 35757, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java) =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java (rev 0) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,96 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.wizard; + +import org.eclipse.core.databinding.DataBindingContext; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.dialogs.IPageChangedListener; +import org.eclipse.jface.dialogs.PageChangedEvent; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardContainer; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; + +/** + * @author André Dietisheim + */ +public abstract class AbstractOpenShiftWizardPage extends WizardPage { + + private DataBindingContext dbc; + + protected AbstractOpenShiftWizardPage(String title, String description, String pageName, IWizard wizard) { + super(pageName); + setWizard(wizard); + setTitle(title); + setDescription(description); + setImageDescriptor(OpenShiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM); + } + + @Override + public void createControl(Composite parent) { + this.dbc = new DataBindingContext(); + setupWizardPageSupport(dbc); + Composite container = new Composite(parent, SWT.NONE); + GridLayoutFactory.fillDefaults().margins(6,6).applyTo(container); + Composite child = new Composite(container, SWT.NONE); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(child); + setControl(container); + initPageChangedListener(); + doCreateControls(child, dbc); + } + + protected void setupWizardPageSupport(DataBindingContext dbc) { + ParametrizableWizardPageSupport.create( + IStatus.ERROR | IStatus.INFO | IStatus.WARNING | IStatus.CANCEL, this, + dbc); + } + + protected void initPageChangedListener() { + IWizardContainer wizardContainer = getContainer(); + if (wizardContainer instanceof WizardDialog) { + ((WizardDialog) getContainer()).addPageChangedListener(new IPageChangedListener() { + + @Override + public void pageChanged(PageChangedEvent event) { + if (event.getSelectedPage() == AbstractOpenShiftWizardPage.this) { + onPageActivated(dbc); + } else { + onPageDeactivated(dbc); + } + } + }); + } + } + + protected DataBindingContext getDatabindingContext() { + return dbc; + } + + protected void onPageActivated(DataBindingContext dbc) { + } + + protected void onPageDeactivated(DataBindingContext dbc) { + } + + + protected abstract void doCreateControls(Composite parent, DataBindingContext dbc); + + protected DataBindingContext getDataBindingContext() { + return dbc; + } + +} Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.ui.wizard; - -import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.IPageChangedListener; -import org.eclipse.jface.dialogs.PageChangedEvent; -import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftImages; - -/** - * @author André Dietisheim - */ -public abstract class AbstractOpenshiftWizardPage extends WizardPage { - - private DataBindingContext dbc; - - protected AbstractOpenshiftWizardPage(String title, String description, String pageName, IWizard wizard) { - super(pageName); - setWizard(wizard); - setTitle(title); - setDescription(description); - setImageDescriptor(OpenshiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM); - } - - @Override - public void createControl(Composite parent) { - this.dbc = new DataBindingContext(); - setupWizardPageSupport(dbc); - Composite container = new Composite(parent, SWT.NONE); - GridLayoutFactory.fillDefaults().margins(6,6).applyTo(container); - Composite child = new Composite(container, SWT.NONE); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(child); - setControl(container); - initPageChangedListener(); - doCreateControls(child, dbc); - } - - protected void setupWizardPageSupport(DataBindingContext dbc) { - ParametrizableWizardPageSupport.create( - IStatus.ERROR | IStatus.INFO | IStatus.WARNING | IStatus.CANCEL, this, - dbc); - } - - protected void initPageChangedListener() { - IWizardContainer wizardContainer = getContainer(); - if (wizardContainer instanceof WizardDialog) { - ((WizardDialog) getContainer()).addPageChangedListener(new IPageChangedListener() { - - @Override - public void pageChanged(PageChangedEvent event) { - if (event.getSelectedPage() == AbstractOpenshiftWizardPage.this) { - onPageActivated(dbc); - } else { - onPageDeactivated(dbc); - } - } - }); - } - } - - protected DataBindingContext getDatabindingContext() { - return dbc; - } - - protected void onPageActivated(DataBindingContext dbc) { - } - - protected void onPageDeactivated(DataBindingContext dbc) { - } - - - protected abstract void doCreateControls(Composite parent, DataBindingContext dbc); - - protected DataBindingContext getDataBindingContext() { - return dbc; - } - -} Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -59,10 +59,10 @@ import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter; import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; 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 org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -public class AdapterWizardPage extends AbstractOpenshiftWizardPage implements IWizardPage, PropertyChangeListener { +public class AdapterWizardPage extends AbstractOpenShiftWizardPage implements IWizardPage, PropertyChangeListener { private AdapterWizardPageModel model; private Combo suitableRuntimes; @@ -356,8 +356,8 @@ model.resetRepositoryPath(); try { model.updateGitUri(); - } catch (OpenshiftException e) { - OpenshiftUIActivator.log(OpenshiftUIActivator.createErrorStatus(e.getMessage(), e)); + } catch (OpenShiftException e) { + OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e)); } serverTypeToCreate = getServerTypeToCreate(); @@ -374,8 +374,8 @@ domainLabel.setText("Host: " + model.getParentModel().getApplication().getApplicationUrl()); modeLabel.setText("Mode: Source"); model.getParentModel().setProperty(AdapterWizardPageModel.MODE, AdapterWizardPageModel.MODE_SOURCE); - } catch (OpenshiftException ose) { - OpenshiftUIActivator.log(OpenshiftUIActivator.createErrorStatus(ose.getMessage(), ose)); + } catch (OpenShiftException ose) { + OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(ose.getMessage(), ose)); } } @@ -401,7 +401,7 @@ IRuntimeWorkingCopy runtimeWorkingCopy = runtimeType.createRuntime(null, null); taskModel.putObject(TaskModel.TASK_RUNTIME, runtimeWorkingCopy); } catch (CoreException ce) { - OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus()); + OpenShiftUIActivator.getDefault().getLog().log(ce.getStatus()); return Window.CANCEL; } fragment = new WizardFragment() { Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -14,7 +14,7 @@ import org.eclipse.egit.ui.UIPreferences; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; /** * @author André Dietisheim @@ -43,7 +43,7 @@ setRemoteName(REMOTE_NAME_DEFAULT); } - public void updateGitUri() throws OpenshiftException { + public void updateGitUri() throws OpenShiftException { IApplication application = wizardModel.getApplication(); if (application != null) { setGitUri(application.getGitUri()); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -30,8 +30,8 @@ import org.jboss.tools.common.ui.BrowserUtil; import org.jboss.tools.openshift.express.client.IApplication; 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.OpenShiftImages; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim @@ -106,7 +106,7 @@ private void setupDialog(Composite parent) { parent.getShell().setText("Application Details"); setTitle(NLS.bind("Application {0}", application.getName())); - setTitleImage(OpenshiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM_IMG); + setTitleImage(OpenShiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM_IMG); setDialogHelpAvailable(false); } @@ -121,8 +121,8 @@ @Override public void widgetSelected(SelectionEvent e) { - ILog log = OpenshiftUIActivator.getDefault().getLog(); - BrowserUtil.checkedCreateExternalBrowser(applicationUrl, OpenshiftUIActivator.PLUGIN_ID, log); + ILog log = OpenShiftUIActivator.getDefault().getLog(); + BrowserUtil.checkedCreateExternalBrowser(applicationUrl, OpenShiftUIActivator.PLUGIN_ID, log); } }; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -57,21 +57,21 @@ 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.client.NotFoundOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim */ -public class ApplicationWizardPage extends AbstractOpenshiftWizardPage { +public class ApplicationWizardPage extends AbstractOpenShiftWizardPage { private TableViewer viewer; private ApplicationWizardPageModel model; private ImportProjectWizardModel wizardModel; protected ApplicationWizardPage(IWizard wizard, ImportProjectWizardModel wizardModel) { - super("Application selection", "Please select an Openshift Express application", + super("Application selection", "Please select an OpenShift Express application", "Application selection", wizard); this.wizardModel = wizardModel; this.model = new ApplicationWizardPageModel(wizardModel); @@ -176,9 +176,9 @@ } else { try { createDomain(); - } catch (OpenshiftException ex) { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, ex.getMessage(), ex); - OpenshiftUIActivator.getDefault().getLog().log(status); + } catch (OpenShiftException ex) { + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, ex.getMessage(), ex); + OpenShiftUIActivator.getDefault().getLog().log(status); ErrorDialog.openError(getShell(), "Error creating domain", "An error occurred while creating the domain.", status); } @@ -187,7 +187,7 @@ }; } - private void createDomain() throws OpenshiftException { + private void createDomain() throws OpenShiftException { if (WizardUtils.openWizardDialog( new NewDomainDialog(model.getNamespace(), wizardModel), getContainer().getShell()) == Dialog.OK) { model.loadDomain(); @@ -205,7 +205,7 @@ model.renameDomain(); return Status.OK_STATUS; } catch (Exception e) { - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not rename domain", e); } } @@ -258,7 +258,7 @@ // try { // IApplication application = (IApplication) cell.getElement(); // cell.setText(application.getApplicationUrl()); - // } catch (OpenshiftException e) { + // } catch (OpenShiftException e) { // // ignore // } // } @@ -297,8 +297,8 @@ model.destroyCurrentApplication(); refreshViewer(); return Status.OK_STATUS; - } catch (OpenshiftException e) { - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, NLS.bind( + } catch (OpenShiftException e) { + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind( "Could not delete application \"{0}\"", model.getSelectedApplication().getName())); } @@ -352,13 +352,13 @@ final Collection<IApplication> applications = model.loadApplications(); setViewerInput(applications); return Status.OK_STATUS; - } catch (NotFoundOpenshiftException e) { + } catch (NotFoundOpenShiftException e) { // no domain and therefore no applications present clearViewer(); return Status.OK_STATUS; } catch (Exception e) { clearViewer(); - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not load applications", e); } } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -17,7 +17,7 @@ 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.client.OpenShiftException; /** * @author André Dietisheim @@ -67,15 +67,15 @@ setNamespace(domain); } - public void renameDomain() throws OpenshiftException { + public void renameDomain() throws OpenShiftException { getDomain().setNamespace(namespace); } - public void loadDomain() throws OpenshiftException { + public void loadDomain() throws OpenShiftException { setDomain(getUser().getDomain()); } - public Collection<IApplication> loadApplications() throws OpenshiftException { + public Collection<IApplication> loadApplications() throws OpenShiftException { IUser user = getUser(); if (user == null) { return Collections.emptyList(); @@ -92,7 +92,7 @@ firePropertyChange(PROPERTY_SELECTED_APPLICATION, this.selectedApplication, this.selectedApplication = application); } - public void destroyCurrentApplication() throws OpenshiftException { + public void destroyCurrentApplication() throws OpenShiftException { if (selectedApplication == null) { return; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -34,12 +34,12 @@ import org.jboss.tools.common.ui.BrowserUtil; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.common.ui.databinding.DataBindingUtils; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim */ -public class CredentialsWizardPage extends AbstractOpenshiftWizardPage { +public class CredentialsWizardPage extends AbstractOpenShiftWizardPage { protected static final String OPENSHIFT_EXPRESS_SIGNUP_URL = "https://openshift.redhat.com/app/user/new/express"; //$NON-NLS-1$ @@ -48,7 +48,7 @@ private CredentialsWizardPageModel model; public CredentialsWizardPage(IWizard wizard, ImportProjectWizardModel wizardModel) { - super("Server connetion", "Please provide the credentails of your user account on Openshift Express", + super("Server connetion", "Please provide the credentails of your user account on OpenShift Express", "Server Connection", wizard); this.model = new CredentialsWizardPageModel(wizardModel); } @@ -149,7 +149,7 @@ @Override public void widgetSelected(SelectionEvent e) { BrowserUtil.checkedCreateInternalBrowser(OPENSHIFT_EXPRESS_SIGNUP_URL, OPENSHIFT_EXPRESS_SIGNUP_URL, - OpenshiftUIActivator.PLUGIN_ID, OpenshiftUIActivator.getDefault().getLog()); + OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); getContainer().getShell().close(); } }; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -14,21 +14,21 @@ 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.IOpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; 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.NotFoundOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.User; import org.jboss.tools.openshift.express.client.UserConfiguration; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim */ public class CredentialsWizardPageModel extends ObservableUIPojo { - private static final String ID = OpenshiftUIActivator.PLUGIN_ID - + OpenshiftUIActivator.getDefault().getBundle().getVersion(); + private static final String ID = OpenShiftUIActivator.PLUGIN_ID + + OpenShiftUIActivator.getDefault().getBundle().getVersion(); private static final String RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN"; @@ -48,8 +48,8 @@ public CredentialsWizardPageModel(ImportProjectWizardModel model) { this.wizardModel = model; - this.serverUrl = IOpenshiftService.BASE_URL; - this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenshiftUIActivator.PLUGIN_ID); + this.serverUrl = IOpenShiftService.BASE_URL; + this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID); this.rhLogin = initRhLogin(); resetCredentialsStatus(); } @@ -125,16 +125,16 @@ } public IStatus validateCredentials() { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Your credentails are not valid."); + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Your credentails are not valid."); try { this.user = new User(getRhLogin(), getPassword(), ID); if (user.isValid()) { status = Status.OK_STATUS; } - } catch (NotFoundOpenshiftException e) { + } catch (NotFoundOpenShiftException e) { // valid user without domain status = Status.OK_STATUS; - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { this.user = null; } wizardModel.setUser(user); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -26,8 +26,8 @@ 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.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim @@ -58,29 +58,29 @@ try { File repositoryFile = model.cloneRepository(monitor); model.importProject(repositoryFile, monitor); - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { errorMessage = "An exception occurred while creating local git repository."; - status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e); + status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); } catch (URISyntaxException e) { errorMessage = "The url of the remote git repository is not valid"; - status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e); + status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); } catch (InvocationTargetException e) { if (isTransportException(e)) { errorMessage = "Could not clone the repository. Authentication failed.\n" + " Please make sure that you added your private key to the ssh preferences."; TransportException te = getTransportException(e); - status = OpenshiftUIActivator.createErrorStatus(te.getMessage(), te); + status = OpenShiftUIActivator.createErrorStatus(te.getMessage(), te); } else { errorMessage = "An exception occurred while creating local git repository."; - status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e); + status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); } } catch (Exception e) { errorMessage = "An exception occurred while creating local git repository."; - status = OpenshiftUIActivator.createErrorStatus(e.getMessage(), e); + status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); } if (!status.isOK()) { - OpenshiftUIActivator.log(status); + OpenShiftUIActivator.log(status); openErrorDialog(errorMessage, status); } return status; @@ -90,7 +90,7 @@ return true; } catch (Exception e) { ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", - new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "An exception occurred while creating local git repository.", e)); return false; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -48,9 +48,9 @@ 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.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.GeneralProjectImportOperation; import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.MavenProjectImportOperation; @@ -139,7 +139,7 @@ return (String) getProperty(REPOSITORY_PATH); } - public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenshiftException, + public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenShiftException, CoreException, InterruptedException { new WorkspaceJob(NLS.bind("Importing projects from {0}", projectFolder.getAbsolutePath())) { @@ -159,9 +159,9 @@ createServerAdapterIfRequired(importedProjects, monitor); return Status.OK_STATUS; } catch (Exception e) { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Could not import projects from {0}", projectFolder.getAbsolutePath()), e); - OpenshiftUIActivator.log(status); + OpenShiftUIActivator.log(status); return status; } } @@ -182,7 +182,7 @@ new ConnectProviderOperation(project, gitFolder).execute(monitor); } - public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException, + public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenShiftException, InvocationTargetException, InterruptedException { IApplication application = getApplication(); @@ -192,7 +192,7 @@ } private void cloneRepository(String uri, File destination, IProgressMonitor monitor) throws URISyntaxException, - OpenshiftException, + OpenShiftException, InvocationTargetException, InterruptedException { if (destination.exists()) { @@ -236,10 +236,10 @@ IServer server = createServerAdapter(); addModules(getModules(importedProjects), server, monitor); } catch(CoreException ce) { - OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus()); - } catch(OpenshiftException ose) { - IStatus s = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Cannot create openshift server adapter", ose); - OpenshiftUIActivator.getDefault().getLog().log(s); + OpenShiftUIActivator.getDefault().getLog().log(ce.getStatus()); + } catch(OpenShiftException ose) { + IStatus s = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Cannot create openshift server adapter", ose); + OpenShiftUIActivator.getDefault().getLog().log(s); } } } @@ -255,16 +255,16 @@ } private IServer createServerAdapter() throws CoreException, - OpenshiftException { + OpenShiftException { IServerType type = (IServerType)getProperty(AdapterWizardPageModel.SERVER_TYPE); IRuntime rt = (IRuntime)getProperty(AdapterWizardPageModel.RUNTIME_DELEGATE); String mode = (String)getProperty(AdapterWizardPageModel.MODE); - String serverNameBase = getApplication().getName() + " Openshift Server"; + String serverNameBase = getApplication().getName() + " OpenShift Server"; String serverName = org.jboss.ide.eclipse.as.core.util.ServerUtil.getDefaultServerName(serverNameBase); IServer server = ExpressServerUtils.createServer(rt, type, serverName); - ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(), + ExpressServerUtils.fillServerWithOpenShiftDetails(server, getApplication().getApplicationUrl(), getUser().getRhlogin(), getUser().getPassword(), getUser().getDomain().getNamespace(), getApplication().getName(), mode); return server; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,8 +20,8 @@ import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.client.IUser; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim @@ -46,9 +46,9 @@ try { newApplicationModel.createApplication(); queue.offer(true); - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { queue.offer(false); - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Could not create application \"{0}\"", newApplicationModel.getName()), e); } return Status.OK_STATUS; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -36,19 +36,19 @@ import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.client.Cartridge; 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 org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim */ -public class NewApplicationWizardPage extends AbstractOpenshiftWizardPage { +public class NewApplicationWizardPage extends AbstractOpenShiftWizardPage { private NewApplicationWizardPageModel model; public NewApplicationWizardPage(NewApplicationWizardPageModel model, IWizard wizard) { - super("Create new Openshift Express application", "Create new Openshift Express application", - "Create new Openshift Express application", wizard); + super("Create new OpenShift Express application", "Create new OpenShift Express application", + "Create new OpenShift Express application", wizard); this.model = model; } @@ -137,8 +137,8 @@ protected IStatus run(IProgressMonitor monitor) { try { model.loadCartridges(); - } catch (OpenshiftException e) { - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Could not load cartridges", e); + } catch (OpenShiftException e) { + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not load cartridges", e); } return Status.OK_STATUS; } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -17,8 +17,8 @@ import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; 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.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim @@ -40,7 +40,7 @@ this.user = user; this.selectedCartridgePreference = new StringPreferenceValue( "org.jboss.tools.openshift.express.internal.ui.wizard.NewApplicationWizard.selectedCartridge", - OpenshiftUIActivator.PLUGIN_ID); + OpenShiftUIActivator.PLUGIN_ID); } private ICartridge initSelectedCartridge() { @@ -68,7 +68,7 @@ firePropertyChange(PROPERTY_NAME, this.name, this.name = name); } - public void loadCartridges() throws OpenshiftException { + public void loadCartridges() throws OpenShiftException { setCartridges(user.getCartridges()); } @@ -103,16 +103,16 @@ return matchingCartridge; } - public void createApplication() throws OpenshiftException { + public void createApplication() throws OpenShiftException { user.createApplication(name, selectedCartridge); } public boolean hasApplication(String name) { try { return user.getApplicationByName(name) != null; - } catch (OpenshiftException e) { - OpenshiftUIActivator.log( - OpenshiftUIActivator.createErrorStatus("Could not get application by name", e)); + } catch (OpenShiftException e) { + OpenShiftUIActivator.log( + OpenShiftUIActivator.createErrorStatus("Could not get application by name", e)); return false; } } Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -19,7 +19,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** * @author André Dietisheim @@ -48,7 +48,7 @@ queue.offer(true); } catch (Exception e) { queue.offer(false); - return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Could not create domain \"{0}\"", model.getNamespace()), e); } return Status.OK_STATUS; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -46,15 +46,15 @@ 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.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.common.FileUtils; import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; /** * @author André Dietisheim */ -public class NewDomainWizardPage extends AbstractOpenshiftWizardPage { +public class NewDomainWizardPage extends AbstractOpenShiftWizardPage { private static final String FILTEREXPRESSION_PUBLIC_SSH_KEY = "*.pub"; private static final String FILTERNAME_PUBLIC_SSH_KEY = "Public ssh key file (*.pub)"; @@ -128,16 +128,16 @@ String passPhrase = dialog.getValue(); model.createSShKeyPair(passPhrase); } catch (FileNotFoundException ex) { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not read the ssh key folder", ex); - OpenshiftUIActivator.log(status); + OpenShiftUIActivator.log(status); ErrorDialog.openError(getShell(), "Error creating a new ssh key pair", "Could not create a new ssh key pair", status); - } catch (OpenshiftException ex) { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + } catch (OpenShiftException ex) { + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not create an ssh key pair", ex); - OpenshiftUIActivator.log(status); + OpenShiftUIActivator.log(status); ErrorDialog.openError(getShell(), "Error creating a new ssh key pair", "Could not create a new ssh key pair", status); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -19,7 +19,7 @@ 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.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.common.FileUtils; @@ -50,7 +50,7 @@ return this.namespace; } - public void createDomain() throws OpenshiftException, IOException { + public void createDomain() throws OpenShiftException, IOException { IDomain domain = user.createDomain(namespace, loadSshKey()); setDomain(domain); } @@ -59,14 +59,14 @@ return sshKey; } - public void createSShKeyPair(String passPhrase) throws FileNotFoundException, OpenshiftException { + public void createSShKeyPair(String passPhrase) throws FileNotFoundException, OpenShiftException { String sshKeysDirectory = SshPrivateKeysPreferences.getSshKeyDirectory(); SSHKeyPair keyPair = createSshKeyPair(passPhrase, sshKeysDirectory); SshPrivateKeysPreferences.add(keyPair.getPrivateKeyPath()); setSshKey(keyPair.getPublicKeyPath()); } - private SSHKeyPair createSshKeyPair(String passPhrase, String sshKeysDirectory) throws OpenshiftException { + private SSHKeyPair createSshKeyPair(String passPhrase, String sshKeysDirectory) throws OpenShiftException { String privateKeyPath = getKeyPairFileName(sshKeysDirectory); String publicKeyPath = getPublicKeyPath(privateKeyPath); return SSHKeyPair.create(passPhrase, privateKeyPath, publicKeyPath); @@ -90,7 +90,7 @@ firePropertyChange(PROPERTY_SSHKEY, this.sshKey, this.sshKey = sshKey); } - private ISSHPublicKey loadSshKey() throws IOException, OpenshiftException { + private ISSHPublicKey loadSshKey() throws IOException, OpenShiftException { return new SSHPublicKey(new File(sshKey)); } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Openshift Test Plugin +Bundle-Name: OpenShift Test Plugin Bundle-SymbolicName: org.jboss.tools.openshift.express.client.test Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.jboss.tools.openshift.express.internal.client.test.Activator Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,10 +20,10 @@ import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.User; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; import org.jboss.tools.openshift.express.internal.client.UserInfo; @@ -37,19 +37,19 @@ */ public class ApplicationIntegrationTest { - private IOpenshiftService service; + private IOpenShiftService service; private User user; private User invalidUser; @Before public void setUp() { - this.service = new OpenshiftService(TestUser.ID); + this.service = new OpenShiftService(TestUser.ID); this.user = new TestUser(); this.invalidUser = new TestUser("bogusPassword"); } - @Test(expected = InvalidCredentialsOpenshiftException.class) + @Test(expected = InvalidCredentialsOpenShiftException.class) public void createApplicationWithInvalidCredentialsThrowsException() throws Exception { service.createApplication(ApplicationUtils.createRandomApplicationName(), ICartridge.JBOSSAS_7, invalidUser); } @@ -75,7 +75,7 @@ service.destroyApplication(applicationName, ICartridge.JBOSSAS_7, user); } - @Test(expected = OpenshiftException.class) + @Test(expected = OpenShiftException.class) public void createDuplicateApplicationThrowsException() throws Exception { String applicationName = ApplicationUtils.createRandomApplicationName(); try { Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -21,8 +21,8 @@ import org.jboss.tools.openshift.express.client.ApplicationLogReader; import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestUser; import org.jboss.tools.openshift.express.internal.client.test.utils.ApplicationUtils; import org.junit.Before; @@ -35,12 +35,12 @@ public class ApplicationLogReaderIntegrationTest { private static final int LOGREADER_TIMEOUT = 10 * 1024; - private IOpenshiftService service; + private IOpenShiftService service; private TestUser user; @Before public void setUp() { - this.service = new OpenshiftService(TestUser.ID); + this.service = new OpenShiftService(TestUser.ID); this.user = new TestUser(); } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationLogReaderTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -20,11 +20,11 @@ import org.jboss.tools.openshift.express.client.ApplicationLogReader; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.client.Application; import org.jboss.tools.openshift.express.internal.client.InternalUser; -import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenshiftServiceFake; +import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenShiftServiceFake; import org.junit.Before; import org.junit.Test; @@ -64,16 +64,16 @@ + "11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\"\n"; private String status = LOG_HEADER + INITIAL_LOG; - private IOpenshiftService statusService; + private IOpenShiftService statusService; private Application application; @Before public void setUp() { - this.statusService = new NoopOpenshiftServiceFake() { + this.statusService = new NoopOpenShiftServiceFake() { @Override public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) - throws OpenshiftException { + throws OpenShiftException { return status; } }; @@ -110,12 +110,12 @@ private class ApplicationLogFake extends Application { - private ApplicationLogFake(IOpenshiftService service) { + private ApplicationLogFake(IOpenShiftService service) { super("fakeApplication", ICartridge.JBOSSAS_7, null, service); } @Override - public synchronized void restart() throws OpenshiftException { + public synchronized void restart() throws OpenShiftException { status = LOG_CONTINUATION; this.notifyAll(); } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ApplicationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -23,22 +23,22 @@ import org.jboss.tools.openshift.express.client.ApplicationLogReader; 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.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.internal.client.Application; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; import org.jboss.tools.openshift.express.internal.client.InternalUser; import org.jboss.tools.openshift.express.internal.client.UserInfo; import org.jboss.tools.openshift.express.internal.client.request.ApplicationAction; import org.jboss.tools.openshift.express.internal.client.request.ApplicationRequest; -import org.jboss.tools.openshift.express.internal.client.request.OpenshiftEnvelopeFactory; +import org.jboss.tools.openshift.express.internal.client.request.OpenShiftEnvelopeFactory; import org.jboss.tools.openshift.express.internal.client.request.marshalling.ApplicationRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationResponseUnmarshaller; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ApplicationStatusResponseUnmarshaller; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; import org.jboss.tools.openshift.express.internal.client.test.fakes.ApplicationResponseFake; -import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenshiftServiceFake; +import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenShiftServiceFake; import org.junit.Test; /** @@ -47,7 +47,7 @@ public class ApplicationTest { private InternalUser user = new InternalUser(ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.PASSWORD, - new NoopOpenshiftServiceFake()); + new NoopOpenShiftServiceFake()); @Test public void canMarshallApplicationCreateRequest() throws Exception { @@ -69,7 +69,7 @@ new ApplicationRequest( "test-application", ICartridge.JBOSSAS_7, ApplicationAction.CONFIGURE, ApplicationResponseFake.RHLOGIN, true)); - String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, + String effectiveRequest = new OpenShiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, createApplicationRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); @@ -94,29 +94,29 @@ new ApplicationRequest( "test-application", ICartridge.JBOSSAS_7, ApplicationAction.DECONFIGURE, ApplicationResponseFake.RHLOGIN, true)); - String effectiveRequest = new OpenshiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, + String effectiveRequest = new OpenShiftEnvelopeFactory(ApplicationResponseFake.PASSWORD, createApplicationRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); } @Test - public void canUnmarshallApplicationResponse() throws OpenshiftException { + public void canUnmarshallApplicationResponse() throws OpenShiftException { String response = JsonSanitizer.sanitize(ApplicationResponseFake.appResponse); - OpenshiftResponse<Application> openshiftResponse = + OpenShiftResponse<Application> openshiftResponse = new ApplicationResponseUnmarshaller( ApplicationResponseFake.APPLICATION_NAME, ApplicationResponseFake.APPLICATION_CARTRIDGE, - user, new NoopOpenshiftServiceFake()) + user, new NoopOpenShiftServiceFake()) .unmarshall(response); - Application application = openshiftResponse.getOpenshiftObject(); + Application application = openshiftResponse.getOpenShiftObject(); assertNotNull(application); assertEquals(ApplicationResponseFake.APPLICATION_NAME, application.getName()); assertEquals(ApplicationResponseFake.APPLICATION_CARTRIDGE, application.getCartridge()); } @Test - public void returnsValidGitUri() throws OpenshiftException { - OpenshiftService userInfoService = createUserInfoService(); + public void returnsValidGitUri() throws OpenShiftException { + OpenShiftService userInfoService = createUserInfoService(); InternalUser user = createUser(userInfoService); IApplication application = createApplication(userInfoService, user); @@ -131,8 +131,8 @@ } @Test - public void returnsValidApplicationUrl() throws OpenshiftException { - OpenshiftService userInfoService = createUserInfoService(); + public void returnsValidApplicationUrl() throws OpenShiftException { + OpenShiftService userInfoService = createUserInfoService(); InternalUser user = createUser(userInfoService); IApplication application = createApplication(userInfoService, user); @@ -146,11 +146,11 @@ } @Test - public void canUnmarshallApplicationStatus() throws OpenshiftException { + public void canUnmarshallApplicationStatus() throws OpenShiftException { String response = JsonSanitizer.sanitize(ApplicationResponseFake.statusResponse); - OpenshiftResponse<String> openshiftResponse = + OpenShiftResponse<String> openshiftResponse = new ApplicationStatusResponseUnmarshaller().unmarshall(response); - String status = openshiftResponse.getOpenshiftObject(); + String status = openshiftResponse.getOpenShiftObject(); assertNotNull(status); assertTrue(status.startsWith("tailing ")); } @@ -158,9 +158,9 @@ @Test public void canReadFromApplicationLogReader() throws IOException { - OpenshiftService service = new NoopOpenshiftServiceFake() { + OpenShiftService service = new NoopOpenShiftServiceFake() { @Override - public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenshiftException { + public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenShiftException { return ApplicationResponseFake.tail; } }; @@ -183,7 +183,7 @@ } } - private IApplication createApplication(OpenshiftService userInfoService, InternalUser user) { + private IApplication createApplication(OpenShiftService userInfoService, InternalUser user) { Application application = new Application( ApplicationResponseFake.APPLICATION_NAME , ApplicationResponseFake.APPLICATION_CARTRIDGE @@ -205,14 +205,14 @@ return application; } - private InternalUser createUser(OpenshiftService userInfoService) { + private InternalUser createUser(OpenShiftService userInfoService) { return new InternalUser(ApplicationResponseFake.RHLOGIN, ApplicationResponseFake.PASSWORD, userInfoService); } - private OpenshiftService createUserInfoService() { - OpenshiftService userInfoService = new NoopOpenshiftServiceFake() { + private OpenShiftService createUserInfoService() { + OpenShiftService userInfoService = new NoopOpenShiftServiceFake() { @Override - public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { + public UserInfo getUserInfo(InternalUser user) throws OpenShiftException { ApplicationInfo applicationInfo = new ApplicationInfo( ApplicationResponseFake.APPLICATION_NAME, ApplicationResponseFake.APPLICATION_UUID, Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgeTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgeTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgeTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -16,8 +16,8 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ListCartridgesResponseUnmarshaller; import org.jboss.tools.openshift.express.internal.client.test.fakes.CartridgeResponseFake; @@ -29,11 +29,11 @@ public class CartridgeTest { @Test - public void canUnmarshallApplicationResponse() throws OpenshiftException { + public void canUnmarshallApplicationResponse() throws OpenShiftException { String response = JsonSanitizer.sanitize(CartridgeResponseFake.RESPONSE); - OpenshiftResponse<List<ICartridge>> openshiftResponse = + OpenShiftResponse<List<ICartridge>> openshiftResponse = new ListCartridgesResponseUnmarshaller().unmarshall(response); - List<ICartridge> cartridges = openshiftResponse.getOpenshiftObject(); + List<ICartridge> cartridges = openshiftResponse.getOpenShiftObject(); assertNotNull(cartridges); assertThatContainsCartridge(CartridgeResponseFake.CARTRIDGE_JBOSSAS70, cartridges); assertThatContainsCartridge(CartridgeResponseFake.CARTRIDGE_PERL5, cartridges); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgesIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/CartridgesIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -16,7 +16,7 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.User; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestUser; import org.junit.Before; @@ -28,20 +28,20 @@ */ public class CartridgesIntegrationTest { - private OpenshiftService openshiftService; + private OpenShiftService openShiftService; private User user; @Before public void setUp() { - this.openshiftService = new OpenshiftService(TestUser.ID); + this.openShiftService = new OpenShiftService(TestUser.ID); this.user = new TestUser(); } @Ignore @Test public void canRequestListCartridges() throws Exception { - List<ICartridge> cartridges = openshiftService.getCartridges(user); + List<ICartridge> cartridges = openShiftService.getCartridges(user); assertNotNull(cartridges); assertTrue(cartridges.size() > 0); } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -14,7 +14,7 @@ import static org.junit.Assert.assertNotNull; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.SSHKeyPair; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestSSHKey; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestUser; @@ -24,12 +24,12 @@ public class DomainIntegrationTest { - private OpenshiftService openshiftService; + private OpenShiftService openShiftService; private TestUser user; @Before public void setUp() { - this.openshiftService = new OpenshiftService(TestUser.ID); + this.openShiftService = new OpenShiftService(TestUser.ID); this.user = new TestUser(); } @@ -39,7 +39,7 @@ String domainName = createRandomString(); SSHKeyPair sshKey = TestSSHKey.create(); - IDomain domain = openshiftService.createDomain(domainName, sshKey, user); + IDomain domain = openShiftService.createDomain(domainName, sshKey, user); assertNotNull(domain); assertEquals(domainName, domain.getNamespace()); @@ -51,7 +51,7 @@ String domainName = createRandomString(); SSHKeyPair sshKey = TestSSHKey.create(); - IDomain domain = openshiftService.changeDomain(domainName, sshKey, user); + IDomain domain = openShiftService.changeDomain(domainName, sshKey, user); assertNotNull(domain); assertEquals(domainName, domain.getNamespace()); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/DomainTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -18,18 +18,18 @@ import java.net.URLEncoder; import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.SSHKeyPair; import org.jboss.tools.openshift.express.internal.client.InternalUser; import org.jboss.tools.openshift.express.internal.client.request.ChangeDomainRequest; import org.jboss.tools.openshift.express.internal.client.request.CreateDomainRequest; -import org.jboss.tools.openshift.express.internal.client.request.OpenshiftEnvelopeFactory; +import org.jboss.tools.openshift.express.internal.client.request.OpenShiftEnvelopeFactory; import org.jboss.tools.openshift.express.internal.client.request.marshalling.DomainRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.DomainResponseUnmarshaller; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; -import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenshiftServiceFake; +import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenShiftServiceFake; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestSSHKey; import org.junit.Test; @@ -43,14 +43,14 @@ private static final String UUID = "0c82860dae904a4d87f8e5d87a5af840"; @Test - public void canMarshallDomainCreateRequest() throws IOException, OpenshiftException { + public void canMarshallDomainCreateRequest() throws IOException, OpenShiftException { SSHKeyPair sshKey = TestSSHKey.create(); String expectedRequestString = createDomainRequestString(PASSWORD, RHLOGIN, true, "myDomain", false, sshKey.getPublicKey()); CreateDomainRequest request = new CreateDomainRequest("myDomain", sshKey, RHLOGIN, true); String requestString = - new OpenshiftEnvelopeFactory( + new OpenShiftEnvelopeFactory( PASSWORD, new DomainRequestJsonMarshaller().marshall(request)) .createString(); @@ -58,29 +58,29 @@ } @Test - public void canUnmarshallDomainCreateResponse() throws IOException, OpenshiftException { + public void canUnmarshallDomainCreateResponse() throws IOException, OpenShiftException { String domainName = "myDomain"; String responseString = createDomainResponseString(RHLOGIN, UUID); responseString = JsonSanitizer.sanitize(responseString); - IOpenshiftService service = new NoopOpenshiftServiceFake(); + IOpenShiftService service = new NoopOpenShiftServiceFake(); InternalUser user = new InternalUser(RHLOGIN, PASSWORD, service); - OpenshiftResponse<IDomain> response = new DomainResponseUnmarshaller(domainName, user, service).unmarshall(responseString); + OpenShiftResponse<IDomain> response = new DomainResponseUnmarshaller(domainName, user, service).unmarshall(responseString); assertNotNull(response); - IDomain domain = response.getOpenshiftObject(); + IDomain domain = response.getOpenShiftObject(); assertEquals(domainName, domain.getNamespace()); } @Test - public void canMarshallDomainAlterRequest() throws IOException, OpenshiftException { + public void canMarshallDomainAlterRequest() throws IOException, OpenShiftException { SSHKeyPair sshKey = TestSSHKey.create(); String expectedRequestString = createDomainRequestString(PASSWORD, RHLOGIN, true, "myDomain", true, sshKey.getPublicKey()); ChangeDomainRequest request = new ChangeDomainRequest("myDomain", sshKey, RHLOGIN, true); String requestString = - new OpenshiftEnvelopeFactory( + new OpenShiftEnvelopeFactory( PASSWORD, new DomainRequestJsonMarshaller().marshall(request)) .createString(); Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenShiftTestService.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenshiftTestService.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenShiftTestService.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenShiftTestService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test; + +import org.jboss.tools.openshift.express.client.IOpenShiftService; + +/** + * @author André Dietisheim + */ +public interface IOpenShiftTestService extends IOpenShiftService { + + public static final String STAGING_BASE_URL = ""; + +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenShiftTestService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenshiftTestService.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenshiftTestService.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/IOpenshiftTestService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test; - -import org.jboss.tools.openshift.express.client.IOpenshiftService; - -/** - * @author André Dietisheim - */ -public interface IOpenshiftTestService extends IOpenshiftService { - - public static final String STAGING_BASE_URL = ""; - -} Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/JsonSanitizerTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/JsonSanitizerTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/JsonSanitizerTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals; import org.jboss.dmr.ModelNode; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; import org.junit.Test; @@ -23,7 +23,7 @@ public class JsonSanitizerTest { @Test - public void canSanitizeQuotedJsonObject() throws OpenshiftException { + public void canSanitizeQuotedJsonObject() throws OpenShiftException { String quotedJsonObject = "\"{" + "\\\"carts\\\":" @@ -35,7 +35,7 @@ } @Test - public void doesNotTuchValidJson() throws OpenshiftException { + public void doesNotTuchValidJson() throws OpenShiftException { String quotedJsonObject = "{" + "\"carts\":" @@ -47,7 +47,7 @@ } @Test - public void doesNotRemoveEscapedQuoteInStringValue() throws OpenshiftException { + public void doesNotRemoveEscapedQuoteInStringValue() throws OpenShiftException { String quotedJsonObject = "\"{" + "\\\"property\\\":" @@ -61,7 +61,7 @@ } @Test - public void doesNotRemoveEscapedQuoteInStringValueWithinValidJsonObject() throws OpenshiftException { + public void doesNotRemoveEscapedQuoteInStringValueWithinValidJsonObject() throws OpenShiftException { String quotedJsonObject = "{" + "\"property\":" Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -17,7 +17,7 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestUser; import org.junit.Before; import org.junit.Test; @@ -27,18 +27,18 @@ */ public class ListCartridgesIntegrationTest { - private OpenshiftService openshiftService; + private OpenShiftService openShiftService; private TestUser user; @Before public void setUp() { - this.openshiftService = new OpenshiftService(TestUser.ID); + this.openShiftService = new OpenShiftService(TestUser.ID); this.user = new TestUser(); } @Test public void canListCartridges() throws Exception { - List<ICartridge> cartridges = openshiftService.getCartridges(user); + List<ICartridge> cartridges = openShiftService.getCartridges(user); assertNotNull(cartridges); assertTrue(cartridges.size() > 0); assertThatContainsCartridge("jbossas-7.0", cartridges); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/ListCartridgesTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -17,11 +17,11 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.client.request.ListCartridgesRequest; -import org.jboss.tools.openshift.express.internal.client.request.OpenshiftEnvelopeFactory; +import org.jboss.tools.openshift.express.internal.client.request.OpenShiftEnvelopeFactory; import org.jboss.tools.openshift.express.internal.client.request.marshalling.ListCartridgesRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.ListCartridgesResponseUnmarshaller; import org.junit.Test; @@ -42,13 +42,13 @@ String listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall( new ListCartridgesRequest(USERNAME, true)); - String effectiveRequest = new OpenshiftEnvelopeFactory(PASSWORD, listCartridgeRequest).createString(); + String effectiveRequest = new OpenShiftEnvelopeFactory(PASSWORD, listCartridgeRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); } @Test - public void canUnmarshallCartridgeListResponse() throws OpenshiftException { + public void canUnmarshallCartridgeListResponse() throws OpenShiftException { String cartridgeListResponse = "{" + "\"messages\":\"\"," @@ -75,12 +75,12 @@ + "\"exit_code\":0}"; cartridgeListResponse = JsonSanitizer.sanitize(cartridgeListResponse); - OpenshiftResponse<List<ICartridge>> response = + OpenShiftResponse<List<ICartridge>> response = new ListCartridgesResponseUnmarshaller().unmarshall(cartridgeListResponse); assertEquals("", response.getMessages()); assertEquals(false, response.isDebug()); - List<ICartridge> cartridges = response.getOpenshiftObject(); + List<ICartridge> cartridges = response.getOpenShiftObject(); assertEquals(5, cartridges.size()); assertThatContainsCartridge("perl-5.10", cartridges); assertThatContainsCartridge("jbossas-7.0", cartridges); Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftIntegrationTestSuite.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftIntegrationTestSuite.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftIntegrationTestSuite.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftIntegrationTestSuite.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({ + ApplicationIntegrationTest.class, + ApplicationLogReaderIntegrationTest.class, + CartridgesIntegrationTest.class, + DomainIntegrationTest.class, + ListCartridgesIntegrationTest.class, + UserInfoIntegrationTest.class, + UserIntegrationTest.class +}) +/** + * @author André Dietisheim + */ +public class OpenShiftIntegrationTestSuite { + +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftIntegrationTestSuite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftTestSuite.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftTestSuite.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftTestSuite.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftTestSuite.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({ + UserConfigurationTest.class, + ApplicationTest.class, + ApplicationLogReaderTest.class, + ListCartridgesTest.class, + DomainTest.class, + UserInfoTest.class, + UserTest.class, + CartridgeTest.class, + SSHKeyTest.class +}) +/** + * @author André Dietisheim + */ +public class OpenShiftTestSuite { + +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenShiftTestSuite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftIntegrationTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftIntegrationTestSuite.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftIntegrationTestSuite.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - - -(a)RunWith(Suite.class) -(a)Suite.SuiteClasses({ - ApplicationIntegrationTest.class, - ApplicationLogReaderIntegrationTest.class, - CartridgesIntegrationTest.class, - DomainIntegrationTest.class, - ListCartridgesIntegrationTest.class, - UserInfoIntegrationTest.class, - UserIntegrationTest.class -}) -/** - * @author André Dietisheim - */ -public class OpenshiftIntegrationTestSuite { - -} Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftTestSuite.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/OpenshiftTestSuite.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - - -(a)RunWith(Suite.class) -(a)Suite.SuiteClasses({ - UserConfigurationTest.class, - ApplicationTest.class, - ApplicationLogReaderTest.class, - ListCartridgesTest.class, - DomainTest.class, - UserInfoTest.class, - UserTest.class, - CartridgeTest.class, - SSHKeyTest.class -}) -/** - * @author André Dietisheim - */ -public class OpenshiftTestSuite { - -} Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserConfigurationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserConfigurationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserConfigurationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -21,7 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.client.test.fakes.UserConfigurationFake; import org.jboss.tools.openshift.express.internal.client.utils.StreamUtils; import org.junit.Test; @@ -36,7 +36,7 @@ private static final String ANOTHER_USERNAME = "anotherUser"; @Test - public void canReadUsername() throws OpenshiftException, IOException { + public void canReadUsername() throws OpenShiftException, IOException { UserConfigurationFake userConfiguration = new UserConfigurationFake() { @Override @@ -49,7 +49,7 @@ } @Test - public void canStoreUsername() throws OpenshiftException, IOException { + public void canStoreUsername() throws OpenShiftException, IOException { UserConfigurationFake userConfiguration = new UserConfigurationFake() { @Override @@ -71,7 +71,7 @@ } @Test - public void canStoreAndReadUsername() throws OpenshiftException, IOException { + public void canStoreAndReadUsername() throws OpenShiftException, IOException { UserConfigurationFake userConfiguration = new UserConfigurationFake() { @Override @@ -87,7 +87,7 @@ UserConfigurationFake userConfiguration2 = new UserConfigurationFake() { @Override - protected File getUserConfigurationFile() throws OpenshiftException, IOException { + protected File getUserConfigurationFile() throws OpenShiftException, IOException { return userConfigurationFile; } }; Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -16,12 +16,12 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IOpenshiftService; +import org.jboss.tools.openshift.express.client.IOpenShiftService; import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenshiftException; -import org.jboss.tools.openshift.express.client.NotFoundOpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.InvalidCredentialsOpenShiftException; +import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; import org.jboss.tools.openshift.express.internal.client.InternalUser; import org.jboss.tools.openshift.express.internal.client.UserInfo; @@ -35,42 +35,42 @@ */ public class UserInfoIntegrationTest { - private OpenshiftService openshiftService; + private OpenShiftService openShiftService; private TestUser user; @Before public void setUp() { - this.openshiftService = new OpenshiftService(TestUser.ID); + this.openShiftService = new OpenShiftService(TestUser.ID); this.user = new TestUser(); } @Test public void canGetUserInfo() throws Exception { - UserInfo userInfo = openshiftService.getUserInfo(user); + UserInfo userInfo = openShiftService.getUserInfo(user); assertNotNull(userInfo); assertEquals(user.getRhlogin(), userInfo.getRhLogin()); } - @Test(expected = InvalidCredentialsOpenshiftException.class) + @Test(expected = InvalidCredentialsOpenShiftException.class) public void getUserInfoForInexistantUserThrowsException() throws Exception { TestUser inexistantUser = new TestUser("inexistantUsername", "bogusPassword"); - openshiftService.getUserInfo(inexistantUser); + openShiftService.getUserInfo(inexistantUser); } /** - * {@link OpenshiftService#getUserInfo(InternalUser)} for a user without - * domain throws {@link NotFoundOpenshiftException} + * {@link OpenShiftService#getUserInfo(InternalUser)} for a user without + * domain throws {@link NotFoundOpenShiftException} */ - @Test(expected = NotFoundOpenshiftException.class) + @Test(expected = NotFoundOpenShiftException.class) public void canGetUserInfoForUserWithoutDomain() throws Exception { TestUser inexistantUser = new TestUser(TestUser.RHLOGIN_USER_WITHOUT_DOMAIN, TestUser.PASSWORD_USER_WITHOUT_DOMAIN); - openshiftService.getUserInfo(inexistantUser); + openShiftService.getUserInfo(inexistantUser); } @Test public void userInfoContainsOneMoreApplicationAfterCreatingNewApplication() throws Exception { - UserInfo userInfo = openshiftService.getUserInfo(user); + UserInfo userInfo = openShiftService.getUserInfo(user); assertNotNull(userInfo); List<ApplicationInfo> applicationInfos = userInfo.getApplicationInfos(); @@ -79,33 +79,33 @@ String applicationName = createRandomName(); try { - openshiftService.createApplication(applicationName, ICartridge.JBOSSAS_7, user); + openShiftService.createApplication(applicationName, ICartridge.JBOSSAS_7, user); - UserInfo userInfo2 = openshiftService.getUserInfo(user); + UserInfo userInfo2 = openShiftService.getUserInfo(user); assertEquals(numberOfApplicationInfos + 1, userInfo2.getApplicationInfos().size()); ApplicationInfoAsserts.assertThatContainsApplicationInfo(applicationName, userInfo2.getApplicationInfos()); } finally { - silentlyDestroyAS7Application(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openShiftService); } } @Test public void canUseReturnedSSHKeyToChangeDomain() throws Exception { - UserInfo userInfo = openshiftService.getUserInfo(user); + UserInfo userInfo = openShiftService.getUserInfo(user); assertNotNull(userInfo); ISSHPublicKey sshKey = userInfo.getSshPublicKey(); - openshiftService.changeDomain(createRandomName(), sshKey, user); + openShiftService.changeDomain(createRandomName(), sshKey, user); } private String createRandomName() { return String.valueOf(System.currentTimeMillis()); } - private void silentlyDestroyAS7Application(String name, IOpenshiftService service) { + private void silentlyDestroyAS7Application(String name, IOpenShiftService service) { try { service.destroyApplication(name, ICartridge.JBOSSAS_7, user); - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { e.printStackTrace(); } } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserInfoTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -18,13 +18,13 @@ import java.util.List; import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; import org.jboss.tools.openshift.express.internal.client.UserInfo; -import org.jboss.tools.openshift.express.internal.client.request.OpenshiftEnvelopeFactory; +import org.jboss.tools.openshift.express.internal.client.request.OpenShiftEnvelopeFactory; import org.jboss.tools.openshift.express.internal.client.request.UserInfoRequest; import org.jboss.tools.openshift.express.internal.client.request.marshalling.UserInfoRequestJsonMarshaller; -import org.jboss.tools.openshift.express.internal.client.response.OpenshiftResponse; +import org.jboss.tools.openshift.express.internal.client.response.OpenShiftResponse; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.JsonSanitizer; import org.jboss.tools.openshift.express.internal.client.response.unmarshalling.UserInfoResponseUnmarshaller; import org.jboss.tools.openshift.express.internal.client.test.fakes.UserInfoResponseFake; @@ -48,7 +48,7 @@ String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall( new UserInfoRequest(UserInfoResponseFake.RHLOGIN, true)); String effectiveRequest = - new OpenshiftEnvelopeFactory(UserInfoResponseFake.PASSWORD, userInfoRequest).createString(); + new OpenShiftEnvelopeFactory(UserInfoResponseFake.PASSWORD, userInfoRequest).createString(); assertEquals(expectedRequestString, effectiveRequest); } @@ -87,16 +87,16 @@ } @Test - public void canGetApplicationByName() throws OpenshiftException { + public void canGetApplicationByName() throws OpenShiftException { UserInfo userInfo = getUserInfo(JsonSanitizer.sanitize(UserInfoResponseFake.RESPONSE)); ApplicationInfo applicationInfo = userInfo.getApplicationInfoByName(UserInfoResponseFake.APP1_NAME); assertNotNull(applicationInfo); assertEquals(UserInfoResponseFake.APP1_NAME, applicationInfo.getName()); } - protected UserInfo getUserInfo(String response) throws OpenshiftException { + protected UserInfo getUserInfo(String response) throws OpenShiftException { UserInfoResponseUnmarshaller unmarshaller = new UserInfoResponseUnmarshaller(); - OpenshiftResponse<UserInfo> openshiftResponse = unmarshaller.unmarshall(response); - return openshiftResponse.getOpenshiftObject(); + OpenShiftResponse<UserInfo> openshiftResponse = unmarshaller.unmarshall(response); + return openshiftResponse.getOpenShiftObject(); } } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserIntegrationTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserIntegrationTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -25,10 +25,10 @@ import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.IDomain; import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.NotFoundOpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftEndpointException; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftEndpointException; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.User; import org.jboss.tools.openshift.express.internal.client.test.fakes.TestUser; import org.jboss.tools.openshift.express.internal.client.test.utils.ApplicationUtils; @@ -46,7 +46,7 @@ private TestUser userWithoutDomain; @Before - public void setUp() throws OpenshiftException, DatatypeConfigurationException { + public void setUp() throws OpenShiftException, DatatypeConfigurationException { this.user = new TestUser(); this.invalidUser = new TestUser("bogusPassword"); this.badUrlUser = new TestUser(TestUser.RHLOGIN, TestUser.PASSWORD, "http://www.redhat.com"); @@ -54,29 +54,29 @@ } @Test - public void canCheckIfUserIsValid() throws OpenshiftException { + public void canCheckIfUserIsValid() throws OpenShiftException { assertTrue(user.isValid()); } @Test - public void throwsExceptionIfInvalidCredentials() throws OpenshiftException { + public void throwsExceptionIfInvalidCredentials() throws OpenShiftException { assertFalse(invalidUser.isValid()); } - @Test(expected = NotFoundOpenshiftException.class) - public void throwsExceptionIfBadUrl() throws OpenshiftException { + @Test(expected = NotFoundOpenShiftException.class) + public void throwsExceptionIfBadUrl() throws OpenShiftException { badUrlUser.isValid(); } @Test - public void canGetUserUUID() throws OpenshiftException { + public void canGetUserUUID() throws OpenShiftException { String uuid = user.getUUID(); assertNotNull(uuid); assertTrue(uuid.length() > 0); } @Test - public void canGetPublicKey() throws OpenshiftException { + public void canGetPublicKey() throws OpenShiftException { ISSHPublicKey key = user.getSshKey(); assertNotNull(key); assertNotNull(key.getPublicKey()); @@ -84,7 +84,7 @@ } @Test - public void canGetDomain() throws OpenshiftException { + public void canGetDomain() throws OpenShiftException { IDomain domain = user.getDomain(); assertNotNull(domain); assertNotNull(domain.getRhcDomain()); @@ -93,8 +93,8 @@ assertTrue(domain.getNamespace().length() > 0); } - @Test(expected = OpenshiftEndpointException.class) - public void cannotCreateDomainIfAlreadyExists() throws OpenshiftException { + @Test(expected = OpenShiftEndpointException.class) + public void cannotCreateDomainIfAlreadyExists() throws OpenShiftException { IDomain domain = user.getDomain(); assertNotNull(domain); ISSHPublicKey key = user.getSshKey(); @@ -103,26 +103,26 @@ } @Test - public void getNullIfNoDomainPresent() throws OpenshiftException { + public void getNullIfNoDomainPresent() throws OpenShiftException { IDomain domain = userWithoutDomain.getDomain(); assertNull(domain); } @Test - public void canGetCartridges() throws OpenshiftException { + public void canGetCartridges() throws OpenShiftException { Collection<ICartridge> cartridges = user.getCartridges(); assertNotNull(cartridges); assertTrue(cartridges.size() >= 5); } @Test - public void canGetApplications() throws OpenshiftException { + public void canGetApplications() throws OpenShiftException { Collection<IApplication> applications = user.getApplications(); assertNotNull(applications); } @Test - public void canCreateApplication() throws OpenshiftException { + public void canCreateApplication() throws OpenShiftException { String applicationName = ApplicationUtils.createRandomApplicationName(); try { Collection<IApplication> applications = user.getApplications(); @@ -132,12 +132,12 @@ assertEquals(numOfApplications + 1, applications.size()); assertApplication(applicationName, ICartridge.JBOSSAS_7.getName(), application); } finally { - ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenshiftService(TestUser.ID)); + ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenShiftService(TestUser.ID)); } } @Test - public void canGetApplicationByName() throws OpenshiftException, DatatypeConfigurationException { + public void canGetApplicationByName() throws OpenShiftException, DatatypeConfigurationException { String applicationName = ApplicationUtils.createRandomApplicationName(); try { IApplication application = user.createApplication(applicationName, ICartridge.JBOSSAS_7); @@ -145,7 +145,7 @@ assertNotNull(applicationFound); assertEquals(application, applicationFound); } finally { - ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenshiftService(TestUser.ID)); + ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenShiftService(TestUser.ID)); } } } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserTest.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserTest.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/UserTest.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -27,14 +27,14 @@ import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.IDomain; import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; import org.jboss.tools.openshift.express.internal.client.InternalUser; import org.jboss.tools.openshift.express.internal.client.UserInfo; import org.jboss.tools.openshift.express.internal.client.test.fakes.CartridgeResponseFake; -import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenshiftServiceFake; +import org.jboss.tools.openshift.express.internal.client.test.fakes.NoopOpenShiftServiceFake; import org.jboss.tools.openshift.express.internal.client.test.fakes.UserInfoResponseFake; import org.junit.Before; import org.junit.Test; @@ -44,30 +44,30 @@ */ public class UserTest { - private OpenshiftService userInfoservice; + private OpenShiftService userInfoservice; private InternalUser user; @Before - public void setUp() throws OpenshiftException, DatatypeConfigurationException { + public void setUp() throws OpenShiftException, DatatypeConfigurationException { UserInfo userInfo = createUserInfo(); this.userInfoservice = createUserInfoService(userInfo); this.user = new InternalUser(UserInfoResponseFake.RHLOGIN, UserInfoResponseFake.PASSWORD, userInfoservice); } @Test - public void canGetUserUUID() throws OpenshiftException { + public void canGetUserUUID() throws OpenShiftException { assertEquals(UserInfoResponseFake.UUID, user.getUUID()); } @Test - public void canGetPublicKey() throws OpenshiftException { + public void canGetPublicKey() throws OpenShiftException { ISSHPublicKey key = user.getSshKey(); assertNotNull(key); assertEquals(UserInfoResponseFake.SSH_KEY, key.getPublicKey()); } @Test - public void canGetDomain() throws OpenshiftException { + public void canGetDomain() throws OpenShiftException { IDomain domain = user.getDomain(); assertNotNull(domain); assertEquals(UserInfoResponseFake.RHC_DOMAIN, domain.getRhcDomain()); @@ -75,11 +75,11 @@ } @Test - public void canGetCartridges() throws OpenshiftException { - OpenshiftService cartridgeListService = new NoopOpenshiftServiceFake() { + public void canGetCartridges() throws OpenShiftException { + OpenShiftService cartridgeListService = new NoopOpenShiftServiceFake() { @Override - public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException { + public List<ICartridge> getCartridges(InternalUser user) throws OpenShiftException { ArrayList<ICartridge> cartridges = new ArrayList<ICartridge>(); cartridges.add(new Cartridge(CartridgeResponseFake.CARTRIDGE_JBOSSAS70)); cartridges.add(new Cartridge(CartridgeResponseFake.CARTRIDGE_PERL5)); @@ -101,7 +101,7 @@ } @Test - public void canGetApplications() throws OpenshiftException { + public void canGetApplications() throws OpenShiftException { /** response is UserInfoResponseFake */ Collection<IApplication> applications = user.getApplications(); assertNotNull(applications); @@ -109,7 +109,7 @@ } @Test - public void canGetApplicationByName() throws OpenshiftException, DatatypeConfigurationException { + public void canGetApplicationByName() throws OpenShiftException, DatatypeConfigurationException { IApplication application = user.getApplicationByName(UserInfoResponseFake.APP2_NAME); assertApplication( UserInfoResponseFake.APP2_NAME @@ -120,7 +120,7 @@ , application); } - private UserInfo createUserInfo() throws OpenshiftException, DatatypeConfigurationException { + private UserInfo createUserInfo() throws OpenShiftException, DatatypeConfigurationException { ApplicationInfo[] applicationInfos = new ApplicationInfo[] { new ApplicationInfo(UserInfoResponseFake.APP1_NAME , UserInfoResponseFake.APP1_UUID @@ -142,11 +142,11 @@ , Arrays.asList(applicationInfos)); } - private OpenshiftService createUserInfoService(final UserInfo userInfo) { - return new NoopOpenshiftServiceFake() { + private OpenShiftService createUserInfoService(final UserInfo userInfo) { + return new NoopOpenShiftServiceFake() { @Override - public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { + public UserInfo getUserInfo(InternalUser user) throws OpenShiftException { return userInfo; } }; Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenShiftServiceFake.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenshiftServiceFake.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenShiftServiceFake.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenShiftServiceFake.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test.fakes; + +import java.util.List; + +import org.jboss.tools.openshift.express.client.IApplication; +import org.jboss.tools.openshift.express.client.ICartridge; +import org.jboss.tools.openshift.express.client.IDomain; +import org.jboss.tools.openshift.express.client.ISSHPublicKey; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.client.Application; +import org.jboss.tools.openshift.express.internal.client.InternalUser; +import org.jboss.tools.openshift.express.internal.client.UserInfo; + +/** + * @author André Dietisheim + */ +public class NoopOpenShiftServiceFake extends OpenShiftTestService { + + @Override + public UserInfo getUserInfo(InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public List<ICartridge> getCartridges(InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public Application createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public IDomain changeDomain(String domainName, ISSHPublicKey sshKey, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } + + @Override + public IDomain createDomain(String name, ISSHPublicKey keyPair, InternalUser user) throws OpenShiftException { + throw new UnsupportedOperationException(); + } +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenShiftServiceFake.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenshiftServiceFake.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenshiftServiceFake.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/NoopOpenshiftServiceFake.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test.fakes; - -import java.util.List; - -import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IDomain; -import org.jboss.tools.openshift.express.client.ISSHPublicKey; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.internal.client.Application; -import org.jboss.tools.openshift.express.internal.client.InternalUser; -import org.jboss.tools.openshift.express.internal.client.UserInfo; - -/** - * @author André Dietisheim - */ -public class NoopOpenshiftServiceFake extends OpenshiftTestService { - - @Override - public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public Application createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public String getStatus(String applicationName, ICartridge cartridge, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public IDomain changeDomain(String domainName, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } - - @Override - public IDomain createDomain(String name, ISSHPublicKey keyPair, InternalUser user) throws OpenshiftException { - throw new UnsupportedOperationException(); - } -} Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftCredentials.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftCredentials.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftCredentials.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftCredentials.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test.fakes; + +public class OpenShiftCredentials { + + public static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + public static final String PASSWORD = "1q2w3e"; + +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftCredentials.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftTestService.java (from rev 35747, trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftTestService.java) =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftTestService.java (rev 0) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftTestService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.client.test.fakes; + +import org.jboss.tools.openshift.express.client.OpenShiftService; +import org.jboss.tools.openshift.express.internal.client.test.IOpenShiftTestService; + +public class OpenShiftTestService extends OpenShiftService implements IOpenShiftTestService { + + public OpenShiftTestService() { + super(STAGING_BASE_URL); + } +} Property changes on: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenShiftTestService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftCredentials.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftCredentials.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftCredentials.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test.fakes; - -public class OpenshiftCredentials { - - public static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; - public static final String PASSWORD = "1q2w3e"; - -} Deleted: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftTestService.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftTestService.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/OpenshiftTestService.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.client.test.fakes; - -import org.jboss.tools.openshift.express.client.OpenshiftService; -import org.jboss.tools.openshift.express.internal.client.test.IOpenshiftTestService; - -public class OpenshiftTestService extends OpenshiftService implements IOpenshiftTestService { - - public OpenshiftTestService() { - super(STAGING_BASE_URL); - } -} Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestSSHKey.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestSSHKey.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestSSHKey.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -13,7 +13,7 @@ import java.io.File; import java.io.IOException; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.SSHKeyPair; import org.jboss.tools.openshift.express.internal.client.test.utils.StreamUtils; @@ -50,7 +50,7 @@ "1rS3C4svRSjdWaG36vDY2KxowdFvpKj8i8IYNPlLoRA/7EzzyneS6iyw" + "== created by org.jboss.tools.openshift.express.client"; - public static SSHKeyPair create() throws IOException, OpenshiftException { + public static SSHKeyPair create() throws IOException, OpenShiftException { File privateKeyFile = File.createTempFile(createRandomString(), null); StreamUtils.writeTo(privateKey, privateKeyFile); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -12,8 +12,8 @@ import org.jboss.tools.openshift.express.client.Cartridge; import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.OpenshiftException; -import org.jboss.tools.openshift.express.client.OpenshiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.client.OpenShiftService; import org.jboss.tools.openshift.express.client.User; import org.jboss.tools.openshift.express.internal.client.test.utils.ApplicationUtils; @@ -22,7 +22,7 @@ */ public class TestUser extends User { - public static final String ID = "org.jboss.tools.openshift.express.client.test " + OpenshiftService.VERSION; + public static final String ID = "org.jboss.tools.openshift.express.client.test " + OpenShiftService.VERSION; public static final String RHLOGIN_USER_WITHOUT_DOMAIN = &quot;toolsjboss.no.domain2(a)gmail.com&quot;; public static final String PASSWORD_USER_WITHOUT_DOMAIN = "1q2w3e"; @@ -46,14 +46,14 @@ super(rhlogin, password, ID, url); } - public IApplication createTestApplication() throws OpenshiftException { + public IApplication createTestApplication() throws OpenShiftException { return createApplication(ApplicationUtils.createRandomApplicationName(), Cartridge.JBOSSAS_7); } public void silentlyDestroyApplication(IApplication application) { try { getService().destroyApplication(application.getName(), application.getCartridge(), this); - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { e.printStackTrace(); } } Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/UserConfigurationFake.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/UserConfigurationFake.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/UserConfigurationFake.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -15,7 +15,7 @@ import java.io.IOException; import java.io.Writer; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.UserConfiguration; import org.jboss.tools.openshift.express.internal.client.utils.StreamUtils; @@ -25,12 +25,12 @@ public class UserConfigurationFake extends UserConfiguration { - public UserConfigurationFake() throws OpenshiftException, IOException { + public UserConfigurationFake() throws OpenShiftException, IOException { super(); } @Override - protected File getUserConfigurationFile() throws OpenshiftException, IOException { + protected File getUserConfigurationFile() throws OpenShiftException, IOException { Writer writer = null; try { File file = File.createTempFile(createRandomString(), null); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationAsserts.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationAsserts.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationAsserts.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -23,7 +23,7 @@ import javax.xml.datatype.DatatypeConfigurationException; import org.jboss.tools.openshift.express.client.IApplication; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; /** @@ -43,7 +43,7 @@ public static final Pattern APPLICATION_URL_REGEXP = Pattern.compile("http://(.+)-([^\\.]+)\\.(.+)/"); public static void assertThatContainsApplication(String applicationName, String embedded, String applicationUUID, - String cartridgeName, String creationTime, List<IApplication> applications) throws OpenshiftException { + String cartridgeName, String creationTime, List<IApplication> applications) throws OpenShiftException { IApplication application = getApplication(applicationName, applications); if (application == null) { fail(MessageFormat.format("Could not find application with name \"{0}\"", applicationName)); @@ -67,7 +67,7 @@ } public static void assertApplication(String name, String uuid, String cartridgeName, String embedded, - String creationTime, IApplication application) throws OpenshiftException { + String creationTime, IApplication application) throws OpenShiftException { assertNotNull(application); assertEquals(embedded, application.getEmbedded()); assertEquals(uuid, application.getUUID()); @@ -78,7 +78,7 @@ } } - public static void assertApplication(String name, String cartridgeName, IApplication application) throws OpenshiftException { + public static void assertApplication(String name, String cartridgeName, IApplication application) throws OpenShiftException { assertNotNull(application); assertNotNull(application.getCartridge()); assertEquals(cartridgeName, application.getCartridge().getName()); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationInfoAsserts.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationInfoAsserts.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationInfoAsserts.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -19,7 +19,7 @@ import javax.xml.datatype.DatatypeConfigurationException; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; import org.jboss.tools.openshift.express.internal.client.ApplicationInfo; @@ -29,7 +29,7 @@ public class ApplicationInfoAsserts { public static void assertThatContainsApplicationInfo(String applicationName, String embedded, String applicationUUID, - String cartridgeName, String creationTime, List<ApplicationInfo> applicationInfos) throws OpenshiftException { + String cartridgeName, String creationTime, List<ApplicationInfo> applicationInfos) throws OpenShiftException { ApplicationInfo applicationInfo = getApplicationInfo(applicationName, applicationInfos); if (applicationInfo == null) { fail(MessageFormat.format("Could not find application with name \"{0}\"", applicationName)); @@ -53,7 +53,7 @@ } private static void assertApplicationInfo(String embedded, String uuid, String cartridgeName, - String creationTime, ApplicationInfo applicationInfo) throws OpenshiftException { + String creationTime, ApplicationInfo applicationInfo) throws OpenShiftException { assertEquals(embedded, applicationInfo.getEmbedded()); assertEquals(uuid, applicationInfo.getUuid()); assertNotNull(applicationInfo.getCartridge()); Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationUtils.java =================================================================== --- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationUtils.java 2011-10-18 10:14:26 UTC (rev 35758) +++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/utils/ApplicationUtils.java 2011-10-18 12:40:18 UTC (rev 35759) @@ -13,8 +13,8 @@ import org.jboss.tools.openshift.express.client.Cartridge; import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; -import org.jboss.tools.openshift.express.client.IOpenshiftService; -import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.IOpenShiftService; +import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.User; /** @@ -26,17 +26,17 @@ return String.valueOf(System.currentTimeMillis()); } - public static IApplication createApplication(User user, IOpenshiftService service) throws OpenshiftException { + public static IApplication createApplication(User user, IOpenShiftService service) throws OpenShiftException { return service.createApplication(createRandomApplicationName(), Cartridge.JBOSSAS_7, user); } - public static void silentlyDestroyAS7Application(String name, User user, IOpenshiftService service) { + public static void silentlyDestroyAS7Application(String name, User user, IOpenShiftService service) { try { if (name == null) { return; } service.destroyApplication(name, ICartridge.JBOSSAS_7, user); - } catch (OpenshiftException e) { + } catch (OpenShiftException e) { e.printStackTrace(); } }