Provide binder context to allow Wink to properly construct relative URIs with UriBuilder

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1521548 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
index 3dfd917da9..52c293090f 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
@@ -30,6 +30,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
@@ -175,6 +177,12 @@ public class TuscanyRESTServlet extends RestServlet {
                 return TuscanyRESTServlet.this.getServletName();
             }
         });
+        
+        Properties properties = new Properties();
+        properties.put("wink.context.uri", getBindingContext());
+        //properties.put("wink.http.uri", binding.getURI());
+
+        config.setProperties(properties);
 
         ProvidersRegistry providers = config.getProvidersRegistry();
         providers.addProvider(new DataBindingJAXRSReader(registry), 0.2, true);
@@ -213,6 +221,16 @@ public class TuscanyRESTServlet extends RestServlet {
         }
         
     }
+    
+    private String getBindingContext() {
+        Pattern pattern = Pattern.compile("^[^#]*?://.*?(/.*)$");
+        Matcher matcher = pattern.matcher(binding.getURI());
+        if(matcher.find()) {
+            String bindingContext = matcher.group(1);
+            return bindingContext;
+        }
+        return null;
+    }
 
     /**
      * TuscanyResponseHandler