SLING-5895 : Update commons testing to parent pom 27

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753894 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 90853e5..3f245c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>27</version>
         <relativePath />
     </parent>
 
@@ -55,15 +55,15 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
        
         <!--
diff --git a/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java b/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
index 0188162..6bf0495 100644
--- a/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
+++ b/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.commons.testing.osgi;
 
+import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Dictionary;
@@ -38,106 +39,150 @@
         this.bundleId = bundleId;
     }
 
+    @Override
     public long getBundleId() {
         return bundleId;
     }
 
-    public Enumeration<?> findEntries(String path, String filePattern,
+    @Override
+    public Enumeration<URL> findEntries(String path, String filePattern,
             boolean recurse) {
         return null;
     }
 
+    @Override
     public URL getEntry(String name) {
         return null;
     }
 
-    public Enumeration<?> getEntryPaths(String path) {
+    @Override
+    public Enumeration<String> getEntryPaths(String path) {
         return null;
     }
 
-    public Dictionary<?, ?> getHeaders() {
+    @Override
+    public Dictionary<String, String> getHeaders() {
         return null;
     }
 
-    public Dictionary<?, ?> getHeaders(String locale) {
+    @Override
+    public Dictionary<String, String> getHeaders(String locale) {
         return null;
     }
 
+    @Override
     public long getLastModified() {
         return 0;
     }
 
+    @Override
     public String getLocation() {
         return null;
     }
 
+    @Override
     public ServiceReference[] getRegisteredServices() {
         return null;
     }
 
+    @Override
     public URL getResource(String name) {
         return null;
     }
 
-    public Enumeration<?> getResources(String name) {
+    @Override
+    public Enumeration<URL> getResources(String name) {
         return null;
     }
 
+    @Override
     public ServiceReference[] getServicesInUse() {
         return null;
     }
 
+    @Override
     public int getState() {
         return 0;
     }
 
+    @Override
     public String getSymbolicName() {
         return null;
     }
 
+    @Override
     public boolean hasPermission(Object permission) {
         return false;
     }
 
+    @Override
     public Class<?> loadClass(String name) throws ClassNotFoundException {
         throw new ClassNotFoundException(name);
     }
 
+    @Override
     public void start() {
 
     }
 
+    @Override
     public void stop() {
 
     }
 
+    @Override
     public void uninstall() {
 
     }
 
+    @Override
     public void update() {
 
     }
 
+    @Override
     public void update(InputStream in) {
 
     }
 
+    @Override
     public BundleContext getBundleContext() {
         return null;
     }
 
+    @Override
     public void start(int options) throws BundleException {
     }
 
+    @Override
     public void stop(int options) throws BundleException {
     }
 
+    @Override
     public Map getSignerCertificates(int signersType) {
         return null;
     }
 
+    @Override
     public Version getVersion() {
         return null;
     }
+
+    @Override
+    public int compareTo(Bundle o) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public <A> A adapt(Class<A> type) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public File getDataFile(String filename) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java b/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java
index 168b748..e690169 100644
--- a/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java
+++ b/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Dictionary;
 
 import org.osgi.framework.Bundle;
@@ -29,7 +30,9 @@
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkListener;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 
@@ -40,118 +43,178 @@
         this.bundle = bundle;
     }
 
+    @Override
     public String getProperty(String s) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Bundle getBundle() {
         return bundle;
 
     }
 
+    @Override
     public Bundle installBundle(String s) throws BundleException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Bundle installBundle(String s, InputStream inputStream)
             throws BundleException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Bundle getBundle(long l) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Bundle[] getBundles() {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void addServiceListener(ServiceListener serviceListener, String s)
             throws InvalidSyntaxException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void addServiceListener(ServiceListener serviceListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void removeServiceListener(ServiceListener serviceListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void addBundleListener(BundleListener bundleListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void removeBundleListener(BundleListener bundleListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void addFrameworkListener(FrameworkListener frameworkListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public void removeFrameworkListener(FrameworkListener frameworkListener) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public ServiceRegistration registerService(String[] strings, Object o,
             Dictionary dictionary) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public ServiceRegistration registerService(String s, Object o,
             Dictionary dictionary) {
         return new MockServiceRegistration();
     }
 
+    @Override
     public ServiceReference[] getServiceReferences(String s, String s1)
             throws InvalidSyntaxException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public ServiceReference[] getAllServiceReferences(String s, String s1)
             throws InvalidSyntaxException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public ServiceReference getServiceReference(String s) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Object getService(ServiceReference serviceReference) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public boolean ungetService(ServiceReference serviceReference) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public File getDataFile(String s) {
         throw new UnsupportedOperationException("Not implemented");
 
     }
 
+    @Override
     public Filter createFilter(String s) throws InvalidSyntaxException {
         throw new UnsupportedOperationException("Not implemented");
 
     }
+
+    @Override
+    public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory,
+            Dictionary<String, ?> properties) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+            throws InvalidSyntaxException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Bundle getBundle(String location) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
diff --git a/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java b/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java
index d31993c..5ec1ff6 100644
--- a/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java
+++ b/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java
@@ -20,8 +20,8 @@
 
 import java.util.Dictionary;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.servlet.Servlet;
 
@@ -33,7 +33,7 @@
 
 public class MockComponentContext implements ComponentContext {
 
-    private Dictionary<Object, Object> properties = new Properties();
+    private Dictionary<String, Object> properties = new Hashtable<>();
 
     private MockBundleContext mockBundleContext;
 
@@ -44,7 +44,7 @@
     public MockComponentContext(MockBundle bundle) {
         mockBundleContext = new MockBundleContext(bundle);
     }
-    
+
     public MockComponentContext(MockBundleContext mockBundleContext) {
         this.mockBundleContext = mockBundleContext;
     }
@@ -53,7 +53,7 @@
         mockBundleContext = new MockBundleContext(bundle);
         this.servlet = servlet;
     }
-    
+
     public MockComponentContext(MockBundleContext mockBundleContext, Servlet servlet) {
         this.mockBundleContext = mockBundleContext;
         this.servlet = servlet;
@@ -66,14 +66,16 @@
 
     public void setProperty(Object key, Object value) {
         // noinspection unchecked
-        this.properties.put(key, value);
+        this.properties.put(key.toString(), value);
     }
 
-    public Dictionary<Object, Object> getProperties() {
+    @Override
+    public Dictionary<String, Object> getProperties() {
         // noinspection ReturnOfCollectionOrArrayField
         return this.properties;
     }
 
+    @Override
     public Object locateService(String name, ServiceReference reference) {
         // the constant is from Sling Core, but we don't want to have a dep just because of this
         String referenceName = (String) reference.getProperty("sling.core.servletName");
@@ -84,32 +86,40 @@
         return services.get(reference);
     }
 
+    @Override
     public BundleContext getBundleContext() {
         return mockBundleContext;
     }
 
+    @Override
     public void disableComponent(String name) {
     }
 
+    @Override
     public void enableComponent(String name) {
     }
 
+    @Override
     public ComponentInstance getComponentInstance() {
         return null;
     }
 
+    @Override
     public ServiceReference getServiceReference() {
         return null;
     }
 
+    @Override
     public Bundle getUsingBundle() {
         return null;
     }
 
+    @Override
     public Object locateService(String name) {
         return null;
     }
 
+    @Override
     public Object[] locateServices(String name) {
         return null;
     }
diff --git a/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletRequest.java
index 3516fe5..1524477 100644
--- a/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletRequest.java
@@ -19,16 +19,27 @@
 package org.apache.sling.commons.testing.sling;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -116,40 +127,49 @@
         this.method = (method == null) ? "GET" : method.toUpperCase();
     }
 
+    @Override
     public Cookie getCookie(String name) {
         return null;
     }
 
+    @Override
     public RequestDispatcher getRequestDispatcher(String path,
             RequestDispatcherOptions options) {
         return null;
     }
 
+    @Override
     public RequestDispatcher getRequestDispatcher(Resource resource,
             RequestDispatcherOptions options) {
         return null;
     }
 
+    @Override
     public RequestDispatcher getRequestDispatcher(Resource resource) {
         return null;
     }
 
+    @Override
     public RequestParameter getRequestParameter(String name) {
         return null;
     }
 
+    @Override
     public RequestParameterMap getRequestParameterMap() {
         return null;
     }
 
+    @Override
     public RequestParameter[] getRequestParameters(String name) {
         return null;
     }
 
+    @Override
     public RequestPathInfo getRequestPathInfo() {
         return requestPathInfo;
     }
 
+    @Override
     public RequestProgressTracker getRequestProgressTracker() {
         if (mockRequestProgressTracker == null) {
             mockRequestProgressTracker = new MockRequestProgressTracker();
@@ -157,247 +177,403 @@
         return mockRequestProgressTracker;
     }
 
+    @Override
     public Resource getResource() {
         return resource;
     }
 
+    @Override
     public ResourceBundle getResourceBundle(Locale locale) {
         return null;
     }
 
+    @Override
     public ResourceBundle getResourceBundle(String baseName, Locale locale) {
         return null;
     }
 
+    @Override
     public ResourceResolver getResourceResolver() {
         return mockResourceResolver;
     }
 
+    @Override
     public String getResponseContentType() {
         return null;
     }
 
+    @Override
     public Enumeration<String> getResponseContentTypes() {
         return null;
     }
 
+    @Override
     public String getAuthType() {
         return null;
     }
 
-	public String getContextPath() {
+	@Override
+    public String getContextPath() {
 		return contextPath;
 	}
 
+    @Override
     public Cookie[] getCookies() {
         return null;
     }
 
+    @Override
     public long getDateHeader(String name) {
         return 0;
     }
 
+    @Override
     public String getHeader(String name) {
         return null;
     }
 
-    public Enumeration<?> getHeaderNames() {
+    @Override
+    public Enumeration<String> getHeaderNames() {
         return null;
     }
 
-    public Enumeration<?> getHeaders(String name) {
+    @Override
+    public Enumeration<String> getHeaders(String name) {
         return null;
     }
 
+    @Override
     public int getIntHeader(String name) {
         return 0;
     }
 
+    @Override
     public String getMethod() {
         return method;
     }
 
+    @Override
     public String getPathInfo() {
         return null;
     }
 
+    @Override
     public String getPathTranslated() {
         return null;
     }
 
+    @Override
     public String getQueryString() {
         return queryString;
     }
 
+    @Override
     public String getRemoteUser() {
         return null;
     }
 
+    @Override
     public String getRequestURI() {
         return null;
     }
 
+    @Override
     public StringBuffer getRequestURL() {
         return null;
     }
 
+    @Override
     public String getRequestedSessionId() {
         return null;
     }
 
+    @Override
     public String getServletPath() {
         return null;
     }
 
+    @Override
     public HttpSession getSession() {
         return null;
     }
 
+    @Override
     public HttpSession getSession(boolean create) {
         return null;
     }
 
+    @Override
     public Principal getUserPrincipal() {
         return null;
     }
 
+    @Override
     public boolean isRequestedSessionIdFromCookie() {
         return false;
     }
 
+    @Override
     public boolean isRequestedSessionIdFromURL() {
         return false;
     }
 
+    @Override
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public boolean isRequestedSessionIdFromUrl() {
         return false;
     }
 
+    @Override
     public boolean isRequestedSessionIdValid() {
         return false;
     }
 
+    @Override
     public boolean isUserInRole(String role) {
         return false;
     }
 
+    @Override
     public Object getAttribute(String name) {
         return null;
     }
 
-    public Enumeration<?> getAttributeNames() {
+    @Override
+    public Enumeration<String> getAttributeNames() {
         return null;
     }
 
+    @Override
     public String getCharacterEncoding() {
         return null;
     }
 
+    @Override
     public int getContentLength() {
         return 0;
     }
 
+    @Override
     public String getContentType() {
         return null;
     }
 
+    @Override
     public ServletInputStream getInputStream() {
         return null;
     }
 
+    @Override
     public String getLocalAddr() {
         return null;
     }
 
+    @Override
     public String getLocalName() {
         return null;
     }
 
+    @Override
     public int getLocalPort() {
         return 0;
     }
 
+    @Override
     public Locale getLocale() {
         return null;
     }
 
-    public Enumeration<?> getLocales() {
+    @Override
+    public Enumeration<Locale> getLocales() {
         return null;
     }
 
+    @Override
     public String getParameter(String name) {
         return null;
     }
 
-    public Map<?, ?> getParameterMap() {
+    @Override
+    public Map<String, String[]> getParameterMap() {
         return null;
     }
 
-    public Enumeration<?> getParameterNames() {
+    @Override
+    public Enumeration<String> getParameterNames() {
         return null;
     }
 
+    @Override
     public String[] getParameterValues(String name) {
         return null;
     }
 
+    @Override
     public String getProtocol() {
         return null;
     }
 
+    @Override
     public BufferedReader getReader() {
         return null;
     }
 
+    @Override
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public String getRealPath(String path) {
         return null;
     }
 
+    @Override
     public String getRemoteAddr() {
         return null;
     }
 
+    @Override
     public String getRemoteHost() {
         return null;
     }
 
+    @Override
     public int getRemotePort() {
         return 0;
     }
 
+    @Override
     public RequestDispatcher getRequestDispatcher(String path) {
         return null;
     }
 
+    @Override
     public String getScheme() {
         return scheme;
     }
 
+    @Override
     public String getServerName() {
         return server;
     }
 
+    @Override
     public int getServerPort() {
         return port;
     }
 
+    @Override
     public boolean isSecure() {
         return this.secure;
     }
 
+    @Override
     public void removeAttribute(String name) {
 
     }
 
+    @Override
     public void setAttribute(String name, Object o) {
 
     }
 
+    @Override
     public void setCharacterEncoding(String env) {
 
     }
 
+    @Override
     public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
         return null;
     }
+
+    @Override
+    public String changeSessionId() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public void login(String username, String password) throws ServletException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void logout() throws ServletException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public Collection<Part> getParts() throws IOException, ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Part getPart(String name) throws IOException, ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public long getContentLengthLong() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync() throws IllegalStateException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            throws IllegalStateException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean isAsyncStarted() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean isAsyncSupported() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public AsyncContext getAsyncContext() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public DispatcherType getDispatcherType() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
diff --git a/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletResponse.java
index 5228110..da94c42 100644
--- a/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/commons/testing/sling/MockSlingHttpServletResponse.java
@@ -18,15 +18,17 @@
  */
 package org.apache.sling.commons.testing.sling;
 
-import org.apache.sling.api.SlingHttpServletResponse;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
+import java.util.Collection;
 import java.util.Locale;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+
+import org.apache.sling.api.SlingHttpServletResponse;
+
 public class MockSlingHttpServletResponse implements SlingHttpServletResponse {
 
 	private StringBuffer output = new StringBuffer();
@@ -38,140 +40,208 @@
 		return output;
 	}
 
-	public void addCookie(Cookie cookie) {
+	@Override
+    public void addCookie(Cookie cookie) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".addCookie");
 	}
 
-	public boolean containsHeader(String s) {
+	@Override
+    public boolean containsHeader(String s) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".containsHeader");
 	}
 
-	public String encodeURL(String s) {
+	@Override
+    public String encodeURL(String s) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".encodeURL");
 	}
 
-	public String encodeRedirectURL(String s) {
+	@Override
+    public String encodeRedirectURL(String s) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".encodeRedirectURL");
 	}
 
-	public String encodeUrl(String s) {
+	@Override
+    @SuppressWarnings("deprecation")
+    @Deprecated
+    public String encodeUrl(String s) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".encodeUrl");
 	}
 
-	public String encodeRedirectUrl(String s) {
+	@Override
+    @SuppressWarnings("deprecation")
+    public String encodeRedirectUrl(String s) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".encodeRedirectUrl");
 	}
 
-	public void sendError(int i, String s) throws IOException {
+	@Override
+    public void sendError(int i, String s) throws IOException {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".sendError");
 	}
 
-	public void sendError(int i) throws IOException {
+	@Override
+    public void sendError(int i) throws IOException {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".sendError");
 	}
 
-	public void sendRedirect(String s) throws IOException {
+	@Override
+    public void sendRedirect(String s) throws IOException {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".sendRedirect");
 	}
 
-	public void setDateHeader(String s, long l) {
+	@Override
+    public void setDateHeader(String s, long l) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setDateHeader");
 	}
 
-	public void addDateHeader(String s, long l) {
+	@Override
+    public void addDateHeader(String s, long l) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".addDateHeader");
 	}
 
-	public void setHeader(String s, String s1) {
+	@Override
+    public void setHeader(String s, String s1) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setHeader");
 	}
 
-	public void addHeader(String s, String s1) {
+	@Override
+    public void addHeader(String s, String s1) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".addHeader");
 	}
 
-	public void setIntHeader(String s, int i) {
+	@Override
+    public void setIntHeader(String s, int i) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setIntHeader");
 	}
 
-	public void addIntHeader(String s, int i) {
+	@Override
+    public void addIntHeader(String s, int i) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".addIntHeader");
 	}
 
-	public void setStatus(int i) {
+	@Override
+    public void setStatus(int i) {
 		this.status = i;
 	}
 
-	public void setStatus(int i, String s) {
+	@Override
+    @SuppressWarnings("deprecation")
+    @Deprecated
+    public void setStatus(int i, String s) {
 		this.status = i;
 	}
 
-	public String getCharacterEncoding() {
+	@Override
+    public String getCharacterEncoding() {
 		return encoding;
 	}
 
-	public String getContentType() {
+	@Override
+    public String getContentType() {
 		return contentType;
 	}
 
-	public ServletOutputStream getOutputStream() throws IOException {
+	@Override
+    public ServletOutputStream getOutputStream() throws IOException {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".getOutputStream");
 	}
 
-	public PrintWriter getWriter() throws IOException {
+	@Override
+    public PrintWriter getWriter() throws IOException {
 		MockSlingHttpServletResponse.MockWriter writer = new MockWriter(output);
 		return new PrintWriter(writer);
 	}
 
-	public void setCharacterEncoding(String encoding) {
+	@Override
+    public void setCharacterEncoding(String encoding) {
 		this.encoding = encoding;
 	}
 
-	public void setContentLength(int i) {
+	@Override
+    public void setContentLength(int i) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setContentLength");
 	}
 
-	public void setContentType(String contentType) {
+	@Override
+    public void setContentType(String contentType) {
 		this.contentType = contentType;
 	}
 
-	public void setBufferSize(int i) {
+	@Override
+    public void setBufferSize(int i) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setBufferSize");
 	}
 
-	public int getBufferSize() {
+	@Override
+    public int getBufferSize() {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".getBufferSize");
 	}
 
-	public void flushBuffer() throws IOException {
+	@Override
+    public void flushBuffer() throws IOException {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".flushBuffer");
 	}
 
-	public void resetBuffer() {
+	@Override
+    public void resetBuffer() {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".resetBuffer");
 	}
 
-	public boolean isCommitted() {
+	@Override
+    public boolean isCommitted() {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".isCommitted");
 	}
 
-	public void reset() {
+	@Override
+    public void reset() {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".reset");
 	}
 
-	public void setLocale(Locale locale) {
+	@Override
+    public void setLocale(Locale locale) {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".setLocale");
 	}
 
-	public Locale getLocale() {
+	@Override
+    public Locale getLocale() {
 		throw new UnsupportedOperationException("Not implemented: " + getClass().getName() + ".getLocale");
 	}
 
-	public <AdapterType> AdapterType adaptTo(Class<AdapterType> adapterTypeClass) {
+	@Override
+    public <AdapterType> AdapterType adaptTo(Class<AdapterType> adapterTypeClass) {
 		return null;
 	}
 
-	private class MockWriter extends Writer {
+	@Override
+    public int getStatus() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public String getHeader(String name) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Collection<String> getHeaders(String name) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setContentLengthLong(long len) {
+        // TODO Auto-generated method stub
+
+    }
+
+    private class MockWriter extends Writer {
 		private StringBuffer buf;
 
 		public MockWriter(StringBuffer output) {