Changeset 6100 for trunk

Timestamp:

01/04/12 18:30:23 (5 months ago)

Author:

mtld

Message:

make stub generation available to external consumers via ServletContext?

Location:

trunk/pustefix-webservices/pustefix-webservices-core/src/main/java/org/pustefixframework/webservices

Files:

• ServiceRuntime.java (modified) (9 diffs)
• ServiceStubProvider.java (added)

trunk/pustefix-webservices/pustefix-webservices-core/src/main/java/org/pustefixframework/webservices/ServiceRuntime.java

@@ -21 +21 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39 +42 @@
 import org.pustefixframework.webservices.utils.RecordingResponseWrapper;
 import org.springframework.aop.framework.Advised;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.web.context.ServletContextAware;
 
 import de.schlund.pfixcore.auth.AuthConstraint;
@@ -48 +53 @@
  * @author mleidig@schlund.de
  */
-public class ServiceRuntime {
+public class ServiceRuntime implements ServletContextAware, DisposableBean {
         
     private final static Logger LOG=Logger.getLogger(ServiceRuntime.class);
@@ -69 +74 @@
     private ServerContextImpl serverContext;
     private ContextImpl context;
+    
+    private ServiceStubProvider serviceStubProvider;
+    private ServletContext servletContext;
     
     public ServiceRuntime() {
@@ -77 +85 @@
     }   
         
+    public void setServletContext(ServletContext servletContext) {
+        this.servletContext = servletContext;
+        //make ServiceStubProvider available to external consumers via ServletContext
+        this.serviceStubProvider = new ServiceStubProvider(this);
+        servletContext.setAttribute(ServiceStubProvider.class.getName(), serviceStubProvider);
+    }
+    
+    public void destroy() throws Exception {
+        servletContext.removeAttribute(ServiceStubProvider.class.getName());
+    }
+    
     public ServiceDescriptorCache getServiceDescriptorCache() {
         return srvDescCache;
@@ -294 +313 @@
     public void getStub(HttpServletRequest req,HttpServletResponse res) throws ServiceException, IOException {
         
-        long t1=System.currentTimeMillis();
-        
         String nameParam=req.getParameter("name");
         if(nameParam==null) throw new ServiceException("Missing parameter: name");
@@ -324 +341 @@
         }
         
+        FileCacheData data = generateStub(services, serviceType, req.getContextPath());
+        
+        String etag=req.getHeader("If-None-Match");
+        if(etag!=null && etag.equals(data.getMD5())) {
+            res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+        } else {
+            res.setContentType("text/plain");    
+            res.setContentLength(data.getBytes().length);
+            res.setHeader("ETag",data.getMD5());
+            res.getOutputStream().write(data.getBytes());
+            res.getOutputStream().close();
+        }
+    }
+    
+    private FileCacheData generateStub(ServiceConfig[] services, String serviceType, String contextPath) throws ServiceException, IOException {
+        
         StringBuilder sb=new StringBuilder();
-        for(String serviceName:serviceNames) {
-            sb.append(serviceName);
+        for(ServiceConfig service:services) {
+            sb.append(service.getName());
             sb.append(" ");
         }
@@ -340 +373 @@
                 ByteArrayOutputStream bout=new ByteArrayOutputStream();
                 for(int i=0;i<services.length;i++) {
-                    String requestPath = req.getContextPath() + services[i].getGlobalServiceConfig().getRequestPath();
+                    String requestPath = contextPath + services[i].getGlobalServiceConfig().getRequestPath();
                     stubGen.generateStub(services[i], requestPath, bout);
                     if(i<services.length-1) bout.write("\n\n".getBytes());
@@ -353 +386 @@
         }
         
-        long t2=System.currentTimeMillis();
-        if(LOG.isDebugEnabled()) LOG.debug("Retrieved stub for '"+cacheKey+"' (Time: "+(t2-t1)+"ms)");
-        
-        String etag=req.getHeader("If-None-Match");
-        if(etag!=null && etag.equals(data.getMD5())) {
-            res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-        } else {
-            res.setContentType("text/plain");    
-            res.setContentLength(data.getBytes().length);
-            res.setHeader("ETag",data.getMD5());
-            res.getOutputStream().write(data.getBytes());
-            res.getOutputStream().close();
-        }
+        return data;
+    }
+    
+    public void generateStub(String[] serviceNames, String serviceType, OutputStream out) throws ServiceException, IOException {
+        
+        serviceType = serviceType.toUpperCase();
+        
+        String contextPath;
+        //try to get context path from ServletContext, which is only directly supported since Servlet API 2.5
+        //this workaround uses reflection utilizing that Tomcat since 5.5.16 already implements this method internally 
+        try {
+            Method meth = servletContext.getClass().getMethod("getContextPath");
+            contextPath = (String)meth.invoke(servletContext);
+        } catch(Exception x) {
+            throw new RuntimeException("Your servlet container doesn't support getting the context path from the ServletContext. " +
+                    "You should upgrade to a version supporting Servlet API 2.5 or newer - or at least a container internally " +
+                    "implementing ServletContext.getContextPath().");
+        }
+        
+        ServiceConfig[] services=new ServiceConfig[serviceNames.length];
+        for(int i=0;i<serviceNames.length;i++) {
+            ServiceConfig service=appServiceRegistry.getService(serviceNames[i]);
+            if(service==null) throw new ServiceException("Service not found: "+serviceNames[i]);
+            services[i]=service;
+        }
+        
+        FileCacheData data = generateStub(services, serviceType, contextPath);
+        out.write(data.getBytes());
     }