cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r965265 - in /cxf/branches/servlet3jetty7: integration/jca/src/main/java/org/apache/cxf/jca/cxf/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/transports/http...
Date Sun, 18 Jul 2010 17:37:08 GMT
Author: bimargulies
Date: Sun Jul 18 17:37:08 2010
New Revision: 965265

URL: http://svn.apache.org/viewvc?rev=965265&view=rev
Log:
CXF-2898: everything except continuation code compiles

Modified:
    cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
    cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

Modified: cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
(original)
+++ cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
Sun Jul 18 17:37:08 2010
@@ -24,7 +24,7 @@ import javax.resource.spi.work.WorkEvent
 import javax.resource.spi.work.WorkException;
 import javax.resource.spi.work.WorkManager;
 
-import org.eclipse.thread.ThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
 
 /**
  * The adapter for using Application Server's thread pool. 

Modified: cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
(original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
Sun Jul 18 17:37:08 2010
@@ -23,15 +23,24 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 
+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.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
 
 public class ThreadLocalHttpServletRequest extends AbstractThreadLocalProxy<HttpServletRequest>

     implements HttpServletRequest {
@@ -56,11 +65,11 @@ public class ThreadLocalHttpServletReque
         return get().getHeader(name);
     }
 
-    public Enumeration getHeaderNames() {
+    public Enumeration<String> getHeaderNames() {
         return get().getHeaderNames();
     }
 
-    public Enumeration getHeaders(String name) {
+    public Enumeration<String> getHeaders(String name) {
         return get().getHeaders(name);
     }
 
@@ -141,7 +150,7 @@ public class ThreadLocalHttpServletReque
         return get().getAttribute(name);
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         return get().getAttributeNames();
     }
 
@@ -177,7 +186,7 @@ public class ThreadLocalHttpServletReque
         return get().getLocale();
     }
 
-    public Enumeration getLocales() {
+    public Enumeration<Locale> getLocales() {
         return get().getLocales();
     }
 
@@ -185,11 +194,11 @@ public class ThreadLocalHttpServletReque
         return get().getParameter(name);
     }
 
-    public Map getParameterMap() {
+    public Map<String, String[]> getParameterMap() {
         return get().getParameterMap();
     }
 
-    public Enumeration getParameterNames() {
+    public Enumeration<String> getParameterNames() {
         return get().getParameterNames();
     }
 
@@ -257,4 +266,63 @@ 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/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
(original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
Sun Jul 18 17:37:08 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.impl.tl;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Collection;
 import java.util.Locale;
 
 import javax.servlet.ServletOutputStream;
@@ -174,6 +175,26 @@ 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/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
(original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
Sun Jul 18 17:37:08 2010
@@ -32,7 +32,7 @@ public class ThreadLocalServletConfig ex
         return get().getInitParameter(name);
     }
 
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return get().getInitParameterNames();
     }
 

Modified: cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
(original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
Sun Jul 18 17:37:08 2010
@@ -23,12 +23,21 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 public class ThreadLocalServletContext extends AbstractThreadLocalProxy<ServletContext>

     implements ServletContext {
@@ -37,7 +46,7 @@ public class ThreadLocalServletContext e
         return get().getAttribute(name);
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         return get().getAttributeNames();
     }
 
@@ -53,7 +62,7 @@ public class ThreadLocalServletContext e
         return get().getInitParameter(name);
     }
 
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return get().getInitParameterNames();
     }
 
@@ -89,7 +98,7 @@ public class ThreadLocalServletContext e
         return get().getResourceAsStream(path);
     }
 
-    public Set getResourcePaths(String path) {
+    public Set<String> getResourcePaths(String path) {
         return get().getResourcePaths(path);
     }
 
@@ -107,12 +116,12 @@ public class ThreadLocalServletContext e
     }
 
     @SuppressWarnings("deprecation")
-    public Enumeration getServletNames() {
+    public Enumeration<String> getServletNames() {
         return get().getServletNames();
     }
 
     @SuppressWarnings("deprecation")
-    public Enumeration getServlets() {
+    public Enumeration<Servlet> getServlets() {
         return get().getServlets();
     }
 
@@ -138,4 +147,143 @@ 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();
+    }
+
 }

Modified: cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
(original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
Sun Jul 18 17:37:08 2010
@@ -206,7 +206,6 @@ public class RequestDispatcherProvider e
         private String path;
         private String servletPath;
         
-        @SuppressWarnings("unchecked")
         public HttpServletRequestFilter(HttpServletRequest request, String path, String servletPath)
{
             super(request);
             this.path = path;
@@ -247,7 +246,7 @@ public class RequestDispatcherProvider e
         }
         
         @Override
-        public Map getParameterMap() {
+        public Map<String, String[]> getParameterMap() {
             return params;
         }
         

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Sun Jul 18 17:37:08 2010
@@ -346,7 +346,7 @@ public class JettyHTTPDestination extend
             return null;
         }
         
-        Continuation cont = ContinuationSupport.getContinuation(req, null);
+        Continuation cont = ContinuationSupport.getContinuation(req);
         synchronized (cont) {
             Object o = cont.getObject();
             if (o instanceof ContinuationInfo) {

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Sun Jul 18 17:37:08 2010
@@ -52,6 +52,7 @@ import org.eclipse.jetty.server.ssl.SslS
 import org.eclipse.jetty.server.session.HashSessionIdManager;
 import org.eclipse.jetty.server.session.HashSessionManager;
 import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.util.thread.OldQueuedThreadPool;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 
@@ -292,7 +293,6 @@ public class JettyHTTPServerEngine
      * @param url the URL associated with the servant
      * @param handler notified on incoming HTTP requests
      */
-    @SuppressWarnings("deprecation")
     public synchronized void addServant(URL url, JettyHTTPHandler handler) {
         if (server == null) {
             DefaultHandler defaultHandler = null;
@@ -314,11 +314,13 @@ public class JettyHTTPServerEngine
                     LOG.finer("connector.port: " + connector.getPort());
                 }
             } 
+            HandlerList handlerList = new HandlerList();
+            
             server.addConnector(connector);            
             if (handlers != null && handlers.size() > 0) {
-                HandlerList handlerList = new HandlerList();
+                
                 for (Handler h : handlers) {
-                    // filting the jetty default handler 
+                    // filtering the jetty default handler 
                     // which should not be added at this point
                     if (h instanceof DefaultHandler) {
                         defaultHandler = (DefaultHandler) h;
@@ -326,22 +328,23 @@ public class JettyHTTPServerEngine
                         handlerList.addHandler(h);
                     }
                 }
-                server.addHandler(handlerList);
             }
             contexts = new ContextHandlerCollection();
-            server.addHandler(contexts);
+            handlerList.addHandler(contexts);
             if (defaultHandler != null) {
-                server.addHandler(defaultHandler);
+                handlerList.addHandler(defaultHandler);
             }
+            // having filtered the whole list, we can set.
+            server.setHandler(handlerList);
+
             try {                
                 setReuseAddress(connector);
                 server.start();
                
                 AbstractConnector aconn = (AbstractConnector) connector;
                 if (isSetThreadingParameters()) {
-                    if (aconn.getThreadPool() instanceof org.eclipse.thread.BoundedThreadPool)
{
-                        org.eclipse.thread.BoundedThreadPool pool 
-                            = (org.eclipse.thread.BoundedThreadPool)aconn.getThreadPool();
+                    if (aconn.getThreadPool() instanceof OldQueuedThreadPool) {
+                        OldQueuedThreadPool pool = (OldQueuedThreadPool)aconn.getThreadPool();
                         if (getThreadingParameters().isSetMinThreads()) {
                             pool.setMinThreads(getThreadingParameters().getMinThreads());
                         }
@@ -375,16 +378,17 @@ public class JettyHTTPServerEngine
         String contextName = HttpUriMapper.getContextName(url.getPath());            
         ContextHandler context = new ContextHandler();
         context.setContextPath(contextName);
-        
+        HandlerList handlerList = new HandlerList();        
         // bind the jetty http handler with the context handler        
-        context.setHandler(handler);
+        handlerList.addHandler(handler);
         if (isSessionSupport) {            
             HashSessionManager sessionManager = new HashSessionManager();
             SessionHandler sessionHandler = new SessionHandler(sessionManager);
             HashSessionIdManager idManager = new HashSessionIdManager();
             sessionManager.setIdManager(idManager);            
-            context.addHandler(sessionHandler);           
+            handlerList.addHandler(sessionHandler);           
         }
+        context.setHandler(handlerList);
         contexts.addHandler(context);
         
         ServletContext sc = context.getServletContext();

Modified: cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=965265&r1=965264&r2=965265&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Sun Jul 18 17:37:08 2010
@@ -464,7 +464,8 @@ public class CodeGenBugTest extends Abst
 
         ResourceHandler reshandler = new ResourceHandler();
         reshandler.setResourceBase(getLocation("/wsdl2java_wsdl/"));
-        server.addHandler(reshandler);
+        // this is the only handler we're supposed to need, so we don't need to 'add' it.
+        server.setHandler(reshandler);
         server.start();
         env.put(ToolConstants.CFG_WSDLURL, "http://localhost:8585/hello_world.wsdl");
         env.put(ToolConstants.CFG_BINDING, "http://localhost:8585/remote-hello_world_binding.xsd");



Mime
View raw message