headers
mauro | 3 Dec 2009 12:50

[1393] trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java: JBEHAVE-195: Use Commons-IO FilenameUtils.getName(path) to extract file name in a platform-independent way

Revision 1393 Author mauro Date 2009-12-03 05:50:11 -0600 (Thu, 03 Dec 2009)

Log Message

JBEHAVE-195: Use Commons-IO FilenameUtils.getName(path) to extract file name in a platform-independent way

Modified Paths

Diff

Modified: trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java (1392 => 1393)

--- trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-11-26 09:01:43 UTC (rev 1392) +++ trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-12-03 11:50:11 UTC (rev 1393) <at> <at> -9,6 +9,7 <at> <at> import java.util.List; import org.apache.commons.fileupload.FileItem; +import org.apache.commons.io.FilenameUtils; import org.jbehave.web.io.ZipFileArchiver.FileUnarchiveFailedException; /** <at> <at> -125,10 +126,13 <at> <at> return file; } - private String fileName(FileItem item) { - File file = new File(item.getName()); - return file.getName(); - } + private String fileName(FileItem item) { + // FileItem.getName() may return the full path, depending on the client + // (e.g. IE or Opera) + // FilenameUtils.getName(path) extracts file name whatever the path + // separator (Unix or Windows) + return FilenameUtils.getName(item.getName()); + } <at> SuppressWarnings("serial") public static final class FileItemNameMissingException extends

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 3 Dec 2009 13:09

[1394] trunk/web: [maven-release-plugin] prepare release jbehave-web-2.1.5

Revision 1394 Author mauro Date 2009-12-03 06:09:35 -0600 (Thu, 03 Dec 2009)

Log Message

[maven-release-plugin] prepare release jbehave-web-2.1.5

Modified Paths

Diff

Modified: trunk/web/distribution/pom.xml (1393 => 1394)

--- trunk/web/distribution/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/distribution/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> </parent> <artifactId>jbehave-web-distribution</artifactId> <packaging>pom</packaging>

Modified: trunk/web/pom.xml (1393 => 1394)

--- trunk/web/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -2,7 +2,7 <at> <at> <modelVersion>4.0.0</modelVersion> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> <packaging>pom</packaging> <name>JBehave Web</name> <description>JBehave Web aims to provide a web integration layer for Behaviour-Driven Development</description> <at> <at> -344,9 +344,9 <at> <at> <contributors /> <scm> - <connection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</developerConnection> - <url>http://svn.codehaus.org/jbehave/trunk/web</url> + <connection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</connection> + <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</developerConnection> + <url>http://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</url> </scm> <distributionManagement>

Modified: trunk/web/web-io/pom.xml (1393 => 1394)

--- trunk/web/web-io/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/web-io/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> </parent> <artifactId>jbehave-web-io</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-resources/pom.xml (1393 => 1394)

--- trunk/web/web-resources/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/web-resources/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> </parent> <artifactId>jbehave-web-resources</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-runner/pom.xml (1393 => 1394)

--- trunk/web/web-runner/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/web-runner/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> </parent> <artifactId>jbehave-web-runner</artifactId> <packaging>jar</packaging> <!-- NOTE: Change to war to run with jetty -->

Modified: trunk/web/web-selenium/pom.xml (1393 => 1394)

--- trunk/web/web-selenium/pom.xml 2009-12-03 11:50:11 UTC (rev 1393) +++ trunk/web/web-selenium/pom.xml 2009-12-03 12:09:35 UTC (rev 1394) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.5</version> </parent> <artifactId>jbehave-web-selenium</artifactId> <packaging>jar</packaging>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 3 Dec 2009 13:09

[1395] tags/jbehave-web-2.1.5/: [maven-scm] copy for tag jbehave-web-2.1.5

Revision 1395 Author mauro Date 2009-12-03 06:09:43 -0600 (Thu, 03 Dec 2009)

Log Message

[maven-scm] copy for tag jbehave-web-2.1.5

Added Paths

  • tags/jbehave-web-2.1.5/

Diff

Copied: tags/jbehave-web-2.1.5 (from rev 1394, trunk/web) ( => )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 3 Dec 2009 13:09

[1396] trunk/web: [maven-release-plugin] prepare for next development iteration

Revision 1396 Author mauro Date 2009-12-03 06:09:48 -0600 (Thu, 03 Dec 2009)

Log Message

[maven-release-plugin] prepare for next development iteration

Modified Paths

Diff

Modified: trunk/web/distribution/pom.xml (1395 => 1396)

--- trunk/web/distribution/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/distribution/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jbehave-web-distribution</artifactId> <packaging>pom</packaging>

Modified: trunk/web/pom.xml (1395 => 1396)

--- trunk/web/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -2,7 +2,7 <at> <at> <modelVersion>4.0.0</modelVersion> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>JBehave Web</name> <description>JBehave Web aims to provide a web integration layer for Behaviour-Driven Development</description> <at> <at> -344,9 +344,9 <at> <at> <contributors /> <scm> - <connection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</developerConnection> - <url>http://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.5</url> + <connection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</connection> + <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</developerConnection> + <url>http://svn.codehaus.org/jbehave/trunk/web</url> </scm> <distributionManagement>

Modified: trunk/web/web-io/pom.xml (1395 => 1396)

--- trunk/web/web-io/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/web-io/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jbehave-web-io</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-resources/pom.xml (1395 => 1396)

--- trunk/web/web-resources/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/web-resources/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jbehave-web-resources</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-runner/pom.xml (1395 => 1396)

--- trunk/web/web-runner/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/web-runner/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jbehave-web-runner</artifactId> <packaging>jar</packaging> <!-- NOTE: Change to war to run with jetty -->

Modified: trunk/web/web-selenium/pom.xml (1395 => 1396)

--- trunk/web/web-selenium/pom.xml 2009-12-03 12:09:43 UTC (rev 1395) +++ trunk/web/web-selenium/pom.xml 2009-12-03 12:09:48 UTC (rev 1396) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jbehave-web-selenium</artifactId> <packaging>jar</packaging>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 3 Dec 2009 22:47

[1397] trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps: JBEHAVE-212: Applied patch by Cristiano Gavi?\195?\163o.

Revision 1397 Author mauro Date 2009-12-03 15:47:24 -0600 (Thu, 03 Dec 2009)

Log Message

JBEHAVE-212: Applied patch by Cristiano Gavi?\195?\163o. Added test to verify behaviour.

Modified Paths

Diff

Modified: trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java (1396 => 1397)

--- trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java 2009-12-03 12:09:48 UTC (rev 1396) +++ trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java 2009-12-03 21:47:24 UTC (rev 1397) <at> <at> -1,15 +1,19 <at> <at> package org.jbehave.scenario.i18n; - +import static org.hamcrest.CoreMatchers.equalTo; +import static org.jbehave.Ensure.ensureThat; import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.InputStream; import java.util.Locale; +import java.util.Map; import java.util.Properties; import org.jbehave.scenario.definition.KeyWords; import org.jbehave.scenario.i18n.I18nKeyWords.KeywordNotFoundExcepion; import org.jbehave.scenario.i18n.I18nKeyWords.ResourceBundleNotFoundExcepion; +import org.jbehave.scenario.steps.StepType; +import org.jbehave.scenario.steps.StepsConfiguration; import org.junit.Test; public class I18nKeywordsBehaviour { <at> <at> -36,6 +40,23 <at> <at> ensureKeywordsAreLocalisedFor(new Locale("es"), null); } + <at> Test + public void shouldAllowKeywordsToBeOverriddenInStepsConfiguration() { + StepsConfiguration configuration = new StepsConfiguration(); + ensureKeywordsAreLocalised(configuration, new Locale("en")); + configuration.useKeyWords(new I18nKeyWords(new Locale("it"))); + ensureKeywordsAreLocalised(configuration, new Locale("it")); + } + + private void ensureKeywordsAreLocalised(StepsConfiguration configuration, Locale locale) { + Map<StepType, String> startingWordsByType = configuration.getStartingWordsByType(); + KeyWords keywords = keyWordsFor(locale, null); + ensureThat(startingWordsByType.get(StepType.GIVEN), equalTo(keywords.given())); + ensureThat(startingWordsByType.get(StepType.WHEN), equalTo(keywords.when())); + ensureThat(startingWordsByType.get(StepType.THEN), equalTo(keywords.then())); + ensureThat(startingWordsByType.get(StepType.AND), equalTo(keywords.and())); + } + private void ensureKeywordsAreLocalisedFor(Locale locale, String bundleName) throws IOException { KeyWords keywords = keyWordsFor(locale, bundleName);

Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepsConfiguration.java (1396 => 1397)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepsConfiguration.java 2009-12-03 12:09:48 UTC (rev 1396) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepsConfiguration.java 2009-12-03 21:47:24 UTC (rev 1397) <at> <at> -62,9 +62,13 <at> <at> this.paranamer = paranamer; this.parameterConverters = parameterConverters; this.keywords = keywords; - this.startingWords = startingWordsFrom(this.keywords); + startingWordsFromKeywords(); + } + + private void startingWordsFromKeywords() { + this.startingWords = startingWordsFrom(this.keywords); this.startingWordsByType = startingWordsByType(this.keywords); - } + } /** * <at> deprecated Use StepsConfiguration(KeyWords) <at> <at> -170,7 +174,7 <at> <at> public void useKeyWords(KeyWords keywords) { this.keywords = keywords; - this.startingWords = startingWordsFrom(this.keywords); + startingWordsFromKeywords(); } }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 7 Dec 2009 18:06

[1398] trunk/web/web-runner/src/main/webapp/ftl/scenario: JBEHAVE-213: Support different form action methods in scenario submission.

Revision 1398 Author mauro Date 2009-12-07 11:06:29 -0600 (Mon, 07 Dec 2009)

Log Message

JBEHAVE-213: Support different form action methods in scenario submission.

Modified Paths

Diff

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java (1397 => 1398)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-03 21:47:24 UTC (rev 1397) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-07 17:06:29 UTC (rev 1398) <at> <at> -11,26 +11,38 <at> <at> public class ScenarioContext { - private static final String EMPTY = ""; + private static final String POST = "post"; + private static final String EMPTY = ""; private static final List<String> EMPTY_LIST = asList(); + private String method; private String input; private String output; private List<String> messages; private Throwable cause; public ScenarioContext() { - this(EMPTY, EMPTY, EMPTY_LIST); + this(POST, EMPTY, EMPTY, EMPTY_LIST); } - public ScenarioContext(String input, String output, List<String> messages) { - this.input = input; + public ScenarioContext(String method, String input, String output, List<String> messages) { + this.method = method; + this.input = input; this.output = output; this.messages = new ArrayList<String>(); this.messages.addAll(messages); } - public String getInput() { + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getInput() { return input; }

Modified: trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl (1397 => 1398)

--- trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-03 21:47:24 UTC (rev 1397) +++ trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-07 17:06:29 UTC (rev 1398) <at> <at> -7,7 +7,7 <at> <at> </head> <#include "/ftl/navigation.ftl" parse="true"> <div id="content"> - <form action="${base}/scenario/scenario.action"> + <form action="${base}/scenario/scenario.action" method="${scenarioContext.method}"> <#include "/ftl/errors.ftl" parse="true"> <div id="scenarioInput">

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 7 Dec 2009 18:33

[1399] trunk/web/web-runner/src/main/webapp/ftl/scenario: JBEHAVE-213: Added some safeguards on method values.

Revision 1399 Author mauro Date 2009-12-07 11:33:53 -0600 (Mon, 07 Dec 2009)

Log Message

JBEHAVE-213: Added some safeguards on method values.

Modified Paths

Diff

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java (1398 => 1399)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-07 17:06:29 UTC (rev 1398) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-07 17:33:53 UTC (rev 1399) <at> <at> -15,7 +15,7 <at> <at> private static final String EMPTY = ""; private static final List<String> EMPTY_LIST = asList(); - private String method; + private String method = POST; private String input; private String output; private List<String> messages;

Modified: trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl (1398 => 1399)

--- trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-07 17:06:29 UTC (rev 1398) +++ trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-07 17:33:53 UTC (rev 1399) <at> <at> -7,7 +7,7 <at> <at> </head> <#include "/ftl/navigation.ftl" parse="true"> <div id="content"> - <form action="${base}/scenario/scenario.action" method="${scenarioContext.method}"> + <form action="${base}/scenario/scenario.action" method="${scenarioContext.method!"POST"}"> <#include "/ftl/errors.ftl" parse="true"> <div id="scenarioInput">

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 8 Dec 2009 10:01

[1400] trunk/web/web-runner/src/main/webapp/ftl/scenario: JBEHAVE-213: Added drop-down selection to toggle between form action methods.

Diff

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java (1399 => 1400)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-07 17:33:53 UTC (rev 1399) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java 2009-12-08 09:01:55 UTC (rev 1400) <at> <at> -11,8 +11,10 <at> <at> public class ScenarioContext { - private static final String POST = "post"; + private static final String POST = "post"; + private static final String GET = "get"; private static final String EMPTY = ""; + private static final List<String> METHODS = asList(POST, GET); private static final List<String> EMPTY_LIST = asList(); private String method = POST; <at> <at> -32,8 +34,11 <at> <at> this.messages = new ArrayList<String>(); this.messages.addAll(messages); } - + public List<String> getMethods(){ + return METHODS; + } + public String getMethod() { return method; }

Modified: trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl (1399 => 1400)

--- trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-07 17:33:53 UTC (rev 1399) +++ trunk/web/web-runner/src/main/webapp/ftl/scenario/scenario.ftl 2009-12-08 09:01:55 UTC (rev 1400) <at> <at> -16,7 +16,10 <at> <at> <p> < <at> w.textarea "scenarioContext.input" "${scenarioContext.input}" "rows='25' cols='100'"/> </p> - <p><a href="javascript:fireActionMethod('run');">< <at> i.messageFor "runScenario" "Run Scenario"/></a></p> + <p><a href="javascript:fireActionMethod('run');">< <at> i.messageFor "runScenario" "Run Scenario"/></a> (Method + < <at> w.selectSingle "scenarioContext.method" w.asNameableValues(scenarioContext.getMethods(),"name()","name()") scenarioContext.getMethod() + "onchange=\"fireActionMethod('show');\"" />) + </p> </fieldset> </div>

Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java (1399 => 1400)

--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2009-12-07 17:33:53 UTC (rev 1399) +++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2009-12-08 09:01:55 UTC (rev 1400) <at> <at> -4,6 +4,8 <at> <at> import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.List; + import org.codehaus.waffle.menu.Menu; import org.jbehave.scenario.Configuration; import org.jbehave.scenario.MostUsefulConfiguration; <at> <at> -62,6 +64,17 <at> <at> assertEquals(asList("Test failed"), controller.getScenarioContext().getFailureMessages()); assertTrue(controller.getScenarioContext().getFailureStackTrace().startsWith("java.lang.RuntimeException: Test failed")); } + + <at> Test + public void canChangeScenarioContextMethod(){ + ScenarioController controller = new ScenarioController(MENU, configuration, parser, runner, new MySteps()); + ScenarioContext scenarioContext = controller.getScenarioContext(); + List<String> methods = scenarioContext.getMethods(); + assertEquals(methods.get(0), scenarioContext.getMethod()); + scenarioContext.setMethod(methods.get(1)); + controller.show(); + assertEquals(methods.get(1), scenarioContext.getMethod()); + } private void assertLinesMatch(String expected, String actual) { String[] expectedLines = expected.split(NL);

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 8 Dec 2009 10:07

[1402] tags/jbehave-web-2.1.6/: [maven-scm] copy for tag jbehave-web-2.1.6

Revision 1402 Author mauro Date 2009-12-08 03:07:23 -0600 (Tue, 08 Dec 2009)

Log Message

[maven-scm] copy for tag jbehave-web-2.1.6

Added Paths

  • tags/jbehave-web-2.1.6/

Diff

Copied: tags/jbehave-web-2.1.6 (from rev 1401, trunk/web) ( => )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |
headers
mauro | 8 Dec 2009 10:07

[1401] trunk/web: [maven-release-plugin] prepare release jbehave-web-2.1.6

Revision 1401 Author mauro Date 2009-12-08 03:07:15 -0600 (Tue, 08 Dec 2009)

Log Message

[maven-release-plugin] prepare release jbehave-web-2.1.6

Modified Paths

Diff

Modified: trunk/web/distribution/pom.xml (1400 => 1401)

--- trunk/web/distribution/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/distribution/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> </parent> <artifactId>jbehave-web-distribution</artifactId> <packaging>pom</packaging>

Modified: trunk/web/pom.xml (1400 => 1401)

--- trunk/web/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -2,7 +2,7 <at> <at> <modelVersion>4.0.0</modelVersion> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> <packaging>pom</packaging> <name>JBehave Web</name> <description>JBehave Web aims to provide a web integration layer for Behaviour-Driven Development</description> <at> <at> -344,9 +344,9 <at> <at> <contributors /> <scm> - <connection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/trunk/web</developerConnection> - <url>http://svn.codehaus.org/jbehave/trunk/web</url> + <connection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.6</connection> + <developerConnection>scm:svn:https://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.6</developerConnection> + <url>http://svn.codehaus.org/jbehave/tags/jbehave-web-2.1.6</url> </scm> <distributionManagement>

Modified: trunk/web/web-io/pom.xml (1400 => 1401)

--- trunk/web/web-io/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/web-io/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> </parent> <artifactId>jbehave-web-io</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-resources/pom.xml (1400 => 1401)

--- trunk/web/web-resources/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/web-resources/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> </parent> <artifactId>jbehave-web-resources</artifactId> <packaging>jar</packaging>

Modified: trunk/web/web-runner/pom.xml (1400 => 1401)

--- trunk/web/web-runner/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/web-runner/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> </parent> <artifactId>jbehave-web-runner</artifactId> <packaging>jar</packaging> <!-- NOTE: Change to war to run with jetty -->

Modified: trunk/web/web-selenium/pom.xml (1400 => 1401)

--- trunk/web/web-selenium/pom.xml 2009-12-08 09:01:55 UTC (rev 1400) +++ trunk/web/web-selenium/pom.xml 2009-12-08 09:07:15 UTC (rev 1401) <at> <at> -3,7 +3,7 <at> <at> <parent> <groupId>org.jbehave.web</groupId> <artifactId>jbehave-web</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.6</version> </parent> <artifactId>jbehave-web-selenium</artifactId> <packaging>jar</packaging>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Permalink | Reply | 0 comments |

Gmane