commit b7340480975975c51c404ddf399bcf9d6c522523
author Carsten Ziegeler <cziegeler@apache.org> Wed Jul 15 20:43:33 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Jul 15 20:43:33 2015 +0000
tree 03a955698ccda3869dc4bc613e50bf0023214f49
parent 6c46d6e5649a69901e38fd6e3046ee5ee1896f28

Fix context methods

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1691271 13f79535-47bb-0310-9956-ffa450edef68

http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
index ccab6aa..c5f8ca1 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
@@ -194,7 +194,7 @@
     @Override
     public void declareRoles(final String... roleNames)
     {
-        this.context.declareRoles(roleNames);
+        throw new UnsupportedOperationException();
     }
 
     @Override

http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
index 20f3e40..4488fc3 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -64,7 +64,6 @@
 import org.apache.felix.http.base.internal.service.HttpServiceFactory;
 import org.apache.felix.http.base.internal.service.HttpServiceRuntimeImpl;
 import org.apache.felix.http.base.internal.service.ResourceServlet;
-import org.apache.felix.http.base.internal.util.MimeTypes;
 import org.apache.felix.http.base.internal.whiteboard.tracker.FilterTracker;
 import org.apache.felix.http.base.internal.whiteboard.tracker.ListenersTracker;
 import org.apache.felix.http.base.internal.whiteboard.tracker.ResourceTracker;
@@ -168,12 +167,7 @@
                     {
                         return new ServletContextHelper(bundle)
                         {
-
-                            @Override
-                            public String getMimeType(final String file)
-                            {
-                                return MimeTypes.get().getByFile(file);
-                            }
+                            // nothing to override
                         };
                     }