Skip to content

Commit

Permalink
Merge branch 'master' of github.com:maggandalf/jbehave-core
Browse files Browse the repository at this point in the history
Conflicts:
	jbehave-spring/src/main/resources/spring/jbehave-spring-1.0.xsd
  • Loading branch information
maggandalf committed Apr 30, 2011
2 parents b291776 + 8317d4b commit 5b7ef8b
Show file tree
Hide file tree
Showing 725 changed files with 0 additions and 222 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .settings/org.eclipse.core.resources.prefs
100644 → 100755
Empty file.
Empty file modified LICENSE.txt
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified archetypes/jbehave-groovy-archetype/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified archetypes/jbehave-simple-archetype/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified archetypes/jbehave-spring-archetype/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified archetypes/pom.xml
100644 → 100755
Empty file.
Empty file modified distribution/README.txt
100644 → 100755
Empty file.
Empty file modified distribution/pom.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/assembly/assembly-bin.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/assembly/assembly-src.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/lib/DEPENDENCIES.txt
100644 → 100755
Empty file.
Empty file modified distribution/src/lib/build.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/lib/maven-ant-tasks-2.1.0.jar
100644 → 100755
Empty file.
Empty file modified distribution/src/site/config/xsite.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/aliases.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/annotations.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/ant-tasks.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/archetypes.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/building-source.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/candidate-steps.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/code-coverage.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/composite-steps.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/concepts.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/configuration.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/cross-reference.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/dependencies.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/dependency-injection.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/developing-stories.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/download.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/examples-philosophy.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/faq.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/features.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/finding-steps.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/getting-started.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/given-stories.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/grammar.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/hudson-plugin.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/index.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/issue-tracking.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/javadoc.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/license.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/locating-stories.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/mailing-lists.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/maven-goals.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/meta-filtering.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/meta-info.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/meta-parametrisation.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/migration-paths.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/more-on-bdd.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/multi-threading.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/outcomes-table.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/parameter-converters.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/parameter-injection.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/parametrised-scenarios.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/pending-steps.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/prioritising-steps.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/release-notes.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/reporting-stories.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/running-examples.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/running-stories.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/sitemap.xml
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/source-repository.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/stories-in-your-language.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/story-mapping.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/tabular-parameters.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/content/using-groovy.html
100644 → 100755
Empty file.
Empty file modified distribution/src/site/key/Images.key
100644 → 100755
Empty file.
Empty file modified distribution/src/site/resources/README
100644 → 100755
Empty file.
Empty file modified distribution/src/site/resources/images/Images.001.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified distribution/src/site/resources/images/Images.002.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified distribution/src/site/resources/images/Images.003.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified distribution/src/site/resources/images/Images.004.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified distribution/src/site/resources/images/Images.005.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified distribution/src/site/templates/README
100644 → 100755
Empty file.
Empty file modified examples/RUNNING.txt
100644 → 100755
Empty file.
Empty file modified examples/gameoflife/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/groovy/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/migrating-from-2.x/REPLACEMENTS.txt
100644 → 100755
Empty file.
Empty file modified examples/migrating-from-2.x/replaceAllInFiles.groovy
100644 → 100755
Empty file.
Empty file modified examples/noughtsandcrosses/README.txt
100644 → 100755
Empty file.
Empty file modified examples/noughtsandcrosses/lib/tyburn-0.1.jar
100644 → 100755
Empty file.
Empty file modified examples/noughtsandcrosses/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/pom.xml
100644 → 100755
Empty file.
Empty file modified examples/spring-security/build.properties
100644 → 100755
Empty file.
Empty file modified examples/spring-security/build.xml
100644 → 100755
Empty file.
Empty file modified examples/spring-security/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/spring-security/src/test/resources/README
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-annotations/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-guice/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-i18n/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-maps/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file modified examples/trader-pico/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-spring/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-stepdocs/pom.xml
100644 → 100755
Empty file.
Empty file modified examples/trader-urls/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader-weld/pom.xml
100644 → 100755
Empty file.
Empty file modified examples/trader-weld/src/main/java/META-INF/beans.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified examples/trader/build.xml
100644 → 100755
Empty file.
Empty file modified examples/trader/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit 5b7ef8b

Please sign in to comment.