cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1493158 - in /cxf/trunk: api/src/main/java/org/apache/cxf/transports/http/ rt/core/src/main/java/org/apache/cxf/transports/http/internal/ rt/core/src/main/resources/META-INF/cxf/ rt/javascript/javascript-rt/src/main/java/org/apache/cxf/jav...
Date Fri, 14 Jun 2013 17:04:16 GMT
Author: dkulp
Date: Fri Jun 14 17:04:16 2013
New Revision: 1493158

URL: http://svn.apache.org/r1493158
Log:
Remove QueryHandlers, redo javascript as a ServerListener that only applies to SOAP

Added:
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
      - copied, changed from r1493128, cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptServerListener.java
      - copied, changed from r1493128, cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandlerRegistry.java
Removed:
    cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandler.java
    cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandlerRegistry.java
    cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/StemMatchingQueryHandler.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transports/http/internal/QueryHandlerRegistryImpl.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java
Modified:
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
    cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/bus-extensions.txt
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
    cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
    cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java

Modified: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Jun 14 17:04:16
2013
@@ -2,7 +2,6 @@ org.apache.cxf.bus.managers.PhaseManager
 org.apache.cxf.bus.managers.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
 org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
  	   
 org.apache.cxf.bus.managers.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
-org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true

 org.apache.cxf.bus.managers.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
 org.apache.cxf.bus.managers.HeaderManagerImpl:org.apache.cxf.headers.HeaderManager:true
 org.apache.cxf.service.factory.FactoryBeanListenerManager::true

Copied: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
(from r1493128, cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java?p2=cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java&p1=cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java&r1=1493128&r2=1493158&rev=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java
(original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
Fri Jun 14 17:04:16 2013
@@ -28,63 +28,68 @@ import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
-import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
 import org.apache.cxf.common.i18n.UncheckedException;
-import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.javascript.service.ServiceJavascriptBuilder;
 import org.apache.cxf.javascript.types.SchemaJavascriptBuilder;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.DestinationWithEndpoint;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.apache.cxf.transports.http.StemMatchingQueryHandler;
+import org.apache.cxf.transport.Conduit;
 
-@NoJSR250Annotations(unlessNull = "bus")
-public class JavascriptQueryHandler implements StemMatchingQueryHandler {
+public class JavascriptGetInterceptor extends AbstractPhaseInterceptor<Message> {
+    public static final Interceptor<? extends Message> INSTANCE = new JavascriptGetInterceptor();
+   
     private static final String JS_UTILS_PATH = "/org/apache/cxf/javascript/cxf-utils.js";
     private static final Charset UTF8 = Charset.forName("utf-8");
     private static final String NO_UTILS_QUERY_KEY = "nojsutils";
     private static final String CODE_QUERY_KEY = "js";
-    private Bus bus;
 
-    public JavascriptQueryHandler(Bus b) {
-        setBus(b);
+    public JavascriptGetInterceptor() {
+        super(Phase.READ);
+        getAfter().add(EndpointSelectionInterceptor.class.getName());
     }
+
     
-    @Resource
-    public final void setBus(Bus b) {
-        if (bus != b) {
-            bus = b;
-            QueryHandlerRegistry reg = b.getExtension(QueryHandlerRegistry.class);
-            if (reg != null) {
-                reg.registerHandler(this);
-            }
+    public void handleMessage(Message message) throws Fault {
+        String method = (String)message.get(Message.HTTP_REQUEST_METHOD);
+        String query = (String)message.get(Message.QUERY_STRING);
+        if (!"GET".equals(method) || StringUtils.isEmpty(query)) {
+            return;
         }
+        String baseUri = (String)message.get(Message.REQUEST_URL);
+        URI uri = URI.create(baseUri);
+        Map<String, String> map = UrlUtils.parseQueryString(query);
+        if (isRecognizedQuery(map, uri, message.getExchange().getEndpoint().getEndpointInfo()))
{
+            try {
+                Conduit c = message.getExchange().getDestination().getBackChannel(message);
+                Message mout = new MessageImpl();
+                mout.setExchange(message.getExchange());
+                message.getExchange().setOutMessage(mout);
+                mout.put(Message.CONTENT_TYPE, "application/javascript;charset=UTF-8");
+                c.prepare(mout);
+                OutputStream os = mout.getContent(OutputStream.class);
+                writeResponse(uri, map, os, message.getExchange().getEndpoint());
+            } catch (IOException ioe) {
+                throw new Fault(ioe);
+            }
+        }        
     }
     
-    public String getResponseContentType(String fullQueryString, String ctx) {
-        URI uri = URI.create(fullQueryString);
-        Map<String, String> map = UrlUtils.parseQueryString(uri.getQuery());
-        if (map.containsKey(CODE_QUERY_KEY)) {
-            return "application/javascript;charset=UTF-8";
-        }
-        return null;
-    }
-
-    public boolean isRecognizedQuery(String baseUri, String ctx, EndpointInfo endpointInfo,
-                                     boolean contextMatchExact) {
-        if (baseUri == null) {
+    private boolean isRecognizedQuery(Map<String, String> map, URI uri, EndpointInfo
endpointInfo) {
+        if (uri == null) {
             return false;
         }
-        URI uri = URI.create(baseUri);
-        Map<String, String> map = UrlUtils.parseQueryString(uri.getQuery());
         if (map.containsKey(CODE_QUERY_KEY)) {
             return endpointInfo.getAddress().contains(UrlUtils.getStem(uri.getSchemeSpecificPart()));
         }
@@ -96,46 +101,22 @@ public class JavascriptQueryHandler impl
         if (utils == null) {
             throw new RuntimeException("Unable to get stream for " + JS_UTILS_PATH);
         }
-        // it's amazing that this still has to be coded up.
-        byte buffer[] = new byte[1024];
-        int count;
         try {
-            while ((count = utils.read(buffer, 0, 1024)) > 0) {
-                outputStream.write(buffer, 0, count);
-            }
+            IOUtils.copyAndCloseInput(utils, outputStream);
             outputStream.flush();
         } catch (IOException e) {
             throw new RuntimeException("Failed to write javascript utils to HTTP response.",
e);
         }
     }
-    
-    private Endpoint findEndpoint(EndpointInfo endpointInfo) {
-        ServerRegistry serverRegistry = bus.getExtension(ServerRegistry.class);
-        for (Server server : serverRegistry.getServers()) {
-            // Hypothetically, not all destinations have an endpoint.
-            // There has to be a better way to do this.
-            if (server.getDestination() instanceof DestinationWithEndpoint
-                &&
-                endpointInfo.
-                    equals(((DestinationWithEndpoint)server.getDestination()).getEndpointInfo()))
{
-                return server.getEndpoint();
-            }
-        }
-        return null;
-    }
 
-    public void writeResponse(String fullQueryString, String ctx, EndpointInfo endpoint,
OutputStream os) {
-        URI uri = URI.create(fullQueryString);
-        String query = uri.getQuery();
-        Map<String, String> map = UrlUtils.parseQueryString(query);
+    private void writeResponse(URI uri, Map<String, String> map, OutputStream os, Endpoint
serverEndpoint) {
         OutputStreamWriter writer = new OutputStreamWriter(os, UTF8);
         if (!map.containsKey(NO_UTILS_QUERY_KEY)) {
-            writeUtilsToResponseStream(JavascriptQueryHandler.class, os);
+            writeUtilsToResponseStream(JavascriptGetInterceptor.class, os);
         } 
         if (map.containsKey(CODE_QUERY_KEY)) {
-            ServiceInfo serviceInfo = endpoint.getService();
+            ServiceInfo serviceInfo = serverEndpoint.getService().getServiceInfos().get(0);
             Collection<SchemaInfo> schemata = serviceInfo.getSchemas();
-            Endpoint serverEndpoint = findEndpoint(endpoint);
             // we need to move this to the bus.
             BasicNameManager nameManager = BasicNameManager.newNameManager(serviceInfo, serverEndpoint);
             NamespacePrefixAccumulator prefixManager = new NamespacePrefixAccumulator(serviceInfo
@@ -148,10 +129,11 @@ public class JavascriptQueryHandler impl
                     writer.append(allThatJavascript);
                 }
 
-                ServiceJavascriptBuilder serviceBuilder = new ServiceJavascriptBuilder(serviceInfo,
-                                                                                       endpoint.getAddress(),
-                                                                                       prefixManager,
-                                                                                       nameManager);
+                ServiceJavascriptBuilder serviceBuilder 
+                    = new ServiceJavascriptBuilder(serviceInfo,
+                                                   serverEndpoint.getEndpointInfo().getAddress(),
+                                                   prefixManager,
+                                                   nameManager);
                 serviceBuilder.walk();
                 String serviceJavascript = serviceBuilder.getCode();
                 writer.append(serviceJavascript);
@@ -160,11 +142,8 @@ public class JavascriptQueryHandler impl
                 throw new UncheckedException(e);
             }
         } else {
-            throw new RuntimeException("Invalid query " + fullQueryString);
+            throw new RuntimeException("Invalid query " + uri.toString());
         }
     }
 
-    public boolean isRecognizedQuery(String fullQueryString, String ctx, EndpointInfo endpoint)
{
-        return isRecognizedQuery(fullQueryString, ctx, endpoint, false);
-    }
 }

Copied: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptServerListener.java
(from r1493128, cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandlerRegistry.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptServerListener.java?p2=cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptServerListener.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandlerRegistry.java&r1=1493128&r2=1493158&rev=1493158&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/transports/http/QueryHandlerRegistry.java (original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptServerListener.java
Fri Jun 14 17:04:16 2013
@@ -17,26 +17,29 @@
  * under the License.
  */
 
-package org.apache.cxf.transports.http;
+package org.apache.cxf.javascript;
 
-import java.util.List;
+import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.SoapBinding;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerLifeCycleListener;
 
-public interface QueryHandlerRegistry {
-    
-    /**
-     * Register QueryHandler with registry
-     */ 
-    void registerHandler(QueryHandler handler);
-
-    /**
-    * Register QueryHandler with registry in a specified position in the list
-    */ 
-    void registerHandler(QueryHandler handler, int position);
-    
-    /**
-     * Returns list of QueryHandlers
-     */  
-    List<QueryHandler> getHandlers();
+/**
+ * 
+ */
+public class JavascriptServerListener implements ServerLifeCycleListener {
+
+    public JavascriptServerListener(Bus b) {
+    }
+
+    public void startServer(Server server) {
+        if (server.getEndpoint().getBinding() instanceof SoapBinding) {
+            //found a SOAP binding, add the javascript generation interceptor
+            server.getEndpoint().getBinding().getInInterceptors().add(JavascriptGetInterceptor.INSTANCE);
+        }
+    }
 
+    public void stopServer(Server server) {
+    }
 
 }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/bus-extensions.txt
(original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/bus-extensions.txt
Fri Jun 14 17:04:16 2013
@@ -1 +1 @@
-org.apache.cxf.javascript.JavascriptQueryHandler::true
\ No newline at end of file
+org.apache.cxf.javascript.JavascriptServerListener::true
\ No newline at end of file

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Fri Jun 14 17:04:16 2013
@@ -45,7 +45,6 @@ import org.apache.cxf.continuations.Cont
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.io.CopyingOutputStream;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
@@ -56,9 +55,6 @@ import org.apache.cxf.transport.http.Des
 import org.apache.cxf.transport.http.HTTPSession;
 import org.apache.cxf.transport.http_jetty.continuations.JettyContinuationProvider;
 import org.apache.cxf.transport.https.CertConstraintsJaxBUtils;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.apache.cxf.transports.http.StemMatchingQueryHandler;
 import org.eclipse.jetty.http.Generator;
 import org.eclipse.jetty.io.AbstractConnection;
 import org.eclipse.jetty.server.AbstractHttpConnection.Output;
@@ -198,27 +194,7 @@ public class JettyHTTPDestination extend
             return null;
         }
     }
-
-    private String removeTrailingSeparator(String addr) {
-        if (addr != null && addr.length() > 0 
-            && addr.lastIndexOf('/') == addr.length() - 1) {
-            return addr.substring(0, addr.length() - 1);
-        } else {
-            return addr;
-        }
-    }
-    
-    private synchronized String updateEndpointAddress(String addr) {
-        // only update the EndpointAddress if the base path is equal
-        // make sure we don't broke the get operation?parament query 
-        String address = removeTrailingSeparator(endpointInfo.getAddress());
-        if (getBasePathForFullAddress(address)
-            .equals(removeTrailingSeparator(getStem(getBasePathForFullAddress(addr))))) {
-            endpointInfo.setAddress(addr);
-        }
-        return address;
-    }
-   
+       
     protected void doService(HttpServletRequest req,
                              HttpServletResponse resp) throws IOException {
         doService(servletContext, req, resp);
@@ -264,50 +240,6 @@ public class JettyHTTPDestination extend
             baseRequest.setHandled(true);
             return;
         }
-        QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
-        
-        if (null != req.getQueryString() && queryHandlerRegistry != null) {   
-            String reqAddr = req.getRequestURL().toString();
-            String requestURL =  reqAddr + "?" + req.getQueryString();
-            String pathInfo = req.getPathInfo();                     
-            for (QueryHandler qh : queryHandlerRegistry.getHandlers()) {
-                boolean recognized =
-                    qh instanceof StemMatchingQueryHandler
-                    ? ((StemMatchingQueryHandler)qh).isRecognizedQuery(requestURL,
-                                                                       pathInfo,
-                                                                       endpointInfo,
-                                                                       contextMatchOnExact())
-                    : qh.isRecognizedQuery(requestURL, pathInfo, endpointInfo);
-                if (recognized) {
-                    //replace the endpointInfo address with request url only for get wsdl
-                    String errorMsg = null;
-                    CachedOutputStream out = new CachedOutputStream();
-                    try {
-                        synchronized (endpointInfo) {
-                            String oldAddress = updateEndpointAddress(reqAddr);   
-                            resp.setContentType(qh.getResponseContentType(requestURL, pathInfo));
-                            try {
-                                qh.writeResponse(requestURL, pathInfo, endpointInfo, out);
-                            } catch (Exception ex) {
-                                LOG.log(Level.WARNING, "writeResponse failed: ", ex);
-                                errorMsg = ex.getMessage();
-                            }
-                            endpointInfo.setAddress(oldAddress);
-                        }
-                        if (errorMsg != null) {
-                            resp.sendError(500, errorMsg);
-                        } else {
-                            out.writeCacheTo(resp.getOutputStream());
-                            resp.getOutputStream().flush();                     
-                        }
-                    } finally {
-                        out.close();
-                    }
-                    baseRequest.setHandled(true);
-                    return;
-                }
-            }
-        }
 
         // REVISIT: service on executor if associated with endpoint
         ClassLoaderHolder origLoader = null;
@@ -466,10 +398,6 @@ public class JettyHTTPDestination extend
         return engine;
     }
    
-    private String getStem(String baseURI) {    
-        return baseURI.substring(0, baseURI.lastIndexOf("/"));
-    }
-    
     protected Message retrieveFromContinuation(HttpServletRequest req) {
         return (Message)req.getAttribute(CXF_CONTINUATION_MESSAGE);
     }

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Fri Jun 14 17:04:16 2013
@@ -64,9 +64,6 @@ import org.apache.cxf.transport.http.Abs
 import org.apache.cxf.transport.http.ContinuationProviderFactory;
 import org.apache.cxf.transport.http.DestinationRegistry;
 import org.apache.cxf.transport.http.HTTPTransportFactory;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.apache.cxf.transports.http.StemMatchingQueryHandler;
 import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -108,9 +105,6 @@ public class JettyHTTPDestinationTest ex
     private MessageObserver observer;
     private ServletInputStream is;
     private ServletOutputStream os;
-    private QueryHandler wsdlQueryHandler;
-    private QueryHandlerRegistry  queryHandlerRegistry;
-    private List<QueryHandler> queryHandlerList;
     private HTTPTransportFactory transportFactory; 
 
     /**
@@ -314,40 +308,6 @@ public class JettyHTTPDestinationTest ex
                      "?customerId=abc&cutomerAdd=def");
 
     }
-    
-    @Test
-    public void testDoServiceWithHttpGETandStemMatchingQueryWSDL() throws Exception {
-        destination = setUpDestination(false, true);
-        setUpQueryHandler(true);
-        setUpDoService(false,
-                       false,
-                       false,
-                       "GET",
-                       "?wsdl",
-                       200);
-        
-        destination.doService(request, response);
-        assertNotNull("unexpected null response", response);
-        
-        
-    }
-    
-    @Test
-    public void testDoServiceWithHttpGETandNonStemMatchingQueryWSDL() throws Exception {
-        destination = setUpDestination(false, true);
-        setUpQueryHandler(false);
-        setUpDoService(false,
-                       false,
-                       false,
-                       "GET",
-                       "?wsdl",
-                       200);
-        
-        destination.doService(request, response);
-        assertNotNull("unexpected null response", response);
-        
-        
-    }
 
     @Test
     public void testGetAnonBackChannel() throws Exception {
@@ -565,7 +525,6 @@ public class JettyHTTPDestinationTest ex
         if (!mockedBus) {
             bus = new ExtensionManagerBus();
             bus.setExtension(mgr, ConduitInitiatorManager.class);
-            bus.setExtension(null, QueryHandlerRegistry.class);
         } else {
             bus = EasyMock.createMock(Bus.class);
             bus.getExtension(EndpointResolverRegistry.class);
@@ -613,14 +572,7 @@ public class JettyHTTPDestinationTest ex
         dest.setMessageObserver(observer);
         return dest;
     }
-    
-    private void setUpQueryHandler(boolean stemMatching) {
-        wsdlQueryHandler = stemMatching
-                           ? EasyMock.createMock(StemMatchingQueryHandler.class)
-                           : EasyMock.createMock(QueryHandler.class);
-
-    }
-    
+        
     private void setUpRemoveServant() throws Exception {
         EasyMock.reset(engine);
         engine.removeServant(EasyMock.eq(new URL(NOWHERE + "bar/foo")));
@@ -795,14 +747,7 @@ public class JettyHTTPDestinationTest ex
     }
     
     private void verifyGetWSDLQuery() throws Exception {
-        queryHandlerRegistry = EasyMock.createMock(QueryHandlerRegistry.class);
-        queryHandlerList = new ArrayList<QueryHandler>();
-        queryHandlerList.add(wsdlQueryHandler);
         EasyMock.reset(bus);        
-        bus.getExtension(QueryHandlerRegistry.class);
-        EasyMock.expectLastCall().andReturn(queryHandlerRegistry);
-        queryHandlerRegistry.getHandlers();
-        EasyMock.expectLastCall().andReturn(queryHandlerList);       
         request.getRequestURL();
         EasyMock.expectLastCall().andReturn(new StringBuffer("http://localhost/bar/foo")).times(2);
         request.getPathInfo();
@@ -817,28 +762,7 @@ public class JettyHTTPDestinationTest ex
         EasyMock.expectLastCall().andReturn(os).anyTimes();
         request.setHandled(true);
         EasyMock.expectLastCall();
-        if (wsdlQueryHandler instanceof StemMatchingQueryHandler) {
-            ((StemMatchingQueryHandler)wsdlQueryHandler).isRecognizedQuery(
-                "http://localhost/bar/foo?wsdl", 
-                "/bar/foo",
-                endpointInfo,
-                false);
-        } else {
-            wsdlQueryHandler.isRecognizedQuery("http://localhost/bar/foo?wsdl",
-                                               "/bar/foo",
-                                               endpointInfo);
-        }
-        EasyMock.expectLastCall().andReturn(true);   
-        wsdlQueryHandler.getResponseContentType("http://localhost/bar/foo?wsdl", "/bar/foo");
-        EasyMock.expectLastCall().andReturn("text/xml");
-        wsdlQueryHandler.writeResponse(EasyMock.eq("http://localhost/bar/foo?wsdl"),
-                                       EasyMock.eq("/bar/foo"), 
-                                       EasyMock.eq(endpointInfo),
-                                       (OutputStream)EasyMock.anyObject());
-        EasyMock.expectLastCall().once();
         EasyMock.replay(bus);
-        EasyMock.replay(queryHandlerRegistry);
-        EasyMock.replay(wsdlQueryHandler);
     }
 
     private void verifyDoService() throws Exception {

Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
(original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
Fri Jun 14 17:04:16 2013
@@ -35,7 +35,6 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -43,9 +42,6 @@ import org.apache.cxf.service.model.Endp
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.DestinationRegistry;
 import org.apache.cxf.transport.http.HTTPSession;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.apache.cxf.transports.http.StemMatchingQueryHandler;
 
 public class NettyHttpDestination extends AbstractHTTPDestination {
 
@@ -152,50 +148,6 @@ public class NettyHttpDestination extend
             resp.flushBuffer();
             return;
         }
-        QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
-
-        if (null != req.getQueryString() && queryHandlerRegistry != null) {
-            String reqAddr = req.getRequestURL().toString();
-            String requestURL = reqAddr + "?" + req.getQueryString();
-            String pathInfo = req.getPathInfo();
-            for (QueryHandler qh : queryHandlerRegistry.getHandlers()) {
-                boolean recognized =
-                        qh instanceof StemMatchingQueryHandler
-                                ? ((StemMatchingQueryHandler) qh).isRecognizedQuery(requestURL,
-                                    pathInfo,
-                                    endpointInfo,
-                                    contextMatchOnExact())
-                                    : qh.isRecognizedQuery(requestURL, pathInfo, endpointInfo);
-                if (recognized) {
-                    //replace the endpointInfo address with request url only for get wsdl
-                    String errorMsg = null;
-                    CachedOutputStream out = new CachedOutputStream();
-                    try {
-                        synchronized (endpointInfo) {
-                            String oldAddress = updateEndpointAddress(reqAddr);
-                            resp.setContentType(qh.getResponseContentType(requestURL, pathInfo));
-                            try {
-                                qh.writeResponse(requestURL, pathInfo, endpointInfo, out);
-                            } catch (Exception ex) {
-                                LOG.log(Level.WARNING, "writeResponse failed: ", ex);
-                                errorMsg = ex.getMessage();
-                            }
-                            endpointInfo.setAddress(oldAddress);
-                        }
-                        if (errorMsg != null) {
-                            resp.sendError(500, errorMsg);
-                        } else {
-                            out.writeCacheTo(resp.getOutputStream());
-                            resp.getOutputStream().flush();
-                        }
-                    } finally {
-                        out.close();
-                    }
-
-                    return;
-                }
-            }
-        }
 
         // REVISIT: service on executor if associated with endpoint
         ClassLoaderHolder origLoader = null;
@@ -277,26 +229,6 @@ public class NettyHttpDestination extend
         // Here we don't support the Continuation
     }
 
-    private synchronized String updateEndpointAddress(String addr) {
-        // only update the EndpointAddress if the base path is equal
-        // make sure we don't broke the get operation?parament query
-        String address = removeTrailingSeparator(endpointInfo.getAddress());
-        if (getBasePathForFullAddress(address)
-                .equals(removeTrailingSeparator(getStem(getBasePathForFullAddress(addr)))))
{
-            endpointInfo.setAddress(addr);
-        }
-        return address;
-    }
-
-    private String removeTrailingSeparator(String addr) {
-        if (addr != null && addr.length() > 0
-                && addr.lastIndexOf('/') == addr.length() - 1) {
-            return addr.substring(0, addr.length() - 1);
-        } else {
-            return addr;
-        }
-    }
-
     protected String getBasePathForFullAddress(String addr) {
         try {
             return new URL(addr).getPath();
@@ -305,10 +237,6 @@ public class NettyHttpDestination extend
         }
     }
 
-    private String getStem(String baseURI) {
-        return baseURI.substring(0, baseURI.lastIndexOf("/"));
-    }
-
     public ServletContext getServletContext() {
         return servletContext;
     }

Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
(original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
Fri Jun 14 17:04:16 2013
@@ -66,9 +66,6 @@ import org.apache.cxf.transport.http.Con
 import org.apache.cxf.transport.http.DestinationRegistry;
 import org.apache.cxf.transport.http.HTTPTransportFactory;
 import org.apache.cxf.transport.http.netty.server.util.Utils;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.apache.cxf.transports.http.StemMatchingQueryHandler;
 import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -108,9 +105,6 @@ public class NettyHttpDestinationTest ex
     private MessageObserver observer;
     private ServletInputStream is;
     private ServletOutputStream os;
-    private QueryHandler wsdlQueryHandler;
-    private QueryHandlerRegistry  queryHandlerRegistry;
-    private List<QueryHandler> queryHandlerList;
     private HTTPTransportFactory transportFactory; 
 
     /**
@@ -317,40 +311,6 @@ public class NettyHttpDestinationTest ex
     }
     
     @Test
-    public void testDoServiceWithHttpGETandStemMatchingQueryWSDL() throws Exception {
-        destination = setUpDestination(false, true);
-        setUpQueryHandler(true);
-        setUpDoService(false,
-                       false,
-                       false,
-                       "GET",
-                       "?wsdl",
-                       200);
-        
-        destination.doService(request, response);
-        assertNotNull("unexpected null response", response);
-        
-        
-    }
-    
-    @Test
-    public void testDoServiceWithHttpGETandNonStemMatchingQueryWSDL() throws Exception {
-        destination = setUpDestination(false, true);
-        setUpQueryHandler(false);
-        setUpDoService(false,
-                       false,
-                       false,
-                       "GET",
-                       "?wsdl",
-                       200);
-        
-        destination.doService(request, response);
-        assertNotNull("unexpected null response", response);
-        
-        
-    }
-
-    @Test
     public void testGetAnonBackChannel() throws Exception {
         destination = setUpDestination(false, false);
         setUpDoService(false);
@@ -612,14 +572,7 @@ public class NettyHttpDestinationTest ex
         dest.setMessageObserver(observer);
         return dest;
     }
-    
-    private void setUpQueryHandler(boolean stemMatching) {
-        wsdlQueryHandler = stemMatching
-                           ? EasyMock.createMock(StemMatchingQueryHandler.class)
-                           : EasyMock.createMock(QueryHandler.class);
-
-    }
-    
+        
     private void setUpRemoveServant() throws Exception {
         EasyMock.reset(engine);
         engine.removeServant(EasyMock.eq(new URL(NOWHERE + "bar/foo")));
@@ -791,14 +744,7 @@ public class NettyHttpDestinationTest ex
     }
     
     private void verifyGetWSDLQuery() throws Exception {
-        queryHandlerRegistry = EasyMock.createMock(QueryHandlerRegistry.class);
-        queryHandlerList = new ArrayList<QueryHandler>();
-        queryHandlerList.add(wsdlQueryHandler);
         EasyMock.reset(bus);        
-        bus.getExtension(QueryHandlerRegistry.class);
-        EasyMock.expectLastCall().andReturn(queryHandlerRegistry);
-        queryHandlerRegistry.getHandlers();
-        EasyMock.expectLastCall().andReturn(queryHandlerList);       
         request.getRequestURL();
         EasyMock.expectLastCall().andReturn(new StringBuffer("http://localhost/bar/foo")).times(2);
         request.getPathInfo();
@@ -812,28 +758,7 @@ public class NettyHttpDestinationTest ex
         response.getOutputStream();
         EasyMock.expectLastCall().andReturn(os).anyTimes();
 
-        if (wsdlQueryHandler instanceof StemMatchingQueryHandler) {
-            ((StemMatchingQueryHandler)wsdlQueryHandler).isRecognizedQuery(
-                "http://localhost/bar/foo?wsdl", 
-                "/bar/foo",
-                endpointInfo,
-                false);
-        } else {
-            wsdlQueryHandler.isRecognizedQuery("http://localhost/bar/foo?wsdl",
-                                               "/bar/foo",
-                                               endpointInfo);
-        }
-        EasyMock.expectLastCall().andReturn(true);   
-        wsdlQueryHandler.getResponseContentType("http://localhost/bar/foo?wsdl", "/bar/foo");
-        EasyMock.expectLastCall().andReturn("text/xml");
-        wsdlQueryHandler.writeResponse(EasyMock.eq("http://localhost/bar/foo?wsdl"),
-                                       EasyMock.eq("/bar/foo"), 
-                                       EasyMock.eq(endpointInfo),
-                                       (OutputStream)EasyMock.anyObject());
-        EasyMock.expectLastCall().once();
         EasyMock.replay(bus);
-        EasyMock.replay(queryHandlerRegistry);
-        EasyMock.replay(wsdlQueryHandler);
     }
 
     private void verifyDoService() throws Exception {

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Fri Jun 14 17:04:16 2013
@@ -20,7 +20,6 @@
 package org.apache.cxf.transport.servlet;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,11 +36,8 @@ import org.apache.cxf.common.logging.Log
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.DestinationRegistry;
-import org.apache.cxf.transports.http.QueryHandler;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
 
 public class ServletController {
     protected static final String DEFAULT_LISTINGS_CLASSIFIER = "/services";
@@ -179,27 +175,6 @@ public class ServletController {
                         }
                     }
                     updateDestination(request, d);
-                    
-                    if (bus != null) {
-                        QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
-                        if ("GET".equals(request.getMethod()) 
-                            && !StringUtils.isEmpty(request.getQueryString()) 
-                            && queryHandlerRegistry != null) {
-                            
-                            EndpointInfo ei = d.getEndpointInfo();
-                            String ctxUri = request.getPathInfo();
-                            String baseUri = request.getRequestURL().toString()
-                                + "?" + request.getQueryString();
-    
-                            QueryHandler selectedHandler = 
-                                findQueryHandler(queryHandlerRegistry, ei, ctxUri, baseUri);
-                            
-                            if (selectedHandler != null) {
-                                respondUsingQueryHandler(selectedHandler, res, ei, ctxUri,
baseUri);
-                                return true;
-                            }
-                        }
-                    }
                     invokeDestination(request, res, d);
                 } finally {
                     if (orig != null) { 
@@ -229,38 +204,6 @@ public class ServletController {
             }
         }
     }
-    
-    protected QueryHandler findQueryHandler(QueryHandlerRegistry queryHandlerRegistry, 
-                                            EndpointInfo ei, 
-                                            String ctxUri,
-                                            String baseUri) {
-        if (queryHandlerRegistry == null) {
-            return null;
-        }
-        Iterable<QueryHandler> handlers = queryHandlerRegistry.getHandlers();
-        for (QueryHandler qh : handlers) {
-            if (qh.isRecognizedQuery(baseUri, ctxUri, ei)) {
-                return qh;
-            }
-        }
-        return null;
-    }
-
-    protected void respondUsingQueryHandler(QueryHandler selectedHandler, HttpServletResponse
res,
-                                          EndpointInfo ei, String ctxUri, String baseUri)
throws IOException,
-        ServletException {
-        res.setContentType(selectedHandler.getResponseContentType(baseUri, ctxUri));
-        OutputStream out = res.getOutputStream();
-        try {
-            selectedHandler.writeResponse(baseUri, ctxUri, ei, out);
-            out.flush();
-        } catch (Exception e) {
-            LOG.warning(selectedHandler.getClass().getName()
-                + " Exception caught writing response: "
-                + e.getMessage());
-            throw new ServletException(e);
-        }
-    }
 
     protected void generateNotFound(HttpServletRequest request, HttpServletResponse res)
throws IOException {
         res.setStatus(404);

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
Fri Jun 14 17:04:16 2013
@@ -33,7 +33,6 @@ import org.apache.cxf.bus.CXFBusFactory;
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.endpoint.ServerRegistry;
 import org.apache.cxf.headers.HeaderManager;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.junit.Assert;
 import org.junit.Test;
@@ -80,7 +79,6 @@ public class BusExtensionLoadingTest ext
 
     private static void assertNotNullExtensions(Bus bus) {
         assertNotNull(bus.getExtension(WSDLManager.class));
-        assertNotNull(bus.getExtension(QueryHandlerRegistry.class));
         assertNotNull(bus.getExtension(ServerRegistry.class));
         assertNotNull(bus.getExtension(HeaderManager.class));
     }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
Fri Jun 14 17:04:16 2013
@@ -42,7 +42,7 @@ import org.apache.cxf.common.i18n.Messag
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.javascript.BasicNameManager;
-import org.apache.cxf.javascript.JavascriptQueryHandler;
+import org.apache.cxf.javascript.JavascriptGetInterceptor;
 import org.apache.cxf.javascript.NamespacePrefixAccumulator;
 import org.apache.cxf.javascript.service.ServiceJavascriptBuilder;
 import org.apache.cxf.javascript.types.SchemaJavascriptBuilder;
@@ -86,7 +86,7 @@ public class JavaToJSProcessor implement
         try {
             FileOutputStream fileOutputStream = new FileOutputStream(jsFile);
             if (null != context.get(ToolConstants.CFG_JAVASCRIPT_UTILS)) {
-                JavascriptQueryHandler.writeUtilsToResponseStream(JavaToJSProcessor.class,
fileOutputStream);
+                JavascriptGetInterceptor.writeUtilsToResponseStream(JavaToJSProcessor.class,
fileOutputStream);
             }
 
             OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fileOutputStream,
UTF8);

Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java?rev=1493158&r1=1493157&r2=1493158&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
Fri Jun 14 17:04:16 2013
@@ -34,7 +34,7 @@ import org.apache.cxf.common.i18n.Messag
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.javascript.BasicNameManager;
-import org.apache.cxf.javascript.JavascriptQueryHandler;
+import org.apache.cxf.javascript.JavascriptGetInterceptor;
 import org.apache.cxf.javascript.NamespacePrefixAccumulator;
 import org.apache.cxf.javascript.service.ServiceJavascriptBuilder;
 import org.apache.cxf.javascript.types.SchemaJavascriptBuilder;
@@ -73,7 +73,7 @@ public class WSDLToJavaScriptProcessor e
         try {
             FileOutputStream fileOutputStream = new FileOutputStream(jsFile);
             if (null != context.get(ToolConstants.CFG_JAVASCRIPT_UTILS)) {
-                JavascriptQueryHandler.writeUtilsToResponseStream(WSDLToJavaScriptProcessor.class,

+                JavascriptGetInterceptor.writeUtilsToResponseStream(WSDLToJavaScriptProcessor.class,

                                                                   fileOutputStream);
             }
             



Mime
View raw message