You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/07/15 22:43:33 UTC
svn commit: r1691271 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard:
SharedServletContextImpl.java WhiteboardManager.java
Author: cziegeler
Date: Wed Jul 15 20:43:33 2015
New Revision: 1691271
URL: http://svn.apache.org/r1691271
Log:
Fix context methods
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java?rev=1691271&r1=1691270&r2=1691271&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java Wed Jul 15 20:43:33 2015
@@ -194,7 +194,7 @@ public class SharedServletContextImpl im
@Override
public void declareRoles(final String... roleNames)
{
- this.context.declareRoles(roleNames);
+ throw new UnsupportedOperationException();
}
@Override
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java?rev=1691271&r1=1691270&r2=1691271&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java Wed Jul 15 20:43:33 2015
@@ -64,7 +64,6 @@ import org.apache.felix.http.base.intern
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 @@ public final class WhiteboardManager
{
return new ServletContextHelper(bundle)
{
-
- @Override
- public String getMimeType(final String file)
- {
- return MimeTypes.get().getByFile(file);
- }
+ // nothing to override
};
}