[jbehave-scm] [scm-core][59] Merge remote-tracking branch 'remotes/upstream/master'

[Alex Lehmann]

commit 54149b26c4a22a1c6c6e34a31cac17cdfda6dbd9
Merge: 6913330 bd8d802
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sat Dec 17 01:22:03 2011 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sat Dec 17 01:22:03 2011 +0100

    Merge remote-tracking branch 'remotes/upstream/master'
    
    Conflicts:
        distribution/src/lib/build.xml

Changed files:

M       jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java
M       jbehave-core/src/main/java/org/jbehave/core/embedder/StoryManager.java
M       
jbehave-core/src/test/java/org/jbehave/core/embedder/EmbedderBehaviour.java
M       jbehave-ant/src/main/java/org/jbehave/ant/AbstractEmbedderTask.java
M       jbehave-ant/src/test/java/org/jbehave/ant/EmbedderTaskBehaviour.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
M       
jbehave-core/src/main/java/org/jbehave/core/embedder/PrintStreamEmbedderMonitor.java
M       
jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java
M       
jbehave-maven-plugin/src/test/java/org/jbehave/mojo/EmbedderMojoBehaviour.java
M       
jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
M       
jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
A       jbehave-core/src/main/java/org/jbehave/core/embedder/FilteredStory.java
M       jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
M       
jbehave-hudson-plugin/src/test/java/org/jbehave/hudson/ReportTransformBehaviour.java
M       
jbehave-jenkins-plugin/src/test/java/org/jbehave/jenkins/ReportTransformBehaviour.java
M       jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.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/java/org/jbehave/core/steps/ConvertedParameters.java
M       
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableFactoryBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/parsers/RegexStoryParserBehaviour.java
M       distribution/src/site/content/configuration.html
M       
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStories.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/EmbedderControls.java
M       jbehave-core/src/main/java/org/jbehave/core/failures/BatchFailures.java
M       
jbehave-core/src/test/java/org/jbehave/core/configuration/AnnotationBuilderBehaviour.java
A       jbehave-core/src/main/java/org/jbehave/core/embedder/StoryManager.java
M       
examples/threads/src/main/java/org/jbehave/examples/threads/ThreadsStories.java
A       jbehave-core/src/main/java/org/jbehave/core/model/StoryDuration.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/ConcurrentStoryReporter.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/DelegatingStoryReporter.java
M       jbehave-core/src/main/java/org/jbehave/core/reporters/HtmlOutput.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/NullStoryReporter.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/PostStoryStatisticsCollector.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/SilentSuccessFilter.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/StepFailureDecorator.java
M       jbehave-core/src/main/java/org/jbehave/core/reporters/StoryReporter.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-core/src/test/java/org/jbehave/core/embedder/EmbedderMonitorBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/embedder/StoryRunnerBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/reporters/PrintStreamOutputBehaviour.java
A       
jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java
A       jbehave-core/src/test/java/org/jbehave/core/embedder/a_long.story
A       examples/trader-ant/README.md
M       examples/trader-ant/build.xml
M       distribution/pom.xml
A       distribution/src/lib/ant/maven-ant-tasks-2.1.3.jar
D       distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar
M       distribution/src/lib/build.xml
M       distribution/src/site/content/dependencies.html
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/MetaFilter.java
M       distribution/src/site/content/users-experiences.html
A       distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar
D       distribution/src/lib/maven-ant-tasks-2.1.0.jar
M       
jbehave-core/src/test/java/org/jbehave/core/embedder/MetaFilterBehaviour.java