This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jbehave-core".
The branch, master has been updated
via 3dac48d91f8908713523152d3457e19fe124aa11 (commit)
via b73c8a95d35512affdaeb2556a0d3e859f680004 (commit)
from 6c4dbcf213217ec44b711dc608093737cadb72e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3dac48d91f8908713523152d3457e19fe124aa11
Merge: b73c8a95d35512affdaeb2556a0d3e859f680004
6c4dbcf213217ec44b711dc608093737cadb72e7
Author: Mauro Talevi <[email protected]>
Date: Wed Jun 23 02:01:34 2010 +0200
Merged
commit b73c8a95d35512affdaeb2556a0d3e859f680004
Merge: 0f8a1fa61d3cffe48dd088adab5a833ae229c2b7
5a3661943c6602e1b348d3042db0fe3a32eb9602
Author: Mauro Talevi <[email protected]>
Date: Wed Jun 23 01:55:44 2010 +0200
JBEHAVE-265: Allow definition of Configuration elements in Spring context.
For any elements not found in context
fall back on explicit annotation or its default value.
-----------------------------------------------------------------------
Summary of changes:
.../trader/AnnotatedTraderStoryRunner.java | 8 +--
.../spring/AnnotatedEmbedderUsingSpring.java | 8 +--
.../examples/trader/spring/configuration.xml | 7 +-
.../AnnotatedConfigurationBehaviour.java | 6 +-
.../configuration/AnnotationBuilderBehaviour.java | 6 +-
.../annotations/{AddSteps.java => WithSteps.java} | 2 +-
.../core/configuration/AnnotationBuilder.java | 31 +++++++----
.../spring/SpringAnnotationBuilderBehaviour.java | 17 +++++-
.../spring/configuration.xml} | 5 +-
.../{AddStepsWithSpring.java => UsingSpring.java} | 2 +-
.../spring/SpringAnnotationBuilder.java | 59 ++++++++++++++------
.../core/steps/spring/SpringStepsFactory.java | 5 --
12 files changed, 95 insertions(+), 61 deletions(-)
copy jbehave-spring/src/behaviour/java/org/jbehave/core/steps/spring/steps.xml
=>
examples/trader/src/main/java/org/jbehave/examples/trader/spring/configuration.xml
(71%)
rename jbehave-core/src/main/java/org/jbehave/core/annotations/{AddSteps.java
=> WithSteps.java} (92%)
copy
jbehave-spring/src/behaviour/java/org/jbehave/core/{steps/spring/steps.xml =>
configuration/spring/configuration.xml} (71%)
rename
jbehave-spring/src/main/java/org/jbehave/core/annotations/spring/{AddStepsWithSpring.java
=> UsingSpring.java} (90%)
hooks/post-receive
--
jbehave-core
<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
<a
href="http://xircles.codehaus.org/manage_email";>http://xircles.codehaus.org/manage_email</a>
