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 80155b6c0c2d48c9669f649631cfadcd1ece477c (commit)
via 446ef7b464cae3b4f2ccae600b851bfaeb8cf7dc (commit)
from 4a543560ea0d58cfb3c8fa7d77a91ff03a78b11e (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 80155b6c0c2d48c9669f649631cfadcd1ece477c
Merge: 446ef7b464cae3b4f2ccae600b851bfaeb8cf7dc
4a543560ea0d58cfb3c8fa7d77a91ff03a78b11e
Author: Mauro Talevi <[email protected]>
Date: Mon Jun 28 00:12:18 2010 +0200
Merge branch 'master' of ssh://git.codehaus.org/jbehave-core
commit 446ef7b464cae3b4f2ccae600b851bfaeb8cf7dc
Merge: 64b7c9addf075b7b42110c879700ed53953600d2
bdae8b7cceb67d11d6f4f41c15b8adf6a9ebe6eb
Author: Mauro Talevi <[email protected]>
Date: Mon Jun 28 00:10:27 2010 +0200
JBEHAVE-265: Moved EmbedderControls from Configuration to Embedder, now
configurable via @UsingEmbedder annotation.
-----------------------------------------------------------------------
Summary of changes:
.../examples/trader/ClasspathTraderEmbedder.java | 17 +++++++-----
.../trader/guice/AnnotatedEmbedderUsingGuice.java | 27 +++++++++-----------
.../trader/pico/AnnotatedEmbedderUsingPico.java | 7 ++---
.../spring/AnnotatedEmbedderUsingSpring.java | 16 ++++++------
.../jbehave/examples/trader/stories/AndStep.java | 1 -
.../UnmodifiableConfigurationBehaviour.java | 3 --
.../jbehave/core/embedder/EmbedderBehaviour.java | 19 ++++++-------
.../main/java/org/jbehave/core/AbstractStory.java | 6 ----
.../core/configuration/AnnotationBuilder.java | 2 -
.../jbehave/core/configuration/Configuration.java | 15 -----------
.../configuration/MostUsefulConfiguration.java | 3 +-
.../configuration/UnmodifiableConfiguration.java | 10 -------
.../java/org/jbehave/core/embedder/Embedder.java | 5 ++-
jbehave-pico/pom.xml | 2 +-
14 files changed, 47 insertions(+), 86 deletions(-)
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>
