commit 0cb52357f6603b7e40a8df5d2c63a6c65ae7a979
Merge: d664694 f5b4b8b
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Dec 19 23:33:03 2011 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Mon Dec 19 23:33:03 2011 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java
M distribution/src/site/content/grammar.html
M jbehave-core/src/main/java/org/jbehave/core/parsers/grammar.ebnf
M archetypes/jbehave-groovy-archetype/pom.xml
M archetypes/jbehave-guice-archetype/pom.xml
M archetypes/jbehave-pico-archetype/pom.xml
M archetypes/jbehave-simple-archetype/pom.xml
M archetypes/jbehave-spring-archetype/pom.xml
M archetypes/pom.xml
M distribution/pom.xml
M jbehave-ant/pom.xml
M jbehave-core/pom.xml
M jbehave-google/pom.xml
M jbehave-groovy/pom.xml
M jbehave-guice/pom.xml
M jbehave-hudson-plugin/pom.xml
M jbehave-jenkins-plugin/pom.xml
M jbehave-maven-plugin/pom.xml
M jbehave-odf/pom.xml
M jbehave-pico/pom.xml
M jbehave-scala/pom.xml
M jbehave-spring/pom.xml
M jbehave-weld/pom.xml
M pom.xml
M
examples/threads/src/main/java/org/jbehave/examples/threads/steps/ThreadsSteps.java
M jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
A
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
A jbehave-core/src/test/resources/story.html
A jbehave-core/src/test/resources/story.xml
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStories.java
M jbehave-core/src/main/java/org/jbehave/core/reporters/Format.java
A
jbehave-core/src/main/java/org/jbehave/core/reporters/XmlTemplateOuput.java
A jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
M distribution/src/site/content/tabular-parameters.html
M
archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java
D
archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/resources/my_steps.xml
M
archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java
D
archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/resources/my_steps.xml
M
archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java
M
archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStory.java
