[jbosstools-commits] JBoss Tools SVN: r34538 - in trunk/as/plugins: org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling and 4 other directories.

Author: adietish Date: 2011-09-06 08:02:24 -0400 (Tue, 06 Sep 2011) New Revision: 34538 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftObject.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UserInfo.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationAction.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ListCartridgesRequest.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java Log: [JBIDE-9591] added list cartridges request Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,5 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core; - -public class Domain { - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainException.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,20 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core; - -public class DomainException extends Exception { - - private DomainException(String message, Throwable cause) { - super(message, cause); - // TODO Auto-generated constructor stub - } - - private DomainException(String message) { - super(message); - // TODO Auto-generated constructor stub - } - - private DomainException(Throwable cause) { - super(cause); - // TODO Auto-generated constructor stub - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/DomainFactory.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,22 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core; - -import org.jboss.dmr.ModelNode; -import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder; - -public class DomainFactory { - - private UrlBuilder urlBuilder; - - public DomainFactory() { - this.urlBuilder = new UrlBuilder("https://openshift.redhat.com"); - } - - public Domain create() throws DomainException { - ModelNode node = new ModelNode(); - node.get("namespace").set("string"); -System.err.println(node.toJSONString(false)); - // new UrlConnectionHttpClient(urlBuilder.path("broker").path("domain").toUrl()).post(node.toJSONString(false)); - return null; - } - -} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,23 @@ +/******************************************************************************* + * 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.core; + +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.internal.core.UserInfo; + +public interface IOpenshift { + + public UserInfo getUserInfo() throws OpenshiftException; + + public List<Cartridge> getCartridges() throws OpenshiftException; +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java (from rev 34533, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,10 @@ +package org.jboss.ide.eclipse.as.openshift.core; + +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"; + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftObject.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftObject.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftObject.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -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.ide.eclipse.as.openshift.core; + +/** + * @author André Dietisheim + */ +public interface IOpenshiftObject { + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftObject.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.core; import java.net.MalformedURLException; @@ -2,13 +12,22 @@ import java.net.URL; +import java.util.ArrayList; +import java.util.List; import org.eclipse.osgi.util.NLS; import org.jboss.dmr.ModelNode; +import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.internal.core.HttpClientException; import org.jboss.ide.eclipse.as.openshift.internal.core.UrlConnectionHttpClient; +import org.jboss.ide.eclipse.as.openshift.internal.core.UserInfo; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder; -public class Openshift { +/** + * @author André Dietisheim + */ +public class Openshift implements IOpenshift { @@ -28,9 +47,8 @@ UrlBuilder userInfoUrlBuilder = new UrlBuilder(BASE_URL).path("userinfo"); try { String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(username, true)); - IHttpClient iHttpClient = createHttpClient(userInfoUrlBuilder.toUrl()); String request = new OpenshiftJsonRequestFactory(password, userInfoRequest).create(); - String userInfoResponse = iHttpClient.post(request); + String userInfoResponse = createHttpClient(userInfoUrlBuilder.toUrl()).post(request); ModelNode userInfoReponse = ModelNode.fromJSONString(userInfoResponse); return new UserInfo( userInfoReponse.get("rhlogin").asString(), @@ -47,12 +65,35 @@ NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username, userInfoUrlBuilder.toString()), e); } + } - + public UserInfo createApplication(String name) throws OpenshiftException { + throw new UnsupportedOperationException(); } - + private IHttpClient createHttpClient(URL url) { return new UrlConnectionHttpClient(url); } + @Override + public List<Cartridge> getCartridges() throws OpenshiftException { + UrlBuilder userInfoUrlBuilder = new UrlBuilder(BASE_URL).path("userinfo"); + try { + String listCartridgesRequest = new ListCartridgesRequestJsonMarshaller().marshall(new ListCartridgesRequest(username, true)); + String request = new OpenshiftJsonRequestFactory(password, listCartridgesRequest).create(); + String listCatridgesReponse = createHttpClient(userInfoUrlBuilder.toUrl()).post(request); + ModelNode userInfoReponse = ModelNode.fromJSONString(listCatridgesReponse); + List<Cartridge> cartridges = new ArrayList<Cartridge>(); + return cartridges; + } catch (MalformedURLException e) { + throw new OpenshiftException( + NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username, + userInfoUrlBuilder.toString()), e); + } catch (HttpClientException e) { + throw new OpenshiftException( + NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username, + userInfoUrlBuilder.toString()), e); + } + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/OpenshiftException.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,7 +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.core; +/** + * @author André Dietisheim + */ public class OpenshiftException extends Exception { + private static final long serialVersionUID = 1L; + public OpenshiftException(String message, Throwable cause) { super(message, cause); } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,40 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core; - -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; - -public class UserInfo implements IOpenshiftRequest { - - private String rhlogin; - private String uuId; - private String sshKey; - private String rhcDomain; - private String namespace; - - UserInfo(String rhlogin, String uuid, String sshKey, String rhcDomain, String namespace) { - this.rhlogin = rhlogin; - this.uuId = uuid; - this.sshKey = sshKey; - this.rhcDomain = rhcDomain; - this.namespace = namespace; - } - - public String getRhlogin() { - return rhlogin; - } - - public String getUuId() { - return uuId; - } - - public String getRhcDomain() { - return rhcDomain; - } - - public String getSSHKey() { - return sshKey; - } - - public String getNamespace() { - return namespace; - } -} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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.core.internal.marshalling; + +import org.jboss.dmr.ModelNode; +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.AbstractOpenshiftRequest; + +/** + * @author André Dietisheim + */ +public abstract class AbstractJsonMarshaller<REQUEST extends AbstractOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> { + + public String marshall(REQUEST request) { + ModelNode node = new ModelNode(); + node.get(IOpenshiftJsonConstants.PROPERTY_RHLOGIN).set(request.getRhLogin()); + node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).set(String.valueOf(request.isDebug())); + setNodeProperties(node, request); + return node.toJSONString(true); + } + + protected void setNodeProperties(ModelNode node, REQUEST request) { + // empty default implementation + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,10 +1,10 @@ package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; -public abstract class AbstractOpenshiftMarshaller<OPENSHIFTOBJECT extends IOpenshiftRequest> implements IOpenshiftMarshaller<OPENSHIFTOBJECT> { +public abstract class AbstractOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> { @Override - public String marshall(OPENSHIFTOBJECT object) { + public String marshall(REQUEST object) { StringBuilder builder = new StringBuilder(); append(builder); return builder.toString(); Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftJsonConstants.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,8 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; - -public class IOpenshiftJsonConstants { - - public static final String PROPERTY_DEBUG = "debug"; - public static final String PROPERTY_RHLOGIN = "rhlogin"; - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,8 +1,20 @@ +/******************************************************************************* + * 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.core.internal.marshalling; +/** + * @author André Dietisheim + */ +public interface IOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> { -public interface IOpenshiftMarshaller<OBJECT extends IOpenshiftRequest> { - - public String marshall(OBJECT object); + public String marshall(REQUEST object); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,5 +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.ide.eclipse.as.openshift.core.internal.marshalling; +/** + * @author André Dietisheim + */ public interface IOpenshiftRequest { } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequestMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,9 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; - -import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; - -public interface IOpenshiftRequestMarshaller<REQUEST> { - - public String marshall(REQUEST request); - -} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.core.internal.marshalling; + +import org.jboss.dmr.ModelNode; +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest; + +/** + * @author André Dietisheim + */ +public class ListCartridgesRequestJsonMarshaller extends AbstractJsonMarshaller<ListCartridgesRequest> { + + @Override + protected void setNodeProperties(ModelNode node, ListCartridgesRequest request) { + node.get(IOpenshiftJsonConstants.PROPERTY_CART_TYPE).set(request.getCartType()); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.core.internal.marshalling; import java.io.UnsupportedEncodingException; @@ -5,6 +15,9 @@ import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +/** + * @author André Dietisheim + */ public class OpenshiftJsonRequestFactory { private static final char EQ = '='; @@ -12,6 +25,7 @@ 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; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,16 +1,19 @@ +/******************************************************************************* + * 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.core.internal.marshalling; -import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; - -public class UserInfoRequestJsonMarshaller implements IOpenshiftRequestMarshaller<UserInfoRequest> { - - public String marshall(UserInfoRequest userInfoRequest) { - ModelNode node = new ModelNode(); - node.get(IOpenshiftJsonConstants.PROPERTY_RHLOGIN).set(userInfoRequest.getRhLogin()); - node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).set(String.valueOf(userInfoRequest.isDebug())); - return node.toJSONString(true); - } - +/** + * @author André Dietisheim + */ +public class UserInfoRequestJsonMarshaller extends AbstractJsonMarshaller<UserInfoRequest> { } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Activator.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.internal.core; import org.osgi.framework.BundleActivator; @@ -11,20 +21,11 @@ return context; } - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; } - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ public void stop(BundleContext bundleContext) throws Exception { Activator.context = null; } - } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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.internal.core; + +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftObject; + +/** + * @author André Dietisheim + */ +public class Cartridge implements IOpenshiftObject { + + private String name; + + private Cartridge(String name) { + this.name = name; + } + + public String getName() { + return name; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UserInfo.java (from rev 34533, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UserInfo.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UserInfo.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,54 @@ +/******************************************************************************* + * 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.internal.core; + +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftObject; +import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; + +/** + * @author André Dietisheim + */ +public class UserInfo implements IOpenshiftObject { + + private String rhlogin; + private String uuId; + private String sshKey; + private String rhcDomain; + private String namespace; + + public UserInfo(String rhlogin, String uuid, String sshKey, String rhcDomain, String namespace) { + this.rhlogin = rhlogin; + this.uuId = uuid; + this.sshKey = sshKey; + this.rhcDomain = rhcDomain; + this.namespace = namespace; + } + + public String getRhlogin() { + return rhlogin; + } + + public String getUuId() { + return uuId; + } + + public String getRhcDomain() { + return rhcDomain; + } + + public String getSSHKey() { + return sshKey; + } + + public String getNamespace() { + return namespace; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/UserInfo.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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.internal.core.request; + +import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; + +/** + * @author André Dietisheim + */ +public 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; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationAction.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationAction.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,15 @@ +/******************************************************************************* + * 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.internal.core.request; + +public enum ApplicationAction { + CONFIGURE, DECONFIGURE, START, STOP, RESTART, STATUS +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationRequest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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.internal.core.request; + +import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge; + +/** + * @author André Dietisheim + */ +public class ApplicationRequest extends AbstractOpenshiftRequest { + + private String name; + private Cartridge cartridge ; + + public ApplicationRequest(String name, Cartridge cartridge, ApplicationAction action, String username) { + this(name, cartridge, action, username, false); + } + + public ApplicationRequest(String name, Cartridge cartridge, ApplicationAction applicationAction, String username, boolean debug) { + super(username, debug); + this.name = name; + this.cartridge = cartridge; + } + + protected String getName() { + return name; + } + + protected Cartridge getCartridge() { + return cartridge; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ApplicationRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ListCartridgesRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ListCartridgesRequest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ListCartridgesRequest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -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.ide.eclipse.as.openshift.internal.core.request; + + +/** + * @author André Dietisheim + */ +public class ListCartridgesRequest extends AbstractOpenshiftRequest { + + private static final String CART_TYPE_STANDALONE = "standalone"; + + public ListCartridgesRequest(String username) { + this(username, false); + } + + public ListCartridgesRequest(String username, boolean debug) { + super(username, debug); + } + + public String getCartType() { + return CART_TYPE_STANDALONE; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/ListCartridgesRequest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/UserInfoRequest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,28 +1,26 @@ +/******************************************************************************* + * 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.internal.core.request; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; +/** + * @author André Dietisheim + */ +public class UserInfoRequest extends AbstractOpenshiftRequest { -public class UserInfoRequest implements IOpenshiftRequest { - - private String rhlogin; - private boolean debug; - public UserInfoRequest(String username) { this(username, false); } public UserInfoRequest(String username, boolean debug) { - this.rhlogin = username; - this.debug = debug; + super(username, debug); } - - public String getRhLogin() { - return rhlogin; - } - - public boolean isDebug() { - return debug; - } - } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainFactoryTest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,28 +0,0 @@ -package org.jboss.ide.eclipse.as.openshift.internal.test.core; - -import org.jboss.ide.eclipse.as.openshift.core.Domain; -import org.jboss.ide.eclipse.as.openshift.core.DomainException; -import org.jboss.ide.eclipse.as.openshift.core.DomainFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class DomainFactoryTest { - - @Before - public void setUp() { - - } - - @After - public void tearDown() { - - } - - @Test - public void canCreateDomain() throws DomainException { - DomainFactory domainFactory = new DomainFactory(); - Domain domain = domainFactory.create(); - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -2,10 +2,14 @@ import static org.junit.Assert.assertEquals; +import java.net.URLEncoder; + import org.jboss.ide.eclipse.as.openshift.core.Openshift; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; import org.junit.After; import org.junit.Before; @@ -15,8 +19,8 @@ private Openshift openshift; - private static final String USERNAME = &quot;dietisheim(a)gmx.net&quot;; - private static final String PASSWORD = "1q2w3e"; + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q3e5t7u"; @Before public void setUp() { @@ -29,8 +33,8 @@ } @Test - public void canMarshallRequestCorrectly() throws OpenshiftException { - String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22dietisheim%40gmx.net%22%2C+%22debug%22+%3A+%22true%22%7D"; + public void canMarshallUserInfoRequest() throws Exception { + String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22" + URLEncoder.encode(USERNAME, "UTF-8") + "%22%2C+%22debug%22+%3A+%22true%22%7D"; String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(USERNAME, true)); String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, userInfoRequest).create(); @@ -43,4 +47,16 @@ openshift.getUserInfo(); } + @Test + public void canMarshallListCartridgesRequest() throws Exception { + String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22" + URLEncoder.encode(USERNAME, "UTF-8") + "%22%2C+%22debug%22+%3A+%22true%22%2C+%22cart_type%22+%3A+%22standalone%22%7D"; + + String listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall(new ListCartridgesRequest(USERNAME, true)); + String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, listCartridgeRequest).create(); + + assertEquals(expectedRequestString, effectiveRequest); + + + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java 2011-09-06 11:11:04 UTC (rev 34537) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/Activator.java 2011-09-06 12:02:24 UTC (rev 34538) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import org.osgi.framework.BundleActivator; @@ -11,18 +21,10 @@ return context; } - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; } - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ public void stop(BundleContext bundleContext) throws Exception { Activator.context = null; }