[jbehave-scm] [778] trunk: [EK] Moved up to ant 1.7, added clonevm to behaviour and story targets.

[sirenian]

Title: [778] trunk: [EK] Moved up to ant 1.7, added clonevm to behaviour and story targets.

Revision

778

Author

sirenian

Date

2007-08-11 02:55:48 -0500 (Sat, 11 Aug 2007)

Log Message

[EK] Moved up to ant 1.7, added clonevm to behaviour and story targets.

Modified Paths

trunk/build.xml
trunk/extensions/ant/src/behaviour/org/jbehave/ant/BehaviourRunnerTaskBehaviour.java
trunk/extensions/ant/src/behaviour/org/jbehave/ant/StoryRunnerTaskBehaviour.java
trunk/extensions/ant/src/java/org/jbehave/ant/AbstractJavaTask.java
trunk/extensions/ant/src/java/org/jbehave/ant/AbstractRunnerTask.java
trunk/extensions/ant/src/java/org/jbehave/ant/BehaviourRunnerTask.java
trunk/extensions/ant/src/java/org/jbehave/ant/StoryRunnerTask.java


Added Paths

trunk/lib/extensions/ant-1.7.0.jar


Removed Paths

trunk/lib/extensions/ant-1.6.5.jar

Diff

Modified: trunk/build.xml (777 => 778)

--- trunk/build.xml	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/build.xml	2007-08-11 07:55:48 UTC (rev 778)
@@ -10,7 +10,7 @@
 	<property name="website_dir" location="website" />
 	<property name="lib_dir" location="lib" />
 	<path id="libs">
-		<fileset dir="${lib_dir}" includes="extensions/ant-1.6.5.jar"/>
+		<fileset dir="${lib_dir}" includes="extensions/ant-1.7.0.jar"/>
 		<fileset dir="${lib_dir}" includes="extensions/antlr-2.7.6.jar"/>
 		<fileset dir="${lib_dir}" includes="extensions/cglib-full-2.0.jar" />
 		<fileset dir="${lib_dir}" includes="extensions/jmock-1.1.0.jar" />
@@ -49,7 +49,7 @@
 		<delete dir="${working_dir}" />
 	</target>
 
-	<target name="build" depends="verify-behaviour, build-source-zip" 
+	<target name="build" depends="verify-behaviour, run-example-behaviours, run-example-stories, build-source-zip" 
 		description="build the jbehave binary and zip up the project" />
 
 	<target name="dist" depends="clean, build, javadoc" description="create distribution" />
@@ -190,7 +190,7 @@
 
 	<target name="run-example-behaviours" depends="compile-example-behaviours" description="Runs behaviours for examples">
 		<taskdef name="runbehaviours" classname="${behaviour.runner.task}" classpath="${jbehave_jar}" />
-		<runbehaviours>
+		<runbehaviours clonevm="true">
 			<classpath>
 				<path refid="libs" />
 				<pathelement path="${example_classes_dir}" />
@@ -229,7 +229,7 @@
 	
 	<target name="run-example-stories" depends="compile-example-behaviours, compile-example-stories" description="Runs stories for examples">
 		<taskdef name="runstories" classname="${story.runner.task}" classpath="${jbehave_jar}" />
-		<runstories>
+		<runstories clonevm="true">
 			<classpath>
 				<path refid="libs" />
 				<pathelement path="${example_classes_dir}" />

Modified: trunk/extensions/ant/src/behaviour/org/jbehave/ant/BehaviourRunnerTaskBehaviour.java (777 => 778)

--- trunk/extensions/ant/src/behaviour/org/jbehave/ant/BehaviourRunnerTaskBehaviour.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/behaviour/org/jbehave/ant/BehaviourRunnerTaskBehaviour.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -84,7 +84,19 @@
         });
         ensureThat(exception, isNotNull());
     }
+    
+    public void shouldSupportCloningTheVm() throws Exception {
+        FileSet fileSet = new FileSet();
+        
+        task.addBehaviours(fileSet);
+        task.setCloneVm(true);
+        task.execute();
 
+        List list = Arrays.asList(runner.commandLineLog);
+        ensureThat(list, collectionContains(BehaviourClassOne.class.getName()));
+        ensureThat(list, collectionContains(BehaviourClassTwo.class.getName()));
+    }
+
     private static class StubCommandRunner implements CommandRunner {
         private int valueToReturn;
         private Task taskLog;

Modified: trunk/extensions/ant/src/behaviour/org/jbehave/ant/StoryRunnerTaskBehaviour.java (777 => 778)

--- trunk/extensions/ant/src/behaviour/org/jbehave/ant/StoryRunnerTaskBehaviour.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/behaviour/org/jbehave/ant/StoryRunnerTaskBehaviour.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -77,6 +77,19 @@
         ensureThat(exception, isNotNull());
     }
     
+    public void shouldSupportCloningTheVm() throws Exception {
+        
+        FileSet fileSet = new FileSet();
+        
+        task.addStories(fileSet);
+        task.setCloneVm(true);
+        task.execute();
+
+        List list = Arrays.asList(runner.commandLineLog);
+        ensureThat(list, collectionContains(StoryClassOne.class.getName()));
+        ensureThat(list, collectionContains(StoryClassTwo.class.getName()));
+    }    
+    
     private static class StubCommandRunner implements CommandRunner {
         private int valueToReturn;
         private Task taskLog;

Modified: trunk/extensions/ant/src/java/org/jbehave/ant/AbstractJavaTask.java (777 => 778)

--- trunk/extensions/ant/src/java/org/jbehave/ant/AbstractJavaTask.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/java/org/jbehave/ant/AbstractJavaTask.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -35,6 +35,8 @@
     public Commandline.Argument createJvmarg() {
         return commandLine.createVmArgument();
     }
+    
+    
 
     public void setMaxmemory(int megabyte) {
         createJvmarg().setLine("-Xmx" + megabyte + "m");

Modified: trunk/extensions/ant/src/java/org/jbehave/ant/AbstractRunnerTask.java (777 => 778)

--- trunk/extensions/ant/src/java/org/jbehave/ant/AbstractRunnerTask.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/java/org/jbehave/ant/AbstractRunnerTask.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -42,6 +42,9 @@
         invoke();
     }
     
+	public void setCloneVm(boolean cloneVm) {
+		commandLine.setCloneVm(cloneVm);
+	}
 
     private void appendAntTaskJar() {
         createClasspath().append(new Path(getProject(), locate()));

Modified: trunk/extensions/ant/src/java/org/jbehave/ant/BehaviourRunnerTask.java (777 => 778)

--- trunk/extensions/ant/src/java/org/jbehave/ant/BehaviourRunnerTask.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/java/org/jbehave/ant/BehaviourRunnerTask.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -27,5 +27,9 @@
     public void addBehaviours(FileSet fileset) {
         super.addFilesetTarget(fileset);
     }
+    
+    public void setCloneVm(boolean cloneVm) {
+        super.setCloneVm(cloneVm);
+    }
 
 }

Modified: trunk/extensions/ant/src/java/org/jbehave/ant/StoryRunnerTask.java (777 => 778)

--- trunk/extensions/ant/src/java/org/jbehave/ant/StoryRunnerTask.java	2007-08-04 01:57:52 UTC (rev 777)
+++ trunk/extensions/ant/src/java/org/jbehave/ant/StoryRunnerTask.java	2007-08-11 07:55:48 UTC (rev 778)
@@ -21,5 +21,9 @@
     public void addStories(FileSet fileset) {
         super.addFilesetTarget(fileset);
     }
+    
+    public void setCloneVm(boolean cloneVm) {
+        super.setCloneVm(cloneVm);
+    }    
 
 }

Deleted: trunk/lib/extensions/ant-1.6.5.jar

(Binary files differ)

Added: trunk/lib/extensions/ant-1.7.0.jar

(Binary files differ)

Property changes on: trunk/lib/extensions/ant-1.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email