Author: adietish Date: 2011-09-13 05:01:04 -0400 (Tue, 13 Sep 2011) New Revision: 34662 Modified: 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/IOpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java Log: [JBIDE-9510] implement restart application Modified: 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 2011-09-13 00:45:04 UTC (rev 34661) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-13 09:01:04 UTC (rev 34662) @@ -39,6 +39,10 @@ service.startApplication(name, cartridge); } + public void restart() throws OpenshiftException { + service.restartApplication(name, cartridge); + } + public void stop() throws OpenshiftException { service.stopApplication(name, cartridge); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-13 00:45:04 UTC (rev 34661) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-13 09:01:04 UTC (rev 34662) @@ -27,6 +27,8 @@ public Application startApplication(String name, Cartridge cartridge) throws OpenshiftException; + public Application restartApplication(String name, Cartridge cartridge) throws OpenshiftException; + public Application stopApplication(String name, Cartridge cartridge) throws OpenshiftException; public Domain changeDomain(String domainName, SSHKey sshKey) throws OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 00:45:04 UTC (rev 34661) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 09:01:04 UTC (rev 34662) @@ -162,6 +162,12 @@ } @Override + public Application restartApplication(String name, Cartridge cartridge) throws OpenshiftException { + return requestApplicationAction(name, cartridge, + new ApplicationRequest(name, cartridge, ApplicationAction.RESTART, username, true)); + } + + @Override public Application stopApplication(String name, Cartridge cartridge) throws OpenshiftException { return requestApplicationAction(name, cartridge, new ApplicationRequest(name, cartridge, ApplicationAction.STOP, username, true)); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java 2011-09-13 00:45:04 UTC (rev 34661) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java 2011-09-13 09:01:04 UTC (rev 34662) @@ -99,6 +99,58 @@ } } + @Test + public void canStartStartedApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.startApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Test + public void canStopStoppedApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Test + public void canRestartApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.restartApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + private String createRandomApplicationName() { return String.valueOf(System.currentTimeMillis()); }