cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r979240 - in /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl: ThreadLocalHttpServletRequest.java ThreadLocalHttpServletResponse.java ThreadLocalServletContext.java
Date Mon, 26 Jul 2010 11:14:49 GMT
Author: dkulp
Date: Mon Jul 26 11:14:48 2010
New Revision: 979240

URL: http://svn.apache.org/viewvc?rev=979240&view=rev
Log:
fix for java5

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java?rev=979240&r1=979239&r2=979240&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
Mon Jul 26 11:14:48 2010
@@ -266,62 +266,50 @@ public class ThreadLocalHttpServletReque
 
     }
 
-    @Override
     public AsyncContext getAsyncContext() {
         return get().getAsyncContext();
     }
 
-    @Override
     public DispatcherType getDispatcherType() {
         return get().getDispatcherType();
     }
 
-    @Override
     public ServletContext getServletContext() {
         return get().getServletContext();
     }
 
-    @Override
     public boolean isAsyncStarted() {
         return get().isAsyncStarted();
     }
 
-    @Override
     public boolean isAsyncSupported() {
         return get().isAsyncSupported();
     }
 
-    @Override
     public AsyncContext startAsync() {
         return get().startAsync();
     }
 
-    @Override
     public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
         return get().startAsync(request, response);
     }
 
-    @Override
     public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
{
         return get().authenticate(response);
     }
 
-    @Override
     public Part getPart(String name) throws IOException, ServletException {
         return get().getPart(name);
     }
 
-    @Override
     public Collection<Part> getParts() throws IOException, ServletException {
         return get().getParts();
     }
 
-    @Override
     public void login(String username, String password) throws ServletException {
         get().login(username, password);
     }
 
-    @Override
     public void logout() throws ServletException {
         get().logout();
     }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java?rev=979240&r1=979239&r2=979240&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
Mon Jul 26 11:14:48 2010
@@ -175,22 +175,18 @@ public class ThreadLocalHttpServletRespo
         
     }
 
-    @Override
     public String getHeader(String name) {
         return get().getHeader(name);
     }
 
-    @Override
     public Collection<String> getHeaderNames() {
         return get().getHeaderNames();
     }
 
-    @Override
     public Collection<String> getHeaders(String headerName) {
         return get().getHeaders(headerName);
     }
 
-    @Override
     public int getStatus() {
         return get().getStatus();
     }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java?rev=979240&r1=979239&r2=979240&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
Mon Jul 26 11:14:48 2010
@@ -147,141 +147,115 @@ public class ThreadLocalServletContext e
         
     }
 
-    @Override
     public boolean setInitParameter(String name, String value) {
         return get().setInitParameter(name, value);
     }
 
-    @Override
     public Dynamic addServlet(String servletName, String className) throws IllegalArgumentException,
         IllegalStateException {
         return get().addServlet(servletName, className);
     }
 
-    @Override
     public Dynamic addServlet(String servletName, Servlet servlet) throws IllegalArgumentException,
         IllegalStateException {
         return get().addServlet(servletName, servlet);
     }
 
-    @Override
     public Dynamic addServlet(String servletName, Class<? extends Servlet> clazz)
         throws IllegalArgumentException, IllegalStateException {
         return get().addServlet(servletName, clazz);
     }
 
-    @Override
     public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
{
         return get().createServlet(clazz);
     }
 
-    @Override
     public ServletRegistration getServletRegistration(String servletName) {
         return get().getServletRegistration(servletName);
     }
 
-    @Override
     public Map<String, ? extends ServletRegistration> getServletRegistrations() {
         return get().getServletRegistrations();
     }
 
-    @Override
     public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
         throws IllegalArgumentException, IllegalStateException {
         return get().addFilter(filterName, className);
     }
 
-    @Override
     public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
         throws IllegalArgumentException, IllegalStateException {
         return get().addFilter(filterName, filter);
     }
 
-    @Override
     public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName,
                                                               Class<? extends Filter>
filterClass)
         throws IllegalArgumentException, IllegalStateException {
         return get().addFilter(filterName, filterClass);
     }
 
-    @Override
     public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
{
         return get().createFilter(clazz);
     }
 
-    @Override
     public FilterRegistration getFilterRegistration(String filterName) {
         return get().getFilterRegistration(filterName);
     }
 
-    @Override
     public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
         return get().getFilterRegistrations();
     }
 
-    @Override
     public void addListener(Class<? extends EventListener> listenerClass) {
         get().addListener(listenerClass);
     }
 
-    @Override
     public void addListener(String className) {
         get().addListener(className);
         
     }
 
-    @Override
     public <T extends EventListener> void addListener(T t) {
         get().addListener(t);
     }
 
-    @Override
     public <T extends EventListener> T createListener(Class<T> clazz) throws
ServletException {
         return get().createListener(clazz);
     }
 
-    @Override
     public void declareRoles(String... roleNames) {
         get().declareRoles(roleNames);
     }
 
-    @Override
     public SessionCookieConfig getSessionCookieConfig() {
         return get().getSessionCookieConfig();
     }
 
-    @Override
     public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
{
         get().setSessionTrackingModes(sessionTrackingModes);
         
     }
 
-    @Override
     public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
         return get().getDefaultSessionTrackingModes();
     }
 
-    @Override
     public int getEffectiveMajorVersion() throws UnsupportedOperationException {
         return get().getEffectiveMajorVersion();
     }
 
-    @Override
     public int getEffectiveMinorVersion() throws UnsupportedOperationException {
         return get().getEffectiveMinorVersion();
     }
 
-    @Override
     public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
         return get().getEffectiveSessionTrackingModes();
     }
 
-    @Override
     public ClassLoader getClassLoader() {
         return get().getClassLoader();
     }
 
-    @Override
     public JspConfigDescriptor getJspConfigDescriptor() {
         return get().getJspConfigDescriptor();
     }



Mime
View raw message