commit 3e32827ec2139e10da9c09c8f42a9bee215689fe
Merge: a10f1b4 5d80cd7
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Thu Mar 1 23:42:55 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Thu Mar 1 23:42:55 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
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
