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

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-04-11 11:30:15 -0400 (Mon, 11 Apr 2011)
New Revision: 30473

Added:
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
Modified:
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
Log:
[JBIDE-8690] added further source jars

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath	2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath	2011-04-11 15:30:15 UTC (rev 30473)
@@ -4,9 +4,9 @@
 	<classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="jboss-threads-2.0.0.CR8-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="jboss-dmr-1.0.0.Beta5-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>

Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)


Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
===================================================================
(Binary files differ)


Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java	2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java	2011-04-11 15:30:15 UTC (rev 30473)
@@ -56,6 +56,10 @@
 	}
 
 	private IStatus createStatus(DeploymentAction action, ServerDeploymentActionResult actionResult) {
+		if (actionResult == null) {
+			return null;
+		}
+
 		IStatus status = null;
 		switch (actionResult.getResult()) {
 		case NOT_EXECUTED:

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java	2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java	2011-04-11 15:30:15 UTC (rev 30473)
@@ -28,7 +28,7 @@
  */
 public class DeploymentBuilder {
 
-	public static final long DEFAULT_TIMEOUT = 15 * 1000;
+	public static final long DEFAULT_TIMEOUT = 30 * 1000;
 
 	private final List<Deployable> deployables = new ArrayList<Deployable>();
 	private long timeout = DEFAULT_TIMEOUT;
@@ -71,8 +71,6 @@
 			return deployables;
 		} catch (Exception e) {
 			throw new DeploymentException(e);
-		} finally {
-			cleanup();
 		}
 	}
 
@@ -89,8 +87,4 @@
 			deployable.setDeploymentAction(builder.getLastAction());
 		}
 	}
-
-	private void cleanup() {
-		session.close();
-	}
 }

Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java	2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java	2011-04-11 15:30:15 UTC (rev 30473)
@@ -30,6 +30,7 @@
 import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder;
 import org.jboss.ide.eclipse.as7.deployment.DeploymentException;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
@@ -38,7 +39,7 @@
  */
 public class DeploymentBuilderIntegrationTest {
 
-	private static final String WAR_FOLDER = "wars/";
+	private static final String WAR_FOLDER = "/wars/";
 
 	private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
 
@@ -60,12 +61,14 @@
 		}
 	}
 
+	@Ignore
 	@Test
 	public void canDeploy() throws DeploymentException, URISyntaxException, IOException {
 		File file = getWarFile("minimalistic.war");
 		new DeploymentBuilder(HOST, PORT).add(file).deploy();
 	}
 
+	@Ignore
 	@Test
 	public void returnsDeployables() throws DeploymentException, URISyntaxException, IOException {
 		String warName = "minimalistic.war";
@@ -82,7 +85,6 @@
 		Deployable deployable = deployables.get(0);
 		assertNotNull(deployable.getStatus());
 	}
-
 	
 	private File getWarFile(String name) throws URISyntaxException, IOException {
 		Bundle bundle = Platform.getBundle(BUNDLE_ID);