[jbosstools-commits] JBoss Tools SVN: r30572 - in workspace/adietish: org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-04-14 09:27:36 -0400 (Thu, 14 Apr 2011)
New Revision: 30572

Modified:
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/TypedDeployerIntegrationTest.java
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/internal/TypedDeployer.java
Log:
starting minimalistic typed deployer with tests

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/internal/TypedDeployer.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/internal/TypedDeployer.java	2011-04-14 12:56:45 UTC (rev 30571)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/internal/TypedDeployer.java	2011-04-14 13:27:36 UTC (rev 30572)
@@ -21,9 +21,11 @@
  */
 package org.jboss.ide.eclipse.as7.deployment.internal;
 
+import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 import org.jboss.as.controller.client.ModelControllerClient;
+import org.jboss.as.controller.client.helpers.standalone.DeploymentPlan;
 import org.jboss.as.controller.client.helpers.standalone.InitialDeploymentPlanBuilder;
 import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager;
 import org.jboss.as.protocol.StreamUtils;
@@ -41,10 +43,10 @@
 		try {
 			client = ModelControllerClient.Factory.create(host, port);
 			ServerDeploymentManager manager = ServerDeploymentManager.Factory.create(client);
-			InitialDeploymentPlanBuilder plan = manager.newDeploymentPlan();
+			InitialDeploymentPlanBuilder builder = manager.newDeploymentPlan();
 			
-			plan.undeploy(name).undeploy(name).andRemoveUndeployed();
-			manager.execute(plan.build()).get(TIMEOUT, TimeUnit.MILLISECONDS);
+			DeploymentPlan plan = builder.undeploy(name).andRemoveUndeployed().build();
+			manager.execute(plan).get(TIMEOUT, TimeUnit.MILLISECONDS);
 		} catch(Exception e) {
 			throw new DeployerException(e);
 		} finally {
@@ -52,7 +54,24 @@
 		}
 	}
 
-//	public static void deploy(File file, String host, int port) throws DeployerException {
+	public static void deploy(File file, String host, int port) throws DeployerException {
+		ModelControllerClient client = null;
+		try {
+			client = ModelControllerClient.Factory.create(host, port);
+			ServerDeploymentManager manager = ServerDeploymentManager.Factory.create(client);
+			InitialDeploymentPlanBuilder builder = manager.newDeploymentPlan();
+
+			String name = file.getName();
+			DeploymentPlan plan = builder.add(name, file).deploy(name).build();
+			manager.execute(plan).get(TIMEOUT, TimeUnit.MILLISECONDS);
+		} catch(Exception e) {
+			throw new DeployerException(e);
+		} finally {
+			StreamUtils.safeClose(client);
+		}
+	}
+
+	//	public static void deploy(File file, String host, int port) throws DeployerException {
 //		ModelControllerClient client = null;
 //		try {
 //			client = ModelControllerClient.Factory.create(host, port);

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/TypedDeployerIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/TypedDeployerIntegrationTest.java	2011-04-14 12:56:45 UTC (rev 30571)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/TypedDeployerIntegrationTest.java	2011-04-14 13:27:36 UTC (rev 30572)
@@ -27,7 +27,7 @@
 import java.net.URL;
 import java.text.MessageFormat;
 
-import org.jboss.ide.eclipse.as7.deployment.detyped.DetypedDeployer;
+import org.jboss.ide.eclipse.as7.deployment.internal.TypedDeployer;
 import org.junit.Test;
 
 /**
@@ -48,7 +48,7 @@
 	public void canDeploy() throws Exception {
 		File warFile = DeployerTestUtils.getWarFile(MINIMALISTIC_WAR);
 		try {
-			DetypedDeployer.deploy(warFile, HOST, MGMT_PORT);
+			TypedDeployer.deploy(warFile, HOST, MGMT_PORT);
 
 			String response = DeployerTestUtils.getServerResponse(new URL(
 					MessageFormat.format(
@@ -114,7 +114,7 @@
 //
 	private void quietlyUndeploy(File file) {
 		try {
-			DetypedDeployer.undeploy(file.getName(), HOST, MGMT_PORT);
+			TypedDeployer.undeploy(file.getName(), HOST, MGMT_PORT);
 		} catch (Exception e) {
 			e.printStackTrace();
 			// ignore