Changeset 68

Timestamp:

05/06/05 17:25:54 (4 years ago)

Author:

pragma

Message:

Small change to workspace: no more servertest.d. Use server.d instead.

Files:

• trunk/dsp/ServletCompiler.d (modified) (1 diff)
• trunk/dspconf/config.xml (modified) (1 diff)
• trunk/server.d (modified) (2 diffs)
• trunk/server.xml (modified) (1 diff)

trunk/dsp/ServletCompiler.d

@@ -85 +85 @@
-            " -op" ~
-            " -od" ~ cfg.tempDirectory ~ 
+            " -of" ~ cfg.destServletFilename ~
-            " mango.lib" ~
-            " servlet.def" ~

trunk/dspconf/config.xml

@@ -4 +4 @@
-    <cache-size value="2"/>
-    <runtime-directory value="c:\dev\dsp\trunk\runtime/"/>
-
+-inline -release
-</config>

trunk/server.d

@@ -1 +1 @@
-/*
-
-
+
+
+
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
@@ -24 +25 @@
-*/
-
+pragma(lib,"ws2_32.lib");
+
+// for a variety of servlet IO
+import  mango.io.Uri,
+        mango.io.Socket,
+        mango.io.FileBucket,
+        mango.io.DisplayWriter,
+        mango.io.PickleRegistry;
+
+        // for numeric conversion
+import  mango.format.Int;
+
+        // for threads
+import  mango.base.System;
+
+        //for logging
+import  mango.log.Admin,
+        mango.log.Logger,
+        mango.log.Configurator;
+
+        // for testing the http server
+import  mango.http.server.HttpServer;
+
+        // for testing the http client
+import  mango.http.client.HttpClient;
+
+        // for testing the servlet-engine
+import  mango.servlet.Servlet,
+        mango.servlet.ServletContext,
+        mango.servlet.ServletProvider;
+
+        // for working with cache entries
+import  mango.cache.Payload,
+        mango.cache.VirtualCache;
+
+        // setup a logger for module scope
+private Logger mainLogger;
+
+import dsp.servlet.DSPServlet;
+import dsp.servlet.DSPServletProvider;
+import dsp.servlet.DSPServletContext;
+
+import mango.format.Int;
+
+void testServletEngine ()
+{       
+        mainLogger.info ("registering servlets");
+
+        // construct a servlet-provider
+        DSPServletProvider sp = new DSPServletProvider("server.xml");
+
+        // create a context for admin servlets
+        sp.addContext (new AdminContext (sp, "/admin"));
+
+        // create a context for example dsp servlets
+        sp.addContext (new DSPServletContext (sp,"/foo/bar","c:/dev/dsp/trunk/dspconf")); 
+    
+        // fire up a server
+        mainLogger.info ("starting server");
-
-
+        /*** bind to port and an address ***/
+        
+        uint port = 0;
+        char[] serverPort = sp.getConfiguration.get("server-port");
+        if(serverPort) port = Int.parse(serverPort);
+        if(port == 0) port = 80;
+        
+        char[] serverAddress = sp.getConfiguration.get("server-address");
+        if(!serverAddress) serverAddress = "127.0.0.1";
+        
+        InternetAddress addr = new InternetAddress (serverAddress,port);
-
+        // create a (1 thread) server using the IProvider to service requests
+        uint threads = 0;
+        char[] serverThreads = sp.getConfiguration.get("server-threads");
+        if(serverThreads) threads = Int.parse(serverThreads);
+        if(threads == 0) threads = 1;
+        
+        HttpServer server = new HttpServer (sp, addr, threads, mainLogger);
+        
+        // start listening for requests (but this thread does not listen)
+        server.start ();
-
+        // send this thread to sleep for ever ...
+        System.sleep ();
+
+        // should never get here
+        mainLogger.info ("halting server");
+}
+
+int main ()
+{   
+        BasicConfigurator.configure ();
+        mainLogger = Logger.getLogger ("dsp.servlets");
+        mainLogger.setLevel (mainLogger.Level.Info);
+
+        try {
+            testServletEngine();
+
+            mainLogger.info ("Done");
+            } catch (Exception x)
+                    {
+                    mainLogger.error (x.msg);
+                    }
+        return 0;
+}

trunk/server.xml

@@ -6 +6 @@
-    <server-threads value="5"/>
-    <server-port value="8080"/>
-127.0.0.1
+localhost
-</config>