commit 5f67b30e6983523c8f5f0b5a88debe05538c96f8
Merge: 50b47f5 940339e
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Fri Feb 24 20:43:37 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Fri Feb 24 20:43:37 2012 +0100
Merge commit '940339e41ed0faf3291f7cef27f0e3c747f6d299'
Conflicts:
jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
Changed files:
M
examples/spring-security/src/test/resources/stories/authentication/user_flags.story
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/domain/UserBuilder.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/AuthenticationSteps.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/UserSteps.java
M distribution/src/site/content/tabular-parameters.html
M jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
M
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableBehaviour.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
jbehave-core/src/main/java/org/jbehave/core/reporters/DelegatingStoryReporter.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/PrintStreamOutput.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/TemplateableOutput.java
M jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/StepCreatorBehaviour.java
M distribution/src/site/content/release-notes.html
M distribution/src/site/content/parameter-injection.html
M distribution/src/site/content/parametrised-scenarios.html
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/ParametrisationByDelimitedName.java
M jbehave-core/src/main/java/org/jbehave/core/steps/ParameterControls.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/steps/ParametrisationByDelimitedNameSteps.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/ParametrisationByDelimitedName.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/parametrisation_by_delimited_name.story
M distribution/src/site/content/configuration.html
M jbehave-groovy/pom.xml
M
examples/trader/src/main/java/org/jbehave/examples/trader/steps/TraderSteps.java
M distribution/src/site/content/aliases.html
A distribution/src/site/content/pattern-variants.html
M distribution/src/site/content/sitemap.xml
M
jbehave-core/src/main/java/org/jbehave/core/steps/PatternVariantBuilder.java
M jbehave-core/src/main/java/org/jbehave/core/annotations/Configure.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/AnnotationBuilder.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/MostUsefulConfiguration.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/UnmodifiableConfiguration.java
M
jbehave-core/src/test/java/org/jbehave/core/configuration/UnmodifiableConfigurationBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/StepCandidateBehaviour.java
A
jbehave-spring/src/main/java/org/jbehave/core/configuration/spring/SpringParameterControls.java
M
jbehave-spring/src/test/java/org/jbehave/core/configuration/spring/SpringAnnotationBuilderBehaviour.java
M
jbehave-spring/src/test/java/org/jbehave/core/configuration/spring/configuration.xml
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStory.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/steps/ParameterDelimitersSteps.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/ParameterDelimiters.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/parameter_delimiters.story
M
jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
A jbehave-core/src/main/java/org/jbehave/core/steps/ParameterControls.java
M jbehave-core/src/main/java/org/jbehave/core/steps/StepCandidate.java
M jbehave-core/src/main/java/org/jbehave/core/steps/Steps.java
M jbehave-core/src/main/java/org/jbehave/core/annotations/UsingPaths.java
M
jbehave-core/src/main/java/org/jbehave/core/parsers/RegexPrefixCapturingPatternParser.java
M
jbehave-core/src/test/java/org/jbehave/core/parsers/RegexPrefixCapturingPatternParserBehaviour.java
