Pass security context into getURLMapping() so that appropriate scheme/port are chosen when no concrete url is provided by the binding.

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

3 files changed, 5 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 46f819d6b9..6cee3142ca 100644
--- a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
@@ -153,8 +153,8 @@ public class DefaultServletHostExtensionPoint implements ServletHostExtensionPoi
             return getServletHost().getServletMapping(uri);
         }
 
-        public URL getURLMapping(String uri) {
-            return getServletHost().getURLMapping(uri);
+        public URL getURLMapping(String uri, SecurityContext securityContext) {
+            return getServletHost().getURLMapping(uri, securityContext);
         }
 
         public Servlet removeServletMapping(String uri) throws ServletMappingException {
diff --git a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 668b069bf9..776de4a361 100644
--- a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
@@ -119,12 +119,12 @@ public class ExtensibleServletHost implements ServletHost {
         return getDefaultServletHost().getContextPath();
     }
     
-    public URL getURLMapping(String uri) {
+    public URL getURLMapping(String uri, SecurityContext securityContext) {
         if (servletHosts.getServletHosts().isEmpty()) {
             throw new ServletMappingException("No servlet host available");
         }
 
-        return getDefaultServletHost().getURLMapping(uri);
+        return getDefaultServletHost().getURLMapping(uri, securityContext);
     }
 
     public void setContextPath(String path) {
diff --git a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index 6747472bc1..f5e375a2ed 100644
--- a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
@@ -120,7 +120,7 @@ public interface ServletHost {
      * Returns the complete URL mapped to the specified URI. 
      * @return the URL mapped to the specified URI
      */
-    URL getURLMapping(String uri);
+    URL getURLMapping(String uri, SecurityContext securityContext);
 
     /**
      * Set an attribute in the application ServletContext