[jbehave-scm] [scm-core][1/1] JBEHAVE-977: Use Resource name as page title.

[Mauro Talevi]

commit e35b133542aef7cd66694405f5e1e80c3bd77c68
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Tue, 11 Feb 2014 09:27:25 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Tue, 11 Feb 2014 09:27:25 +0100

    JBEHAVE-977:  Use Resource name as page title.

diff --git 
a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/UploadToREST.java 
b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/UploadToREST.java
index 05fff3b..220d3e5 100644
--- a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/UploadToREST.java
+++ b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/UploadToREST.java
@@ -25,8 +25,7 @@ public class UploadToREST implements ResourceUploader {
     public void uploadResource(Resource resource) {
         try {
             Type type = client.getType();
-            String resourcePath = resource.getURI();
-                       put(uri(resourcePath, type), entity(resource, type));
+            put(uri(resource.getURI(), type), entity(resource, type));
         } catch (Exception cause) {
             throw new InvalidStoryResource(resource.toString(), cause);
         }
diff --git 
a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/redmine/UploadToRedmine.java
 
b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/redmine/UploadToRedmine.java
index efcdcfc..055cf43 100644
--- 
a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/redmine/UploadToRedmine.java
+++ 
b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/redmine/UploadToRedmine.java
@@ -1,7 +1,6 @@
 package org.jbehave.core.io.rest.redmine;
 
 import static java.text.MessageFormat.format;
-import static org.apache.commons.lang.StringUtils.substringAfterLast;
 
 import org.jbehave.core.io.rest.RESTClient.Type;
 import org.jbehave.core.io.rest.Resource;
@@ -30,7 +29,7 @@ public class UploadToRedmine extends UploadToREST {
 
        protected String entity(Resource resource, Type type) {
                Page page = new Page();
-               page.title = substringAfterLast(resource.getURI(), "/");
+               page.title = resource.getName();
                page.text = resource.getContent();
                Entity entity = new Entity();
                entity.wiki_page = page;
diff --git 
a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/xwiki/UploadToXWiki.java 
b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/xwiki/UploadToXWiki.java
index 45c6639..0cceff6 100644
--- 
a/jbehave-rest/src/main/java/org/jbehave/core/io/rest/xwiki/UploadToXWiki.java
+++ 
b/jbehave-rest/src/main/java/org/jbehave/core/io/rest/xwiki/UploadToXWiki.java
@@ -1,7 +1,5 @@
 package org.jbehave.core.io.rest.xwiki;
 
-import static org.apache.commons.lang.StringUtils.substringAfterLast;
-
 import org.jbehave.core.io.rest.RESTClient.Type;
 import org.jbehave.core.io.rest.Resource;
 import org.jbehave.core.io.rest.UploadToREST;
@@ -24,13 +22,12 @@ public class UploadToXWiki extends UploadToREST {
 
        protected String entity(Resource resource, Type type) {
                Page page = new Page();
-               page.title = substringAfterLast(resource.getURI(), "/");
                page.syntax = "xwiki/2.0";
+               page.title = resource.getName();
                page.content = resource.getContent();
                page.parent = resource.getParentName();
                switch (type) {
                case JSON:
-                       //TODO JSON upload does not seem to work
                        Gson gson = new Gson();
                        String json = gson.toJson(page);
                        return json;