commit 36fd74036912b54b78ff1b1493a68c319994613f
Merge: 6ad5843 d7cb5a9
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sun Jan 8 18:30:24 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Sun Jan 8 18:30:24 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M distribution/src/site/content/examples-modules.html
M examples/pom.xml
M examples/trader-stepdocs/pom.xml
A examples/trader-testng/pom.xml
A
examples/trader-testng/src/main/java/org/jbehave/examples/trader/testng/TestNGTraderStories.java
M examples/trader/pom.xml
D
examples/trader/src/main/java/org/jbehave/examples/trader/TestNGTraderStories.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/TestNGTraderStories.java
M distribution/src/site/content/candidate-steps.html
M distribution/src/site/content/configuration.html
M distribution/src/site/content/dependency-injection.html
M distribution/src/site/content/developing-stories.html
M distribution/src/site/content/faq.html
M distribution/src/site/content/getting-started.html
M distribution/src/site/content/parameter-converters.html
M distribution/src/site/content/reporting-stories.html
M distribution/src/site/content/running-stories.html
M distribution/src/site/content/stories-in-your-language.html
M distribution/src/site/content/using-groovy.html
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderEmbedder.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStoryRunner.java
M distribution/src/site/content/outcomes-table.html
M
examples/trader-i18n/src/main/java/org/jbehave/examples/trader/i18n/steps/FrTraderSteps.java
M
examples/trader-i18n/src/main/java/org/jbehave/examples/trader/i18n/stories/fr_trader_is_alerted_of_status.histoire
M jbehave-core/src/main/java/org/jbehave/core/configuration/Keywords.java
M jbehave-core/src/main/java/org/jbehave/core/model/OutcomesTable.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/PrintStreamOutput.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
M jbehave-core/src/main/resources/ftl/jbehave-html-output.ftl
M jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
M jbehave-core/src/main/resources/i18n/keywords_de.properties
M jbehave-core/src/main/resources/i18n/keywords_en.properties
M jbehave-core/src/main/resources/i18n/keywords_fr.properties
M jbehave-core/src/main/resources/i18n/keywords_it.properties
M jbehave-core/src/main/resources/i18n/keywords_pt.properties
M jbehave-core/src/main/resources/i18n/keywords_tr.properties
M jbehave-core/src/main/resources/i18n/keywords_zh_TW.properties
M
jbehave-core/src/test/java/org/jbehave/core/model/OutcomesTableBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/reporters/PrintStreamOutputBehaviour.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStories.java
M
examples/threads/src/main/java/org/jbehave/examples/threads/ThreadsStories.java
M jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/ConcurrentStoryReporter.java
M
examples/threads/src/main/java/org/jbehave/examples/threads/steps/ThreadsSteps.java
M
jbehave-core/src/test/java/org/jbehave/core/i18n/LocalizedKeywordsBehaviour.java
M jbehave-core/src/test/resources/story.html
M jbehave-core/src/test/resources/story.xml
M jbehave-core/src/main/java/org/jbehave/core/i18n/LocalizedKeywords.java
M jbehave-core/src/main/java/org/jbehave/core/reporters/HtmlOutput.java
M jbehave-core/src/main/java/org/jbehave/core/reporters/TxtOutput.java
M jbehave-core/src/main/java/org/jbehave/core/reporters/XmlOutput.java
M jbehave-ant/src/main/java/org/jbehave/ant/AbstractEmbedderTask.java
A
jbehave-core/src/main/java/org/jbehave/core/configuration/NullAnnotationMonitor.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/PrintStreamAnnotationMonitor.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitor.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitorDecorator.java
A
jbehave-core/src/main/java/org/jbehave/core/embedder/NullEmbedderMonitor.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/PrintStreamEmbedderMonitor.java
M jbehave-core/src/main/java/org/jbehave/core/steps/NullStepMonitor.java
M
jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java
M distribution/src/site/content/meta-info.html
M
examples/trader-annotations/src/main/java/org/jbehave/examples/trader/annotations/TraderAnnotatedEmbedder.java
M jbehave-ant/src/test/java/org/jbehave/ant/EmbedderTaskBehaviour.java
M
jbehave-core/src/main/java/org/jbehave/core/annotations/UsingEmbedder.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/AnnotationBuilder.java
M jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderControls.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/PropertyBasedEmbedderControls.java
M
jbehave-core/src/main/java/org/jbehave/core/embedder/UnmodifiableEmbedderControls.java
M
jbehave-core/src/test/java/org/jbehave/core/configuration/AnnotationBuilderBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/embedder/EmbedderControlsBehaviour.java
M jbehave-core/src/main/java/org/jbehave/core/reporters/Format.java
D
jbehave-core/src/main/java/org/jbehave/core/reporters/HtmlTemplateOuput.java
A
jbehave-core/src/main/java/org/jbehave/core/reporters/HtmlTemplateOutput.java
M
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
