commit 9712131e632e7169136a32aab3245d017a5e3d75
Merge: e1096a7 7b72bfa
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Jul 30 23:00:30 2012 +0200
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Mon Jul 30 23:00:30 2012 +0200
Merge branch 'master' of github.com:alexlehm/jbehave-core
Changed files:
M
jbehave-core/src/test/java/org/jbehave/core/reporters/PrintStreamOutputBehaviour.java
M jbehave-core/src/main/resources/ftl/jbehave-html-output.ftl
M
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
M jbehave-core/pom.xml
M jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
M
jbehave-core/src/test/java/org/jbehave/core/steps/CompositeStepCandidateBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
A
jbehave-core/src/test/java/org/jbehave/core/io/LoadFromRelativeFileTest.java
A jbehave-core/src/test/resources/test+dir/dummy.story
M jbehave-core/src/main/java/org/jbehave/core/io/CodeLocations.java
M jbehave-core/src/main/java/org/jbehave/core/io/LoadFromRelativeFile.java
M jbehave-core/src/main/java/org/jbehave/core/io/StoryFinder.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/FilePrintStreamFactory.java
M
archetypes/jbehave-groovy-archetype/src/main/resources/archetype-resources/pom.xml
M
archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/pom.xml
M
archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/pom.xml
M
archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/pom.xml
M
archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/pom.xml
M distribution/src/site/content/issue-tracking.html
M examples/spring-security/build.properties
M examples/spring-security/build.xml
M examples/spring-security/pom.xml
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/dao/OrganizationDao.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/dao/OrganizationDaoImpl.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/dao/UserDao.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/dao/UserDaoImpl.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/domain/AuthenticationPolicy.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/domain/Organization.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/domain/User.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/service/AuthenticationEventListener.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/service/OrganizationManager.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/service/UserDetailsImpl.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/service/UserDetailsServiceImpl.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/util/DateUtils.java
M
examples/spring-security/src/main/java/com/learnthinkcode/example/jbehave/util/SecurityUtils.java
M examples/spring-security/src/main/resources/applicationContext.xml
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/ClassnameFilePathResolver.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/ExplicitStoryPathResolver.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/ResourceStoryLoader.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/domain/AuthenticationPolicyBuilder.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/AuthWithDefaultPolicyIntegrationTest.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/AuthWithExpiredPasswordsIntegrationTest.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/AuthWithFailureLockoutsIntegrationTest.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/AuthWithUserFlagsIntegrationTest.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/DbUnitSteps.java
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/service/OrganizationSteps.java
M
examples/spring-security/src/test/resources/view/styles/jbehave-reports.css
M
examples/trader-urls/src/main/java/org/jbehave/examples/trader/urls/TraderStoryRunner.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStoryRunner.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/steps/TraderSteps.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/UnmatchedSearchTerm.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/MostUsefulConfiguration.java
M
jbehave-core/src/main/java/org/jbehave/core/configuration/ParanamerConfiguration.java
M
jbehave-core/src/main/java/org/jbehave/core/io/AbsolutePathCalculator.java
M jbehave-core/src/main/java/org/jbehave/core/io/PathCalculator.java
M
jbehave-core/src/main/java/org/jbehave/core/io/RelativePathCalculator.java
M
jbehave-core/src/main/java/org/jbehave/core/junit/AnnotatedPathRunner.java
M jbehave-core/src/main/java/org/jbehave/core/steps/ChainedRow.java
M
jbehave-core/src/main/java/org/jbehave/core/steps/ConvertedParameters.java
M jbehave-core/src/main/java/org/jbehave/core/steps/Parameters.java
M
jbehave-core/src/main/java/org/jbehave/core/steps/PatternVariantBuilder.java
M jbehave-core/src/main/java/org/jbehave/core/steps/Steps.java
M jbehave-core/src/main/resources/i18n/keywords_tr.properties
M
jbehave-core/src/test/java/org/jbehave/core/io/RelativePathCalculatorBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/ChainedRowBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/ConvertedParametersBehaviour.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/PatternVariantBuilderBehaviour.java
M jbehave-navigator/src/main/resources/js/jquery-framedialog-1.1.2.js
M jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js
M jbehave-navigator/src/main/resources/js/shBrushBdd.js
M jbehave-navigator/src/main/resources/style/jquery-ui.css
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/AbstractSpringJBehaveIntegrationTest.java
M examples/spring-security/src/test/resources/README
M
examples/spring-security/src/test/resources/stories/authentication/default_policy.story
M
examples/spring-security/src/test/resources/stories/authentication/expired_passwords.story
M
examples/spring-security/src/test/resources/stories/authentication/failure_lockouts.story
M
examples/spring-security/src/test/resources/view/ftl/jbehave-report-decorated.ftl
M
examples/spring-security/src/test/resources/view/ftl/jbehave-report-non-decorated.ftl
M examples/spring-security/src/test/resources/view/ftl/jbehave-reports.ftl
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/unmatched_search_term.story
M
jbehave-hudson-plugin/src/main/resources/org/jbehave/hudson/jbehave-3.x-to-junit-1.0.xsl
M
jbehave-hudson-plugin/src/test/java/org/jbehave/hudson/ReportTransformBehaviour.java
A jbehave-hudson-plugin/src/test/resources/title.story
M
jbehave-jenkins-plugin/src/main/resources/org/jbehave/jenkins/jbehave-3.x-to-junit-1.0.xsl
M
jbehave-jenkins-plugin/src/test/java/org/jbehave/jenkins/ReportTransformBehaviour.java
A jbehave-jenkins-plugin/src/test/resources/title.story
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/steps/PendingStepMethodGenerator.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/PendingStepMethodGeneratorBehaviour.java
M jbehave-core/src/main/resources/ftl/jbehave-report-decorated.ftl
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/TraderStories.java
M
examples/trader/src/main/java/org/jbehave/examples/trader/TraderStory.java
M jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
A distribution/src/lib/ant/maven-ant-tasks-2.1.3.jar
D distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar
A distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar
M distribution/src/lib/build.xml
D distribution/src/lib/maven-ant-tasks-2.1.0.jar
