commit be3f40c6ad5e9cdcf8add208b1920ce1b4334b79
Merge: dbf5024 da0d6c6
Author: Alex <alexl...@gmail.com>
AuthorDate: Wed Jul 25 23:14:04 2012 +0200
Commit: Alex <alexl...@gmail.com>
CommitDate: Wed Jul 25 23:14:04 2012 +0200
Merge branch 'master' of git://github.com/jbehave/jbehave-core
Changed files:
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/parsers/grammar.ebnf
M distribution/src/site/content/download.html
M distribution/src/site/content/grammar.html
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-navigator/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 distribution/src/site/content/release-notes.html
M
jbehave-core/src/main/java/org/jbehave/core/parsers/RegexStoryParser.java
M distribution/src/site/content/given-stories.html
D
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesAtStoryLevel.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesParametrisedByMeta.java
D
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_stories_at_story_level.story
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_stories_parametrised_by_meta.story
M jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesAtStoryLevel.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_stories_at_story_level.story
M jbehave-core/src/main/java/org/jbehave/core/model/Story.java
M
jbehave-core/src/test/java/org/jbehave/core/embedder/StoryRunnerBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/parsers/RegexStoryParserBehaviour.java
D distribution/upload-download.sh
D distribution/upload-reference.sh
M jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/CompositeStepCandidateBehaviour.java
A examples/trader/src/main/java/ftl/custom-html-output.ftl
A
examples/trader/src/main/java/org/jbehave/examples/trader/CustomHtmlOutput.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/CustomTraderStories.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/FreemarkerProcessor.java
M jbehave-core/src/main/java/org/jbehave/core/ConfigurableEmbedder.java
M
jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
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/main/java/org/jbehave/core/reporters/CrossReference.java
M distribution/src/site/content/dependencies.html
M
jbehave-core/src/test/java/org/jbehave/core/steps/StepCandidateBehaviour.java
A jbehave-core/src/main/resources/i18n/keywords_se.properties
M
jbehave-core/src/test/java/org/jbehave/core/i18n/LocalizedKeywordsBehaviour.java
A distribution/src/site/content/how-to-contribute.html
M distribution/src/site/content/issue-tracking.html
M distribution/src/site/content/sitemap.xml
M distribution/src/site/content/stories-in-your-language.html
M distribution/src/site/content/tabular-parameters.html
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/traders_can_be_subset.story
M jbehave-core/src/main/java/org/jbehave/core/model/TableTransformers.java
A jbehave-core/src/main/java/org/jbehave/core/model/TableUtils.java
A
jbehave-core/src/test/java/org/jbehave/core/model/TableTransformersBehaviour.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStories.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStory.java
A jbehave-core/src/main/java/org/jbehave/core/model/TableTransformers.java
M distribution/src/site/content/pattern-variants.html
A jbehave-core/src/main/resources/i18n/keywords_no.properties
M jbehave-core/src/main/java/org/jbehave/core/io/LoadFromRelativeFile.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
M
jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
M
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
M jbehave-core/src/test/resources/story.html
M jbehave-core/src/test/resources/story.xml
M
examples/trader/src/main/java/org/jbehave/examples/trader/steps/TraderSteps.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesParametrisedByExamples.java
M jbehave-core/src/main/java/org/jbehave/core/embedder/StoryControls.java
D
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenParametrisedStory.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesParametrisedByAnchor.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/GivenStoriesParametrisedByExamples.java
D
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_parametrised_story.story
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_stories_parametrised_by_anchor.story
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/given_stories_parametrised_by_examples.story
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/parametrised.story
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/select_stock_exchange.story
M LICENSE.txt
M distribution/src/site/content/license.html
M
jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
A
jbehave-core/src/test/java/org/jbehave/core/embedder/executors/ExecutorsBehaviour.java
M jbehave-ant/src/main/java/org/jbehave/ant/AbstractEmbedderTask.java
M jbehave-ant/src/test/java/org/jbehave/ant/EmbedderTaskBehaviour.java
A
jbehave-core/src/main/java/org/jbehave/core/embedder/executors/ExecutorServiceFactory.java
A
jbehave-core/src/main/java/org/jbehave/core/embedder/executors/FixedThreadExecutors.java
A
jbehave-core/src/main/java/org/jbehave/core/embedder/executors/SameThreadExecutors.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 examples/trader-spring/pom.xml
A
examples/trader-spring/src/main/java/org/jbehave/examples/trader/spring/SpringAnnotationConfiguration.java
M
examples/trader-spring/src/main/java/org/jbehave/examples/trader/spring/TraderStoriesUsingSpring.java
A
examples/trader-spring/src/main/java/org/jbehave/examples/trader/spring/TraderStoriesUsingSpringWithAnnotationConfiguration.java
D
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/AnnotationStepsConfiguration.java
D
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/AnnotationStepsWithDependencyConfiguration.java
M
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/SpringStepsFactoryBehaviour.java
M
jbehave-spring/src/main/java/org/jbehave/core/steps/spring/SpringApplicationContextFactory.java
M
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/AnnotationStepsConfiguration.java
A
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/AnnotationStepsConfiguration.java
A
jbehave-spring/src/test/java/org/jbehave/core/steps/spring/AnnotationStepsWithDependencyConfiguration.java
M
jbehave-spring/src/main/java/org/jbehave/core/configuration/spring/SpringAnnotationBuilder.java
M examples/gameoflife/pom.xml
M examples/google/pom.xml
M examples/groovy/pom.xml
M examples/noughtsandcrosses/pom.xml
M examples/performance/pom.xml
M examples/pom.xml
M examples/scala/pom.xml
M examples/spring-security/pom.xml
M examples/threads/pom.xml
M examples/trader-annotations/pom.xml
M examples/trader-ant/pom.xml
M examples/trader-guice/pom.xml
M examples/trader-i18n/pom.xml
M examples/trader-maps/pom.xml
M examples/trader-pico/pom.xml
M examples/trader-stepdocs/pom.xml
M examples/trader-testng/pom.xml
M examples/trader-urls/pom.xml
M examples/trader-weld/pom.xml
M examples/trader/pom.xml
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/NamedAnnotations.java
A
examples/trader/src/main/java/org/jbehave/examples/trader/stories/named_annotations.story
M
jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableViewGenerator.java
M README.md
