summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/contrib
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-11 04:58:31 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-11 04:58:31 +0000
commit37119a89dde40e2b407590b55b646f3756f7fd48 (patch)
tree53289266dfbdcac12f9b3e1ddd591d661636e47a /sca-java-2.x/contrib
parent09d065edd79635d982ba5577ea2fc9da545c5dcc (diff)
Update to match the current trunk ServletHost interface
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1134520 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/contrib')
-rw-r--r--sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java22
1 files changed, 21 insertions, 1 deletions
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java b/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
index db77162b41..643599afb8 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
+++ b/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
@@ -41,6 +41,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
+import org.apache.tuscany.sca.host.http.SecurityContext;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletMappingException;
import org.osgi.framework.BundleActivator;
@@ -102,7 +103,7 @@ public class OSGiServletHost implements ServletHost, BundleActivator {
return defaultPortNumber;
}
- public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException {
+ public String addServletMapping(String suri, Servlet servlet) throws ServletMappingException {
URI pathURI = URI.create(suri);
// Make sure that the path starts with a /
@@ -127,6 +128,7 @@ public class OSGiServletHost implements ServletHost, BundleActivator {
}
logger.info("Added Servlet mapping: " + suri);
+ return suri;
}
public Servlet removeServletMapping(String suri) throws ServletMappingException {
@@ -272,4 +274,22 @@ public class OSGiServletHost implements ServletHost, BundleActivator {
return "osgi";
}
+ @Override
+ public ServletContext getServletContext() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String addServletMapping(String uri, Servlet servlet, SecurityContext securityContext)
+ throws ServletMappingException {
+ return addServletMapping(uri, servlet);
+ }
+
+ @Override
+ public URL getURLMapping(String uri, SecurityContext securityContext) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}