[jbehave-scm] [scm-core][28] Merge remote-tracking branch 'remotes/upstream/master'

[Alex Lehmann]

commit b3ee52f4264f31f5c1d3f25b03bbb87361adbbb0
Merge: 31ef505 7e2ec03
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sun Mar 4 22:44:08 2012 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sun Mar 4 22:44:08 2012 +0100

    Merge remote-tracking branch 'remotes/upstream/master'
    
    Conflicts:
        
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java

diff --cc 
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
index db1dc50,b9c3944..0374c28
--- a/jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
+++ b/jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
@@@ -46,13 -54,4 +54,4 @@@ public class CodeLocationsBehaviour 
          assertThat(new CodeLocations(), is(notNullValue()));
      }
  
- //  wrong output looks like this:
- //  
"C:/Projects/jbehave/file:/C:/Users/Name/.m2/repository/junit/junit-dep/4.8.2/junit-dep-4.8.2.jar!"
- 
-     @Test
-     public void shouldCreateValidPathFromJarClass() {
-         
assertThat(CodeLocations.codeLocationFromClass(this.getClass()).getFile(), 
not(containsString("/file:")));
-         
assertThat(CodeLocations.codeLocationFromClass(JUnitCore.class).getFile(), 
not(containsString("/file:")));
-     }
- 
--}
++}
Changed files:

M       settings.xml
M       
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
M       jbehave-core/src/main/java/org/jbehave/core/io/CodeLocations.java
M       distribution/src/site/content/prioritising-steps.html
M       distribution/src/site/content/release-notes.html
A       
examples/trader/src/main/java/org/jbehave/examples/trader/stories/StepMonitoring.java
A       
examples/trader/src/main/java/org/jbehave/examples/trader/stories/step_monitoring.story