[Jnode-svn-commits] SF.net SVN: jnode:[4447] trunk/distr

[<ls...@us...>]

Revision: 4447
          http://jnode.svn.sourceforge.net/jnode/?rev=4447&view=rev
Author:   lsantha
Date:     2008-08-15 20:17:29 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Fixed nanohttpd to propperly serve the startup directory.

Modified Paths:
--------------
    trunk/distr/descriptors/org.jnode.apps.httpd.xml
    trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java

Modified: trunk/distr/descriptors/org.jnode.apps.httpd.xml
===================================================================
--- trunk/distr/descriptors/org.jnode.apps.httpd.xml	2008-08-15 16:13:36 UTC (rev 4446)
+++ trunk/distr/descriptors/org.jnode.apps.httpd.xml	2008-08-15 20:17:29 UTC (rev 4447)
@@ -20,7 +20,7 @@
   </runtime>
 
   <extension point="org.jnode.shell.aliases">
-    <alias name="nanohttpd" class="org.jnode.net.command.NanoHTTPDCommand"/>
+    <alias name="nanohttpd" class="fi.iki.elonen.NanoHTTPD"/>
   </extension>
 
   <extension point="org.jnode.security.permissions">

Modified: trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java
===================================================================
--- trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java	2008-08-15 16:13:36 UTC (rev 4446)
+++ trunk/distr/src/apps/fi/iki/elonen/NanoHTTPD.java	2008-08-15 20:17:29 UTC (rev 4447)
@@ -111,7 +111,7 @@
                 parms.getProperty(value) + "'");
         }
 
-        return serveFile(uri, header, new File("."), true);
+        return serveFile(uri, header, myFileDir, true);
     }
 
     /**
@@ -250,10 +250,9 @@
             ioe.printStackTrace();
             System.exit(-1);
         }
-        nh.myFileDir = new File("");
+        nh.myFileDir = new File("").getAbsoluteFile();
 
-        System.out.println("Now serving files in port " + port + " from \"" +
-            new File("").getAbsolutePath() + "\"");
+        System.out.println("Now serving files in port " + port + " from \"" + nh.myFileDir + "\"");
         System.out.println("Hit Enter to stop.\n");
 
         try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.