Author: adietish Date: 2011-09-28 09:23:13 -0400 (Wed, 28 Sep 2011) New Revision: 35115 Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/IOpenshiftTestService.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/OpenshiftTestService.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java Log: [JBIDE-9781] added IUser#createDomain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-28 12:41:38 UTC (rev 35114) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -24,7 +24,7 @@ public String getUUID() throws OpenshiftException; - public IDomain createDomain(String name) throws OpenshiftException; + public IDomain createDomain(String name, ISSHPublicKey key) throws OpenshiftException; public IDomain getDomain() throws OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 12:41:38 UTC (rev 35114) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -23,6 +23,8 @@ */ public interface IOpenshiftService { + public static final String BASE_URL = "https://openshift.redhat.com/broker"; + public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException; public Application createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-28 12:41:38 UTC (rev 35114) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -53,8 +53,8 @@ } @Override - public IDomain createDomain(String name) throws OpenshiftException { - ISSHPublicKey key = getSshKey(); + public IDomain createDomain(String name, ISSHPublicKey key) throws OpenshiftException { + setSshKey(key); this.domain = getService().createDomain(name, key, this); return domain; } @@ -69,10 +69,14 @@ return domain; } + private void setSshKey(ISSHPublicKey key) { + this.sshKey = key; + } + @Override public ISSHPublicKey getSshKey() throws OpenshiftException { if (sshKey == null) { - sshKey = getUserInfo().getSshPublicKey(); + this.sshKey = getUserInfo().getSshPublicKey(); } return sshKey; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 12:41:38 UTC (rev 35114) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -50,12 +50,20 @@ */ public class OpenshiftService implements IOpenshiftService { - private static final String BASE_URL = "https://openshift.redhat.com/broker"; + private String baseUrl; + public OpenshiftService() { + this(BASE_URL); + } + + protected OpenshiftService(String baseUrl) { + this.baseUrl = baseUrl; + } + @Override public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { UserInfoRequest request = new UserInfoRequest(user.getRhlogin(), true); - String url = request.getUrlString(BASE_URL); + String url = request.getUrlString(baseUrl); try { String requestString = new UserInfoRequestJsonMarshaller().marshall(request); String openShiftRequestString = new OpenshiftEnvelopeFactory(user.getPassword(), requestString) @@ -106,7 +114,7 @@ } protected IDomain requestDomainAction(AbstractDomainRequest request, InternalUser user) throws OpenshiftException { - String url = request.getUrlString(BASE_URL); + String url = request.getUrlString(baseUrl); try { String requestString = new OpenshiftEnvelopeFactory( @@ -161,7 +169,7 @@ 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(BASE_URL); + String url = applicationRequest.getUrlString(baseUrl); try { String applicationRequestString = new ApplicationRequestJsonMarshaller().marshall(applicationRequest); @@ -191,7 +199,7 @@ protected Application requestApplicationAction(ApplicationRequest applicationRequest, InternalUser user) throws OpenshiftException { - String url = applicationRequest.getUrlString(BASE_URL); + String url = applicationRequest.getUrlString(baseUrl); try { String applicationRequestString = new ApplicationRequestJsonMarshaller().marshall(applicationRequest); Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/IOpenshiftTestService.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/IOpenshiftTestService.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/IOpenshiftTestService.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -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.ide.eclipse.as.openshift.test.internal.core; + +import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftService; + +/** + * @author André Dietisheim + */ +public interface IOpenshiftTestService extends IOpenshiftService { + + public static final String STAGING_BASE_URL = ""; + +} Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/IOpenshiftTestService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-28 12:41:38 UTC (rev 35114) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -18,14 +18,13 @@ import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.Application; -import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser; import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo; /** * @author André Dietisheim */ -public class NoopOpenshiftServiceFake extends OpenshiftService { +public class NoopOpenshiftServiceFake extends OpenshiftTestService { @Override public UserInfo getUserInfo(InternalUser user) throws OpenshiftException { Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/OpenshiftTestService.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/OpenshiftTestService.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/OpenshiftTestService.java 2011-09-28 13:23:13 UTC (rev 35115) @@ -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.ide.eclipse.as.openshift.test.internal.core.fakes; + +import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; +import org.jboss.ide.eclipse.as.openshift.test.internal.core.IOpenshiftTestService; + +public class OpenshiftTestService extends OpenshiftService implements IOpenshiftTestService { + + public OpenshiftTestService() { + super(STAGING_BASE_URL); + } +} Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/OpenshiftTestService.java ___________________________________________________________________ Added: svn:mime-type + text/plain