JBoss Tools SVN: r34547 - branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-06 12:20:53 -0400 (Tue, 06 Sep 2011)
New Revision: 34547
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
Log:
remove @Override to make everything compile with jdk5 again
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -100,7 +100,6 @@
final Decision decision = (Decision)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
decision.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -69,7 +69,6 @@
final EndState endState = (EndState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
endState.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -103,7 +103,6 @@
final Fork fork = (Fork)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
fork.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -95,7 +95,6 @@
final Join join = (Join)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
join.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -122,7 +122,6 @@
final MailNode mailNode = (MailNode)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
mailNode.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -121,7 +121,6 @@
final Node node = (Node)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
node.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -108,7 +108,6 @@
final ProcessState processState = (ProcessState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
processState.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -84,7 +84,6 @@
final StartState startState = (StartState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
startState.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -96,7 +96,6 @@
final State state = (State)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
state.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -120,7 +120,6 @@
final SuperState superState = (SuperState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
superState.setName(newValue);
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-09-06 16:14:43 UTC (rev 34546)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-09-06 16:20:53 UTC (rev 34547)
@@ -115,7 +115,6 @@
final TaskNode taskNode = (TaskNode)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
taskNode.setName(newValue);
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34546 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-06 12:14:43 -0400 (Tue, 06 Sep 2011)
New Revision: 34546
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-9669 Missing provider name for org.jboss.ide.eclipse.as.egit.ui
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/META-INF/MANIFEST.MF 2011-09-06 16:08:27 UTC (rev 34545)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/META-INF/MANIFEST.MF 2011-09-06 16:14:43 UTC (rev 34546)
@@ -14,3 +14,4 @@
org.jboss.ide.eclipse.as.egit.core;bundle-version="0.0.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34545 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-06 12:08:27 -0400 (Tue, 06 Sep 2011)
New Revision: 34545
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-9669 Missing provider name for org.jboss.tools.cdi.seam.faces.core
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF 2011-09-06 15:34:58 UTC (rev 34544)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF 2011-09-06 16:08:27 UTC (rev 34545)
@@ -14,3 +14,4 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.tools.cdi.seam.faces.core
+Bundle-Vendor: JBoss by Red Hat
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34544 - in trunk/as/plugins: org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-06 11:34:58 -0400 (Tue, 06 Sep 2011)
New Revision: 34544
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/ApplicationResponseFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/OpenshiftResponse.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StringUtils.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/OpenshiftJsonRequestFactory.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
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/Openshift.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/request/ApplicationRequest.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/OpenshiftIntegrationTest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java
Log:
[JBIDE-9510] added create application request
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-06 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-06 15:34:58 UTC (rev 34544)
@@ -13,4 +13,6 @@
Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
org.jboss.ide.eclipse.as.openshift.core,
org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
- org.jboss.ide.eclipse.as.openshift.internal.core.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test"
+ org.jboss.ide.eclipse.as.openshift.internal.core;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
+ org.jboss.ide.eclipse.as.openshift.internal.core.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
+ org.jboss.ide.eclipse.as.openshift.internal.core.response;x-friends:="org.jboss.ide.eclipse.as.openshift.test"
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -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;
+
+import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge;
+
+public class Application implements IOpenshiftObject {
+
+ private String name;
+ private Cartridge cartridge;
+
+ public Application(String name, Cartridge cartridge) {
+ this.name = name;
+ this.cartridge = cartridge;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public Cartridge getCartridge() {
+ return cartridge;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.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/IOpenshift.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java 2011-09-06 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshift.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -18,6 +18,8 @@
public interface IOpenshift {
public UserInfo getUserInfo() throws OpenshiftException;
-
+
public List<Cartridge> getCartridges() throws OpenshiftException;
+
+ public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException;
}
Modified: 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/IOpenshiftJsonConstants.java 2011-09-06 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -1,10 +1,31 @@
+/*******************************************************************************
+ * 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 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";
}
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 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -15,15 +15,20 @@
import java.util.List;
import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller;
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.ApplicationAction;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest;
import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory;
import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest;
+import org.jboss.ide.eclipse.as.openshift.internal.core.response.ApplicationResponseFactory;
+import org.jboss.ide.eclipse.as.openshift.internal.core.response.OpenshiftResponse;
/**
* @author André Dietisheim
@@ -58,14 +63,6 @@
}
}
- 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 {
ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(username, true);
@@ -84,6 +81,32 @@
NLS.bind("Could not list available cartridges at \"{0}\"",
listCartridgesRequest.getUrlString(BASE_URL)), e);
}
+ }
+
+ @Override
+ public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException {
+ ApplicationRequest applicationRequest = new ApplicationRequest(name, cartridge, ApplicationAction.CONFIGURE, username, true);
+ try {
+ String listCartridgesRequestString =
+ new ApplicationRequestJsonMarshaller().marshall(applicationRequest);
+ String request = new OpenshiftJsonRequestFactory(password, listCartridgesRequestString).create();
+ String response = createHttpClient(applicationRequest.getUrl(BASE_URL)).post(request);
+ OpenshiftResponse<Application> openshiftResponse = new ApplicationResponseFactory(response, name, cartridge).create();
+ return openshiftResponse.getData();
+ } catch (MalformedURLException e) {
+ throw new OpenshiftException(
+ NLS.bind("Could not create application \"{0}\" at \"{1}\"",
+ name, applicationRequest.getUrlString(BASE_URL)), e);
+ } catch (HttpClientException e) {
+ throw new OpenshiftException(
+ NLS.bind("Could not create application \"{0}\" at \"{1}\"",
+ name, applicationRequest.getUrlString(BASE_URL)), e);
+ }
+
}
+ private IHttpClient createHttpClient(URL url) {
+ return new UrlConnectionHttpClient(url);
+ }
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.Cartridge;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationAction;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationRequestJsonMarshaller extends AbstractJsonMarshaller<ApplicationRequest> {
+
+ @Override
+ protected void setNodeProperties(ModelNode node, ApplicationRequest request) {
+ node.get(IOpenshiftJsonConstants.PROPERTY_CARTRIDGE).set(getCartridgeName(request.getCartridge()));
+ node.get(IOpenshiftJsonConstants.PROPERTY_ACTION).set(getActionName(request.getAction()));
+ node.get(IOpenshiftJsonConstants.PROPERTY_APP_NAME).set(request.getName());
+ }
+
+ private String getCartridgeName(Cartridge cartridge) {
+ if (cartridge == null) {
+ return null;
+ }
+ return cartridge.getName();
+ }
+
+ private String getActionName(ApplicationAction action) {
+ if (action == null) {
+ return null;
+ }
+ return action.name().toLowerCase();
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: 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 15:23:25 UTC (rev 34543)
+++ 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 15:34:58 UTC (rev 34544)
@@ -1,73 +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.ide.eclipse.as.openshift.core.internal.marshalling;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
-
-/**
- * @author André Dietisheim
- */
-public class OpenshiftJsonRequestFactory {
-
- 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 OpenshiftJsonRequestFactory(String password, String... payloads) {
- this.password = password;
- this.payloads = payloads;
- }
-
- public String create() throws OpenshiftException {
- try {
- StringBuilder builder = new StringBuilder();
- appendPassword(builder);
- builder.append(AMP);
- appendPayload(builder);
- return builder.toString();
- } catch (UnsupportedEncodingException e) {
- throw new OpenshiftException("Could not create request", e);
- }
- }
-
- 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.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 2011-09-06 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/Cartridge.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -19,7 +19,7 @@
private String name;
- private Cartridge(String name) {
+ public Cartridge(String name) {
this.name = name;
}
Modified: 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 2011-09-06 15:23:25 UTC (rev 34543)
+++ 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 15:34:58 UTC (rev 34544)
@@ -19,27 +19,33 @@
private String name;
private Cartridge cartridge ;
+ private ApplicationAction action;
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) {
+ public ApplicationRequest(String name, Cartridge cartridge, ApplicationAction action, String username, boolean debug) {
super(username, debug);
this.name = name;
this.cartridge = cartridge;
+ this.action = action;
}
- protected String getName() {
+ public ApplicationAction getAction() {
+ return action;
+ }
+
+ public String getName() {
return name;
}
- protected Cartridge getCartridge() {
+ public Cartridge getCartridge() {
return cartridge;
}
@Override
- protected String getResourcePath() {
+ public String getResourcePath() {
return "cartridge";
}
}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java (from rev 34538, 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/internal/core/request/OpenshiftJsonRequestFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * 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 java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+
+/**
+ * @author André Dietisheim
+ */
+public class OpenshiftJsonRequestFactory {
+
+ 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 OpenshiftJsonRequestFactory(String password, String... payloads) {
+ this.password = password;
+ this.payloads = payloads;
+ }
+
+ public String create() throws OpenshiftException {
+ try {
+ StringBuilder builder = new StringBuilder();
+ appendPassword(builder);
+ builder.append(AMP);
+ appendPayload(builder);
+ return builder.toString();
+ } catch (UnsupportedEncodingException e) {
+ throw new OpenshiftException("Could not create request", e);
+ }
+ }
+
+ 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.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/OpenshiftJsonRequestFactory.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 15:23:25 UTC (rev 34543)
+++ 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 15:34:58 UTC (rev 34544)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.internal.core.request;
-
/**
* @author André Dietisheim
*/
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseFactory.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.response;
+
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants;
+import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftObject;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+
+/**
+ * @author André Dietisheim
+ */
+public abstract class AbstractOpenshiftJsonResponseFactory<OPENSHIFTOBJECT extends IOpenshiftObject> {
+
+ private String response;
+
+ public AbstractOpenshiftJsonResponseFactory(String response) {
+ this.response = response;
+ }
+
+ public OpenshiftResponse<OPENSHIFTOBJECT> create() throws OpenshiftException {
+ ModelNode node = ModelNode.fromJSONString(response);
+ boolean debug = node.get(IOpenshiftJsonConstants.PROPERTY_DEBUG).asBoolean();
+ String messages = node.get(IOpenshiftJsonConstants.PROPERTY_MESSAGES).asString();
+ String result = node.get(IOpenshiftJsonConstants.PROPERTY_RESULT).asString();
+ int exitCode = node.get(IOpenshiftJsonConstants.PROPERTY_EXIT_CODE).asInt();
+ OPENSHIFTOBJECT openshiftObject = createOpenshiftObject(node.get(IOpenshiftJsonConstants.PROPERTY_DATA));
+ return new OpenshiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode);
+ }
+
+ protected abstract OPENSHIFTOBJECT createOpenshiftObject(ModelNode node);
+
+ protected String getResponse() {
+ return response;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/AbstractOpenshiftJsonResponseFactory.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/response/ApplicationResponseFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/ApplicationResponseFactory.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/ApplicationResponseFactory.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.response;
+
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.core.Application;
+import org.jboss.ide.eclipse.as.openshift.internal.core.Cartridge;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationResponseFactory extends AbstractOpenshiftJsonResponseFactory<Application> {
+
+ private String applicationName;
+ private Cartridge cartridge;
+
+ public ApplicationResponseFactory(String response, String applicationName, Cartridge cartridge) {
+ super(response);
+ this.applicationName = applicationName;
+ this.cartridge = cartridge;
+ }
+
+ @Override
+ protected Application createOpenshiftObject(ModelNode node) {
+ return new Application(applicationName, cartridge);
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/ApplicationResponseFactory.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/response/OpenshiftResponse.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/OpenshiftResponse.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/OpenshiftResponse.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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.response;
+
+import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftObject;
+
+/**
+ * @author André Dietisheim
+ */
+public class OpenshiftResponse<OPENSHIFTOBJECT extends IOpenshiftObject> {
+
+ 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 getData() {
+ return openshiftObject;
+ }
+
+ public int getExitCode() {
+ return exitCode;
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/OpenshiftResponse.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/utils/StringUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StringUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StringUtils.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -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.internal.core.utils;
+
+
+/**
+ * @author André Dietisheim
+ */
+public class StringUtils {
+
+ public static String toLowerCase(String message) {
+ if (message == null) {
+ return null;
+ }
+ return message.toLowerCase();
+ }
+
+ public static String toLowerCase(Enum<?> aEnum) {
+ if (aEnum == null) {
+ return null;
+ }
+ return toLowerCase(aEnum.name());
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/utils/StringUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java 2011-09-06 15:23:25 UTC (rev 34543)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java 2011-09-06 15:34:58 UTC (rev 34544)
@@ -1,17 +1,7 @@
package org.jboss.ide.eclipse.as.openshift.internal.test.core;
-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;
import org.junit.Test;
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 15:23:25 UTC (rev 34543)
+++ 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 15:34:58 UTC (rev 34544)
@@ -4,18 +4,21 @@
import java.net.URLEncoder;
-import org.jboss.ide.eclipse.as.openshift.core.Openshift;
+import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller;
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.request.ApplicationAction;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest;
import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest;
+import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory;
import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest;
import org.junit.Test;
public class OpenshiftTest {
private static final String USERNAME = "toolsjboss(a)gmail.com";
- private static final String PASSWORD = "1q3e5t7u";
+ private static final String PASSWORD = "1q2w3e";
@Test
public void canMarshallUserInfoRequest() throws Exception {
@@ -38,11 +41,33 @@
+ 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 listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall(
+ new ListCartridgesRequest(USERNAME, true));
String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, listCartridgeRequest).create();
assertEquals(expectedRequestString, effectiveRequest);
}
+ @Test
+ public void canMarshallApplicationCreateRequest() 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+%22cartridge%22+%3A+%22jbossas-7.0%22"
+ + "%2C+%22action%22+%3A+%22configure%22"
+ + "%2C+%22app_name%22+%3A+%22test-application%22"
+ + "%7D";
+
+ String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall(
+ new ApplicationRequest(
+ "test-application", new Cartridge("jbossas-7.0"), ApplicationAction.CONFIGURE, USERNAME, true));
+ String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, createApplicationRequest).create();
+
+ assertEquals(expectedRequestString, effectiveRequest);
+ }
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34543 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-06 11:23:25 -0400 (Tue, 06 Sep 2011)
New Revision: 34543
Added:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/.gitignore
Log:
.gitignore file
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/.gitignore
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/.gitignore (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/.gitignore 2011-09-06 15:23:25 UTC (rev 34543)
@@ -0,0 +1 @@
+swtbot.properties
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34542 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-09-06 09:17:00 -0400 (Tue, 06 Sep 2011)
New Revision: 34542
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
swtbotext: better conditions for running junit3 test methods
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-09-06 13:11:35 UTC (rev 34541)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-09-06 13:17:00 UTC (rev 34542)
@@ -1,6 +1,7 @@
package org.jboss.tools.ui.bot.ext;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -139,7 +140,13 @@
protected List<FrameworkMethod> computeTestMethods() {
List<FrameworkMethod> testMethods = new ArrayList<FrameworkMethod>();
for (Method mm : getTestClass().getJavaClass().getMethods()) {
- if (mm.getName().startsWith("test") || mm.getAnnotation(Test.class)!=null) {
+ if (mm.getAnnotation(Test.class)!=null
+ ||
+ (mm.getName().startsWith("test")
+ && !Modifier.isStatic(mm.getModifiers())
+ && mm.getParameterTypes().length==0
+ && Void.TYPE.equals(mm.getReturnType())
+ )) {
testMethods.add(new FrameworkMethod(mm));
}
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34541 - branches/jbosstools-3.3.0.M3/maven/plugins/org.jboss.tools.maven.ui.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-09-06 09:11:35 -0400 (Tue, 06 Sep 2011)
New Revision: 34541
Modified:
branches/jbosstools-3.3.0.M3/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
Log:
JBIDE-9666 : fix maven library provider name typo
Modified: branches/jbosstools-3.3.0.M3/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-09-06 12:53:56 UTC (rev 34540)
+++ branches/jbosstools-3.3.0.M3/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-09-06 13:11:35 UTC (rev 34541)
@@ -11,7 +11,7 @@
<extension point="org.eclipse.jst.common.project.facet.ui.libraryProviderActionPanels">
<panel
- provider="mapass-library-provider"
+ provider="maven-library-provider"
class="org.jboss.tools.maven.ui.internal.libprov.MavenUserLibraryProviderInstallPanel"/>
</extension>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34540 - trunk/maven/plugins/org.jboss.tools.maven.ui.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-09-06 08:53:56 -0400 (Tue, 06 Sep 2011)
New Revision: 34540
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
Log:
JBIDE-9666 : fix maven library provider name typo
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-09-06 12:29:10 UTC (rev 34539)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-09-06 12:53:56 UTC (rev 34540)
@@ -11,7 +11,7 @@
<extension point="org.eclipse.jst.common.project.facet.ui.libraryProviderActionPanels">
<panel
- provider="mapass-library-provider"
+ provider="maven-library-provider"
class="org.jboss.tools.maven.ui.internal.libprov.MavenUserLibraryProviderInstallPanel"/>
</extension>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34539 - in trunk/as/plugins: org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-06 08:29:10 -0400 (Tue, 06 Sep 2011)
New Revision: 34539
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.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/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/ApplicationRequest.java
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/UserInfoRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTest.java
Log:
[JBIDE-9591] added list cartridges request
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 12:02:24 UTC (rev 34538)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Openshift.java 2011-09-06 12:29:10 UTC (rev 34539)
@@ -7,16 +7,14 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.core;
import java.net.MalformedURLException;
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;
@@ -26,7 +24,6 @@
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;
/**
* @author André Dietisheim
@@ -44,55 +41,48 @@
}
public UserInfo getUserInfo() throws OpenshiftException {
- UrlBuilder userInfoUrlBuilder = new UrlBuilder(BASE_URL).path("userinfo");
+ UserInfoRequest userInfoRequest = new UserInfoRequest(username, true);
try {
- String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(username, true));
- String request = new OpenshiftJsonRequestFactory(password, userInfoRequest).create();
- String userInfoResponse = createHttpClient(userInfoUrlBuilder.toUrl()).post(request);
- ModelNode userInfoReponse = ModelNode.fromJSONString(userInfoResponse);
- return new UserInfo(
- userInfoReponse.get("rhlogin").asString(),
- userInfoReponse.get("uuid").asString(),
- userInfoReponse.get("ssh_key").asString(),
- userInfoReponse.get("rhc_domain").asString(),
- userInfoReponse.get("namespace").asString());
+ String userInfoRequestString = new UserInfoRequestJsonMarshaller().marshall(userInfoRequest);
+ String request = new OpenshiftJsonRequestFactory(password, userInfoRequestString).create();
+ String userInfoResponse = createHttpClient(userInfoRequest.getUrl(BASE_URL)).post(request);
+ throw new UnsupportedOperationException();
} catch (MalformedURLException e) {
throw new OpenshiftException(
NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
- userInfoUrlBuilder.toString()), e);
+ userInfoRequest.getUrlString(BASE_URL)), e);
} catch (HttpClientException e) {
throw new OpenshiftException(
NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
- userInfoUrlBuilder.toString()), e);
+ userInfoRequest.getUrlString(BASE_URL)), 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");
+ ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(username, true);
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;
+ String listCartridgesRequestString =
+ new ListCartridgesRequestJsonMarshaller().marshall(listCartridgesRequest);
+ String request = new OpenshiftJsonRequestFactory(password, listCartridgesRequestString).create();
+ String listCatridgesReponse = createHttpClient(listCartridgesRequest.getUrl(BASE_URL)).post(request);
+ throw new UnsupportedOperationException();
} catch (MalformedURLException e) {
throw new OpenshiftException(
- NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
- userInfoUrlBuilder.toString()), e);
+ NLS.bind("Could not list available cartridges at \"{0}\"",
+ listCartridgesRequest.getUrlString(BASE_URL)), e);
} catch (HttpClientException e) {
throw new OpenshiftException(
- NLS.bind("Could not get user info for user \"{0}\" at \"{1}\"", username,
- userInfoUrlBuilder.toString()), e);
+ NLS.bind("Could not list available cartridges at \"{0}\"",
+ listCartridgesRequest.getUrlString(BASE_URL)), e);
}
}
Modified: 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 2011-09-06 12:02:24 UTC (rev 34538)
+++ 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:29:10 UTC (rev 34539)
@@ -10,12 +10,16 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.internal.core.request;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest;
+import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder;
/**
* @author André Dietisheim
*/
-public class AbstractOpenshiftRequest implements IOpenshiftRequest {
+public abstract class AbstractOpenshiftRequest implements IOpenshiftRequest {
private String rhlogin;
private boolean debug;
@@ -37,4 +41,14 @@
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.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 2011-09-06 12:02:24 UTC (rev 34538)
+++ 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:29:10 UTC (rev 34539)
@@ -37,4 +37,9 @@
protected Cartridge getCartridge() {
return cartridge;
}
+
+ @Override
+ protected String getResourcePath() {
+ return "cartridge";
+ }
}
Modified: 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 2011-09-06 12:02:24 UTC (rev 34538)
+++ 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:29:10 UTC (rev 34539)
@@ -29,4 +29,10 @@
public String getCartType() {
return CART_TYPE_STANDALONE;
}
+
+ @Override
+ protected String getResourcePath() {
+ return "cartlist";
+ }
+
}
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 12:02:24 UTC (rev 34538)
+++ 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:29:10 UTC (rev 34539)
@@ -23,4 +23,9 @@
public UserInfoRequest(String username, boolean debug) {
super(username, debug);
}
+
+ @Override
+ protected String getResourcePath() {
+ return "userinfo";
+ }
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java 2011-09-06 12:29:10 UTC (rev 34539)
@@ -0,0 +1,41 @@
+package org.jboss.ide.eclipse.as.openshift.internal.test.core;
+
+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;
+import org.junit.Test;
+
+public class OpenshiftIntegrationTest {
+
+ private Openshift openshift;
+
+ private static final String USERNAME = "toolsjboss(a)gmail.com";
+ private static final String PASSWORD = "1q3e5t7u";
+
+ @Before
+ public void setUp() {
+ this.openshift = new Openshift(USERNAME, PASSWORD);
+ }
+
+ @Test(expected=OpenshiftException.class)
+ public void cannotGetUserInfoIfNotAppNorDomainCreated() throws OpenshiftException {
+ openshift.getUserInfo();
+ }
+
+ @Test
+ public void canRequestListCartridges() throws Exception {
+ openshift.getCartridges();
+ }
+
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 12:02:24 UTC (rev 34538)
+++ 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:29:10 UTC (rev 34539)
@@ -5,58 +5,44 @@
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;
import org.junit.Test;
public class OpenshiftTest {
- private Openshift openshift;
-
private static final String USERNAME = "toolsjboss(a)gmail.com";
private static final String PASSWORD = "1q3e5t7u";
- @Before
- public void setUp() {
- this.openshift = new Openshift(USERNAME, PASSWORD);
- }
-
- @After
- public void tearDown() {
-
- }
-
@Test
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 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();
assertEquals(expectedRequestString, effectiveRequest);
}
-
- @Test(expected=OpenshiftException.class)
- public void cannotGetUserInfoIfNotAppNorDomainCreated() throws OpenshiftException {
- 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 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 listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall(new ListCartridgesRequest(
+ USERNAME, true));
String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, listCartridgeRequest).create();
assertEquals(expectedRequestString, effectiveRequest);
-
-
}
-
+
}
14 years, 7 months
- 1
- 0
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.
by jbosstools-commits＠lists.jboss.org
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 = "dietisheim(a)gmx.net";
- private static final String PASSWORD = "1q2w3e";
+ private static final String USERNAME = "toolsjboss(a)gmail.com";
+ 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;
}
14 years, 7 months
- 1
- 0