You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2009/03/09 13:52:14 UTC
svn commit: r751665 - in /geronimo/plugins/tuscany/trunk: geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/ geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/

Author: kevan
Date: Mon Mar  9 12:52:13 2009
New Revision: 751665

URL: http://svn.apache.org/viewvc?rev=751665&view=rev
Log:
Fix build errors caused by new abstract methods added to Tuscany. Implementation will need to be filled out

Modified:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java?rev=751665&r1=751664&r2=751665&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java Mon Mar  9 12:52:13 2009
@@ -60,6 +60,7 @@
 import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
 import org.apache.geronimo.transaction.GeronimoUserTransaction;
 import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
+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.mortbay.jetty.Handler;
@@ -130,6 +131,11 @@
         log.debug("End of init() method");
     }
 
+    public void addServletMapping(String strURI, Servlet servlet, SecurityContext securityContext) {
+        // TODO add securitycontext processing
+        addServletMapping(strURI, servlet);
+    }
+
     public void addServletMapping(String strURI, Servlet servlet) {
         log.debug("Start of addServletMapping() method");
         Set abstractNames = kernel.listGBeans(new AbstractNameQuery(

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java?rev=751665&r1=751664&r2=751665&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java Mon Mar  9 12:52:13 2009
@@ -47,6 +47,7 @@
 import org.apache.geronimo.tomcat.ObjectRetriever;
 import org.apache.geronimo.tomcat.TomcatWebContainer;
 import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
+import org.apache.tuscany.sca.host.http.SecurityContext;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.host.http.ServletMappingException;
 
@@ -102,6 +103,11 @@
         log.debug("End of init() method");
     }
 
+    public void addServletMapping(String strURI, Servlet servlet, SecurityContext securityContext) {
+        // TODO add securitycontext processing
+        addServletMapping(strURI, servlet);
+    }
+
     public void addServletMapping(String strURI, Servlet servlet) {
         log.debug("Start of addServletMapping() method");
         URI uri = URI.create(strURI);