[jbehave-scm] [873] trunk: [Liz] Build is now working without maven (sorry, Mauro!) and running all behaviours and scenarios correctly.
Title: [873] trunk: [Liz] Build is now working without maven (sorry, Mauro!) and running all behaviours and scenarios correctly.
Revision 873
Author sirenian
Date 2008-07-20 09:17:53 -0500 (Sun, 20 Jul 2008)
Log Message
[Liz] Build is now working without maven (sorry, Mauro!) and running all behaviours and scenarios correctly. Also added functionality to replace newlines in args with system newlines (so it will work on any system).
Modified Paths
trunk/build.xml
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/scenarios/MyPendingScenario.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java
Diff
Modified: trunk/build.xml (872 => 873)
--- trunk/build.xml 2008-07-20 11:05:26 UTC (rev 872)
+++ trunk/build.xml 2008-07-20 14:17:53 UTC (rev 873)
@@ -1,225 +1,223 @@
-project xmlns:artifact=urn:maven-artifact-ant name=jbehave default=good-distribution
+project name=jbehave default=good-distribution
+ property name=version value=1.1-SNAPSHOT /
+ echo message=Building version ${version}... /
- !-- version --
- property name=version value=2.0-SNAPSHOT /
- echo message=Building version ${version}... /
+ !-- modules --
+ property name=core.dir location=jbehave-core /
+ property name=build.libs.dir location=lib/build /
+ property name=production.libs.dir location=lib/production /
- !-- modules --
- property name=core.dir location=jbehave-core /
+ !-- build output structure --
+ property name=working.dir location=working /
+ property name=jbehave.source location=jbehave-core/src/java /
+ property name=jbehave.behaviour location=jbehave-core/src/behaviour /
+ property name=jbehave.classes location=${working.dir}/classes /
+ property name=jbehave.behaviour.classes location=${working.dir}/behaviour /
+ property name=gameoflife.source location=examples/gameoflife/src/java /
+ property name=gameoflife.behaviour location=examples/gameoflife/src/behaviour /
+ property name=gameoflife.scenarios location=examples/gameoflife/src/scenario /
+ property name=example.classes location=${working.dir}/examples/classes /
+ property name=example.behaviour.classes location=${working.dir}/examples/behaviour /
+ property name=example.scenario.classes location=${working.dir}/examples/scenario /
+ property name=jbehave.zip location=${working.dir}/jbehave-${version}.zip /
+ property name=dist.dir location=${working.dir}/${version} /
+ property name=jbehave.jar location=${dist.dir}/jbehave-${version}.jar /
+ property name=jbehave.src.zip location=${dist.dir}/jbehave-${version}-src.zip /
+ property name=website.dist.dir location=${dist.dir}/website /
+ property name=javadoc.dist.dir location=${website.dist.dir}/javadoc/${version} /
- !-- Maven POM for dependencies --
- path id=maven-ant-tasks.classpath path=lib/build/maven-ant-tasks-2.0.9.jar /
- typedef resource=org/apache/maven/artifact/ant/antlib.xml uri=urn:maven-artifact-ant classpathref=maven-ant-tasks.classpath /
- artifact:pom id=pom file=jbehave-maven-plugin/pom.xml /
+ path id=production.libs
+ fileset dir=${production.libs.dir} includes=**/*.jar /
+ /path
- !-- libs --
- !-- Note: these are not used ATM, replaced by pom dependencies which retrieves them from remote/local repo and
- avoids the need the check them in. The dependencies used are in any case copied to ${working.dir}/lib for sake of clarity
- and to use in IDE It is also easy to distinguish between compile and test scope although not done at the moment.
- --
- property name=build.libs.dir location=lib/build /
- property name=production.libs.dir location=lib/production /
- path id=production.libs
- fileset dir=${production.libs.dir} includes=**/*.jar /
- /path
+ path id=build.libs
+ path refid=production.libs /
+ fileset dir=${build.libs.dir} includes=**/*.jar /
+ /path
+
+ !-- general targets --
+ target name=good-distribution
+depends=clean-working-dir, working-jbehave, working-examples, jbehave-jar
+description=Checks that JBehave works, builds the JBehave binary and zips up the project. /
+
+ target name=clean-working-dir
+ clean dir=${working.dir} /
+ mkdir dir=${dist.dir} /
+ /target
+
+ macrodef name=clean
+ attribute name=dir /
+ sequential
+ delete dir=@{dir} /
+ mkdir dir=@{dir} /
+ /sequential
+ /macrodef
+
+ !-- JBehave itself --
+ target name=working-jbehave
+ depends=jbehave-classes, jbehave-behaviour-classes
+ description=Ensures that you have a working version of JBehave.
+ junit failureproperty=misbehaving showoutput=true
+ formatter type=plain/
+ classpath refid=build.libs /
+ classpath
+ pathelement path=${jbehave.classes} /
+ pathelement path=${jbehave.behaviour.classes} /
+ /classpath
+ batchtest fork=yes todir=${working.dir}
+ fileset dir=${jbehave.behaviour}
+ include
[jbehave-dev] [jira] Closed: (JBEHAVE-79) Localisation
[ http://jira.codehaus.org/browse/JBEHAVE-79?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Elizabeth Keogh closed JBEHAVE-79. -- Resolution: Fixed Now injecting all starting words (Given, When, Then, And) - which means you can choose your own. Localisation Key: JBEHAVE-79 URL: http://jira.codehaus.org/browse/JBEHAVE-79 Project: JBehave Issue Type: New Feature Components: Core Reporter: Mauro Talevi Fix For: 2.0 As proposed by Alexandre Martins, localisation of Narrative would be useful for use with non-english languages. Eg, the narrative in portuguese would be: Como um [papel] Eu quero [função] De forma que [benefício] Both the story codegen and the renderer would need to support a Localiser component that know how to translate the keywords in the different locales. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
[jbehave-dev] [jira] Closed: (JBEHAVE-114) Build isn't running the scenarios
[ http://jira.codehaus.org/browse/JBEHAVE-114?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Elizabeth Keogh closed JBEHAVE-114. --- Resolution: Fixed Fixed. Build isn't running the scenarios - Key: JBEHAVE-114 URL: http://jira.codehaus.org/browse/JBEHAVE-114 Project: JBehave Issue Type: Bug Components: Build system Reporter: Elizabeth Keogh Fix For: 2.0 Ryan has sent me a patch for this. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
[jbehave-dev] [jira] Closed: (JBEHAVE-105) Should not require a space before a new line
[ http://jira.codehaus.org/browse/JBEHAVE-105?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Elizabeth Keogh closed JBEHAVE-105. --- Resolution: Fixed Fixed. Should not require a space before a new line Key: JBEHAVE-105 URL: http://jira.codehaus.org/browse/JBEHAVE-105 Project: JBehave Issue Type: Bug Components: Core Reporter: Elizabeth Keogh Fix For: 2.0 Currently I have a space after the 'When' line in multiline steps. eg: Given a grid that looks like -- there's a space after this line Should be able to work without the space. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
[jbehave-dev] [jira] Created: (JBEHAVE-115) Undoable steps
Undoable steps -- Key: JBEHAVE-115 URL: http://jira.codehaus.org/browse/JBEHAVE-115 Project: JBehave Issue Type: New Feature Reporter: Elizabeth Keogh Fix For: The Distant Future Sometimes when we set up a context or cause an event to happen, it's nice to clean up any changes so that we don't affect other tests running. No idea how to make the undoable work, but doesn't stop me wanting it! -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
[jbehave-dev] Current work in progress for 2.0
Hi all, JIRA now contains the outstanding bugs and issues for 2.0. We're hoping to get the documentation up on the website soon. I'm churning through the other outstanding issues, and we should have a 2.0 release candidate within the next week or two. If we've missed anything, please let me know! New features: - Text-based scenario definitions (like RSpec) - Annotation-based step definitions - Multi-line or inline arguments - Highly configurable via injection Things we got rid of: - Swing support (moved to Tyburn at http://code.google.com/p/tyburn/ ) - Mocks (we recommend Mockito at http://code.google.com/p/mockito/ ) - most unit-level support (still have Ensure which extends Assert, but otherwise we recommend using JUnit 4.+) If you want to download and play with it, the subversion url is: http://svn.codehaus.org/jbehave/trunk and you can find a quick tutorial on my blog: http://sirenian.livejournal.com/47910.html There are examples in the 'examples' directory. I owe a big shout to Mauro, who's spent a lot of time cleaning up my shoddy code. Cheers. :) Liz. -- Elizabeth Keogh [EMAIL PROTECTED] http://sirenian.livejournal.com http://jbehave.org
