Changeset 67

Timestamp:

05/05/05 23:47:33 (4 years ago)

Author:

pragma

Message:

Added *working* servlet server w/regeneration and file-caching capabilities.

Files:

• trunk/dsp/ConfigParser.d (added)
• trunk/dsp/DSPGrammar.d (modified) (3 diffs)
• trunk/dsp/DSPProcessor.d (modified) (3 diffs)
• trunk/dsp/RequestConfig.d (modified) (2 diffs)
• trunk/dsp/ServletCompiler.d (modified) (5 diffs)
• trunk/dsp/ServletGenerator.d (modified) (2 diffs)
• trunk/dsp/servlet/DSPServlet.d (modified) (3 diffs)
• trunk/dsp/servlet/DSPServletProvider.d (modified) (3 diffs)
• trunk/dsp/servlet/ServletRegistry.bak (modified) (previous)
• trunk/dspconf/config.xml (modified) (1 diff)
• trunk/dspconf/dsp01.dsp (modified) (2 diffs)
• trunk/dspconf/dsp02.dsp (modified) (1 diff)
• trunk/dspconf/dsp03.dsp (added)
• trunk/dspcore.d (deleted)
• trunk/dspruntime.bat (modified) (1 diff)
• trunk/server.xml (added)
• trunk/servertest.d (modified) (1 diff)
• trunk/xml/dom/std/CAttr.d (modified) (1 diff)
• trunk/xml/dom/std/CCharacterData.d (modified) (2 diffs)
• trunk/xml/dom/std/CDocument.d (modified) (7 diffs)
• trunk/xml/dom/std/CNamedNodeMap.d (modified) (2 diffs)
• trunk/xml/dom/std/CNode.d (modified) (3 diffs)
• trunk/xml/dom/std/CNodeList.d (modified) (6 diffs)
• trunk/xml/dom/std/CText.d (modified) (2 diffs)

trunk/dsp/DSPGrammar.d

@@ -34 +34 @@
-    public static char[] escapeStr = "#";
-    public static char[] escapeEscapeStr = "##";
+    public static char[] fileExtension = "dsp";
-    public static char[] rawPreamble = "dsp";
-    public static char[] preamble = "dsp:";
@@ -40 +41 @@
-    public static char[] newline = "\n";
-
-ServletRegistry,dsp.servlet.
+
-    public static char[] servletPrefix = "__servlet_";
-    public static char[] servletDecl = "(IDSPRequest request, IDSPResponse response)";
@@ -91 +92 @@
-            `alias void function` ~ servletDecl ~ ` ServletHandle;
-            
-
-
+
+
+
+
+
+
+
+
+
+
-            }` ~ newline
+            ;
+    }
+    
+    public static char[] dependenciesSection(char[] dependenciesList,char[] modulePath){
+        return 
+            "static char[][] __dependencies = [`" ~ modulePath ~ "`," ~ dependenciesList ~ "];" ~ newline ~
+            "extern(C) export char[][] dependencies(){ return __dependencies; }" ~ newline
-            ;
-    }

trunk/dsp/DSPProcessor.d

@@ -33 +33 @@
-
-
-
+Adapter
-private import xml.XMLAttributes;
-
@@ -39 +39 @@
-private import std.string;
-
-
+Adapter
-    ServletGenerator generator;
-    TagLibrary tags;
@@ -48 +48 @@
-    }
-    
-
-
+,char[] fileExtension
+,fileExtension
-    }
-
-    void xmlProlog(XMLAttributes attribs){
-        writefln("parsed prolog");
-    }
-    

trunk/dsp/RequestConfig.d

@@ -38 +38 @@
-    char[] cacheDirectory;
-    char[] runtimeDirectory;
+    char[] options;
-    
-    public char[] toString(){
@@ -52 +53 @@
-            "cacheDirectory: " ~ cacheDirectory ~ "\n"
-            "runtimeDirectory: " ~ runtimeDirectory ~ "\n"
+            "options: " ~ options ~ "\n"
-            ;
-    }

trunk/dsp/ServletCompiler.d

@@ -61 +61 @@
-
-        parser.parse(processor, provider, stream);
-
+,cfg.ext
-    }
-    
@@ -67 +67 @@
-        char[] commandline =
-            "dmd " ~ cfg.dSourceFilename ~ 
+            " " ~ cfg.options ~
-            " -op" ~
-            " -od" ~ cfg.tempDirectory ~ 
@@ -73 +74 @@
-            " " ~ cfg.runtimeDirectory ~ "DllStub.obj" ~
-            " " ~ cfg.runtimeDirectory ~ "IDSPRequest.obj" ~
-
-
+
-            " " ~ cfg.runtimeDirectory ~ "servlet.def" ~
-            " -version=dsp" ~
@@ -85 +85 @@
-            " -op" ~
-            " -od" ~ cfg.tempDirectory ~ 
-dspruntime
+mango
-            " servlet.def" ~
-            " -version=dsp" ~
@@ -91 +91 @@
-            ;   
-    */
-
+debug 
-        
-        if(std.process.system(commandline) != 0){

trunk/dsp/ServletGenerator.d

@@ -35 +35 @@
-    char[] servletBody;
-    char[] servletName;
+    char[] servletDependencies;
-    
-    int contentMode;
@@ -147 +148 @@
-    }
-    
-
+
+
+
+
+
-        return 
-            DSPGrammar.servletHeader(servletName,modulePath) ~ 
+            DSPGrammar.dependenciesSection(servletDependencies,"/" ~ modulePath ~ "." ~ fileExtension) ~
-            DSPGrammar.servletFunction(servletName,servletCPIn,servletBody,servletCPOut)
-            ;

trunk/dsp/servlet/DSPServlet.d

@@ -38 +38 @@
-private import dsp.RequestConfig;
-
+private import mango.cache.Payload;
+private import mango.cache.QueuedCache;
+
-private import mango.servlet.Servlet;
+private import mango.servlet.ServletContext;
+
+private import mango.http.utils.Dictionary;
+
-private import mango.io.FilePath;
+private import mango.io.FileProxy;
-private import mango.io.Uri;
-private import mango.log.Logger;
-
+private import mango.format.Int;
+
-private import std.string;
-
-extern(C) alias void function(IDSPRequest request,IDSPResponse response) ServiceHandle;
+extern(C) alias char[][] function() DependencyHandle;
+
+//TODO: use SystemFinalizer to catch libraries that are still loaded at shutdown
+
+class DSPLibrary : Payload{
+    protected long timeModified;
+    protected Library lib;
+    public ServiceHandle service;
+    protected DependencyHandle dependencies;
+
+    protected void unload(){
+        debug printf("unloading library\n");
+        lib.unload();
+        lib = null;
+        service = null;
+        dependencies = null;
+        timeModified = 0;
+    }
+
+    public this(char[] path){
+        lib = new Library(path);
+        if(lib && lib.isLoaded){
+            service = cast(ServiceHandle)lib.getSymbol("service");
+        
+            if(!service){
+                unload();
+                throw new DSPException("servlet library does not have a valid service handle");
+            }
+            
+            dependencies = cast(DependencyHandle)lib.getSymbol("dependencies");
+        
+            if(!dependencies){
+                unload();
+                throw new DSPException("servlet library does not have a valid dependencies handle");
+            }
+        }
+        else{
+            if(lib){
+                unload();
+            }
+            throw new DSPException("could not load library");
+        }
+        
+        timeModified = (new FileProxy(path)).getModifiedTime();
+    }
+    
+    bit isOutOfDate(char[] basePath,FilePath path){
+        if(!lib || !lib.isLoaded) return true;
+        
+        // verify the date/time of the dependencies
+        foreach(char[] dep; dependencies()){
+            debug printf("[%.*s%.*s]\n",basePath,dep);
+            if((new FileProxy(basePath ~ dep)).getModifiedTime() > timeModified){
+                debug printf("%.*s%.*s : servlet is out of date.\n",basePath,dep);              
+                unload(); // force unload
+                return true;
+            }
+        }
+        
+        debug printf("%.*s%.*s : servlet is up to date.\n",basePath,path.toString());       
+        
+        return false;
+    }
+    
+    void destroy (){
+        printf("library: %.*s destroyed\n",lib.getPath);
+        unload();
+    }
+    
+    public char[] toString(){
+        if(lib){
+            if(lib.isLoaded){
+                return "loaded: " ~ lib.getPath;
+            }
+            else{
+                return "unloaded: " ~ lib.getPath;
+            }
+        }
+        return "[empty library]";
+    }
+}
-
-/* 
-p
+desc
-        DSPServlet: dll-per-file implementation 
-p><p
+desc><desc
-        The size of the dlls is directly related to the size of the libraries contributed to its 
-        compilation.  Presently, the libs are floating arount 100kb in size each, due to the inclusion
-        of phobos and mango.  Possibly loading those libs as dlls could reduce the size, as would recompiling
-        them for a release or reduced-capability set.
-p><p
+desc><desc
-        dll-per-file is not just for a development time practice, as it is very tunable. The QueuedCache
-        can be used to good effect to expire infrequently used libs that needn't be loaded all the time.
-p
+desc
-*/
-
-class DSPServlet : Servlet{
-    Library[char[]] libs;
-    
-    private static Logger logger;
+    protected QueuedCache cache;
-
-    static this (){
-        logger = Logger.getLogger ("dsp.servlets");
-    }   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return lib;
-    }
@@ -135 +241 @@
-            assert(dspResponse);
-            assert(context);
+            
+            dspResponse.setContentType("text/html");
-
-            // bind to the needed dll on the fly
-            
-
+
+
-            if(lib){
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else{
@@ -167 +282 @@
-        }
-    }
+    
+    debug private import mango.http.utils.Dictionary;
-
-    void init (ServletConfig config)
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }   
-}
-
-/+
-/* 
-    <p>
-        all-in-one implementation 
-    </p><p>
-        The tradeoff for one dll per application is a smaller total runtime footprint at the cost of 
-        more ram up-front and the inability to cache or unload pieces of the application.  There may
-        be situations where this mode is preferred, as it side-steps the limitations imposed by 
-        wielding so many libs at once.
-    </p><p>
-        Developers may find that all-in-one works best for deployment only, and that it may be too
-        slow to recompile changes within even modestly sized applications.
-    </p>
-    
-    TODO: needs compiler/generator support to work
-    TODO: may best rely on 'build' to get the job done
-*/
-class DSPAllInOneServlet : Servlet{
-    Library lib;
-    ServletHandle handle;
-    
-    private static Logger logger;
-
-    static this (){
-        logger = Logger.getLogger ("dsp.servlets");
-    }   
-
-    public this(){
-    }
-    
-    public ~this(){
-        if(lib && lib.isLoaded) lib.unload();
-    }
-    
-    Library getLibrary(DSPServletContext context,FilePath path){
-        //TODO: make concurrent
-        //TODO: add check for file existence
-        //TODO: add check for library date and its validity vs the source file
-        if(!lib){
-            RequestConfig cfg;
-            
-            // configuration
-            
-            cfg.pwd = context.getBasePath() ~ "\\";
-            cfg.pwd = cfg.pwd.replace("/","\\");
-            cfg.ext = path.getExtension();
-            
-            //HACK: filepath leaves prefixed '/' character on
-            cfg.name = path.getName()[1..$];
-            
-            cfg.modulePath = path.getPath();
-            cfg.requestModule = cfg.modulePath ~ cfg.name;
-            cfg.dspSourceFilename = cfg.pwd ~ cfg.name ~ "." ~ cfg.ext;
-
-            cfg.tempDirectory = cfg.pwd ~ context.getConfiguration.get("temp-directory");
-            cfg.cacheDirectory = cfg.pwd ~ context.getConfiguration.get("cache-directory");
-
-            cfg.dSourceFilename = cfg.tempDirectory ~ cfg.name ~ ".d";
-            cfg.destServletFilename = cfg.cacheDirectory ~ cfg.name ~ ".dll";
-
-            cfg.runtimeDirectory = context.getConfiguration.get("runtime-directory");
-
-            // debug
-            printf("%.*s\n",cfg.toString());
-
-            // build the servlet library
-            ServletCompiler compiler = new ServletCompiler();
-            compiler.CompileServlet(cfg);
-
-            // keep the library for later
-            lib = new Library(cfg.destServletFilename);
-            libs[path.toString()] = lib;
-        }
-        return lib;
-    }
-    
-    void service (IServletRequest request, IServletResponse response){
-        FilePath path = new FilePath(request.getPathInfo);
-        
-        if(path.getExtension == "dsp"){
-            IDSPRequest dspRequest = cast(IDSPRequest)request;
-            IDSPResponse dspResponse = cast(IDSPResponse)response;
-            DSPServletContext context = cast(DSPServletContext)request.getContext();
-
-            assert(dspRequest);
-            assert(dspResponse);
-            assert(context);
-
-            // bind to the needed dll on the fly
-            
-            Library lib = getLibrary(context,path);
-            if(lib){
-                ServiceHandle handle = cast(ServiceHandle)lib.getSymbol("service");
-
-                // run the service handle
-                if(handle){
-                    handle(dspRequest,dspResponse);
-                }
-                else{
-                    throw new DSPException("servlet library does not have a valid service handle");
-                }
-
-                dspResponse.getWriter.put("<h2>This is a test for DSP servlets</h2>");
-
-                if(dspResponse.isExceptionSet){
-                    throw new DSPException("servlet: " ~ dspResponse.getException());
-                }
-            }
-            else{
-                throw new DSPException("could not load library");
-            }
-        }
-        else{
-            //TODO: use configuration and handling rules 
-            //TODO: provide a directory listing if the file doesn't exist
-            logger.info ("request for file: " ~ request.getUri.getPath ~ " (" ~ request.getPathInfo ~ ")");
-            response.copyFile (request.getContext, request.getPathInfo);        
-        }
-    }
-
-    void init (ServletConfig config)
-    {
-        //TODO: is this needed?
-    }   
-}
-+/

trunk/dsp/servlet/DSPServletProvider.d

@@ -26 +26 @@
-module dsp.servlet.DSPServletProvider;
-
+private import xml.ConduitStream;
+
+private import dsp.ConfigParser;
+
-private import dsp.servlet.DSPServlet;
+private import dsp.servlet.DSPServletContext;
-private import dsp.servlet.DSPRequest;
-private import dsp.servlet.DSPResponse;
-
-private import mango.servlet.ServletProvider;
+private import mango.servlet.ServletContext;
-
-private import mango.http.server.HttpRequest;
@@ -37 +43 @@
-private import mango.http.server.model.IProviderBridge;
-
+private import mango.http.utils.Dictionary;
+
+private import mango.io.FileConduit;
+
-class DSPServletProvider : ServletProvider{
+    protected MutableDictionary configuration;
+
+    public this (char[] configPath,uint urls = 2048){
+        super(urls);
+        
+        FileConduit fc = new FileConduit(configPath);
+        
+        // load configuration
+        if(fc){
+            ConduitStream cs = new ConduitStream(fc.getPath.getName,fc);
+            ConfigParser configParser = new ConfigParser();
+            configuration = configParser.parse(cs);
+        }
+    }
+    
+    public Dictionary getConfiguration(){
+        return configuration;
+    }
-
-    override HttpRequest createRequest(IProviderBridge bridge){
-printf("
+debug printf("DSPServletProvider: 
-        return new DSPRequest(bridge);
-    }
-
-
-
-
+
+
-        return new DSPResponse(bridge);
-    }
@@ -53 +80 @@
-    {
-        return "DSPServlet";
-
+
+
-}

trunk/dspconf/config.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-<config>
-    <temp-directory value="_temp\"/>
-    <cache-directory value="_cache\"/>
+    <cache-size value="2"/>
-    <runtime-directory value="c:\dev\dsp\trunk\runtime/"/>
-dmdopts></dmdopts
+build-options value=""/
-</config>

trunk/dspconf/dsp01.dsp

@@ -2 +2 @@
-<?dsp:in assert(response); ?>
-<?dsp:out assert(response); ?>
-<?dsp:xml version="1.0" ?>
-<?dsp
-    char[] expr(){
@@ -20 +19 @@
-        else response.getWriter.put("hello world");
-    </dsp:code>
+    <p>
+        Changed Again IIIIIIII
+    </p>
-</body>
-</html>

trunk/dspconf/dsp02.dsp

@@ -1 +1 @@
-<?xml version="1.0" ?>
-<?dsp
-
+
-?>
-<html/>

trunk/dspruntime.bat

@@ -1 @@
-dmd -c dsp\servlet\ServletRegistry.d   -odruntime
-dmd -c dsp\servlet\IDSPRequest.d   -odruntime
-dmd -c dsp\servlet\IDSPResponse.d  -odruntime

trunk/servertest.d

@@ -95 +95 @@
-
-        // construct a servlet-provider
-
+"server.xml"
-
-        // create a context for admin servlets

trunk/xml/dom/std/CAttr.d

@@ -24 +24 @@
-    protected DOMTypeInfo _DOMTypeInfo;
-
-
+
+
-        _name = name;
+        _value = value;
-    }
-
-in DOMString namespaceURI, in DOMString qualifiedNam
+CDocument document,in DOMString namespaceURI, in DOMString qualifiedName,DOMString valu
-        _name = qualifiedName;
-        super.setQName(namespaceURI,qualifiedName);
+        _value = value;
-    }
+    
+    public void ownerElement(Element value){ _ownerElement = value; }
-
-

trunk/xml/dom/std/CCharacterData.d

@@ -13 +13 @@
-abstract class CCharacterData : CNode, CharacterData{
-    protected DOMString _data;
+    
+    protected this(CDocument document,DOMString data){
+        super(document);
+        _data = data;
+    }
-
-    /+ CharacterData Overloads +/
@@ -19 +24 @@
-    void            data(DOMString value){ _data = value; }
-
-
+            
-
-
-
-
-
-
+
+
+
+
+
+
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/xml/dom/std/CDocument.d

@@ -72 +72 @@
-        
-    DocumentFragment        createDocumentFragment(){
-
+this
-    }
-    
-    Text                    createTextNode(in DOMString data){
-
+this,data
-    }
-    
-    Comment                 createComment(in DOMString data){
-
+this,
-    }
-    
-    CDATASection            createCDATASection(in DOMString data){
-
+this,
-    } 
-    
@@ -91 +91 @@
-        //according to the XML version in use specified in the Document.xmlVersion attribute. 
-    
-
+his,t
-    }
-    
@@ -97 +97 @@
-        //TODO: NVALID_CHARACTER_ERR: Raised if the specified name is not an XML name 
-        //according to the XML version in use specified in the
-
+this,
-    }
-    
@@ -105 +105 @@
-        //according to the XML version in use specified in the
-    
-
+this,
-        //TODO: find corresponding Entity and copy child list to 'value'.
-        return value;
@@ -111 +111 @@
-        
-    NodeList                getElementsByTagName(in DOMString tagname){
-
-
-
+
+
+
+
+
+
+
+
-        return list;
-    }
@@ -127 +132 @@
-        // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS
-        
-
+this,
-    }
-
@@ -134 +139 @@
-        // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS
-        
-
+this,
-    }
-

trunk/xml/dom/std/CNamedNodeMap.d

@@ -15 +15 @@
-    Node[DOMString] map;
-
+    /+ NamedNodeMap Overrides +/
-    public Node getNamedItem(in DOMString name){
-        return map[name];
@@ -58 +59 @@
-};
-
-
+
+
+
+
+
+