[freenet-cvs] r8124 - in trunk/freenet/src/freenet: node pluginmanager

[cybe...@freenetproject.org]

Author: cyberdo
Date: 2006-02-23 00:04:50 +0000 (Thu, 23 Feb 2006)
New Revision: 8124

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
   trunk/freenet/src/freenet/pluginmanager/PluginManager.java
   trunk/freenet/src/freenet/pluginmanager/PproxyToadlet.java
Log:
473:
Fixed a nicer error message when trying to enter a page of a plugin that's not 
loaded.
Fixed the asterix-postfix (Try it by running: "PLUGLOAD:plugins.TestGallery*").


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-02-22 23:34:16 UTC (rev 
8123)
+++ trunk/freenet/src/freenet/node/Version.java 2006-02-23 00:04:50 UTC (rev 
8124)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 472;
+       private static final int buildNumber = 473;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 403;

Modified: trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java    
2006-02-22 23:34:16 UTC (rev 8123)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java    
2006-02-23 00:04:50 UTC (rev 8124)
@@ -5,6 +5,8 @@
        private String mimeType;
        private String desc;
        private String reply;
+       
+
        public PluginHTTPException () {
                this(404, "text/html", "FAIL", "Page not found");
        }
@@ -14,6 +16,20 @@
                this.desc = desc;
                this.reply = reply;
        }
+       
+       public void setCode(int code) {
+               // FIXME: check!
+               this.code = code;
+       }
+       public void setDesc(String desc) {
+               this.desc = desc;
+       }
+       public void setMimeType(String mimeType) {
+               this.mimeType = mimeType;
+       }
+       public void setReply(String reply) {
+               this.reply = reply;
+       }
        public int getCode() {
                return code;
        }

Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-02-22 
23:34:16 UTC (rev 8123)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-02-23 
00:04:50 UTC (rev 8124)
@@ -115,7 +115,9 @@
                        return ((FredPluginHTTP)handler).handleHTTPGet(path);

                // no plugin found
-               throw new PluginHTTPException();
+               PluginHTTPException t = new PluginHTTPException();
+               t.setReply("Plugin not found: " + plugin);
+               throw t;
        }

        public void killPlugin(String name) {
@@ -146,10 +148,10 @@
         Class cls = null;
         if (filename.endsWith("*")) {
                filename = filename.substring(0,filename.length()-1) + 
-               "<http://downloads.freenetproject.org/alpha/plugins/"; + 
+               "@http://downloads.freenetproject.org/alpha/plugins/"; + 
                filename.substring(filename.lastIndexOf(".")+1, 
filename.length()-1) +
                ".jar.url";
-               System.out.println(filename);
+               //System.out.println(filename);
         }

         if ((filename.indexOf("@") >= 0)) {

Modified: trunk/freenet/src/freenet/pluginmanager/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PproxyToadlet.java  2006-02-22 
23:34:16 UTC (rev 8123)
+++ trunk/freenet/src/freenet/pluginmanager/PproxyToadlet.java  2006-02-23 
00:04:50 UTC (rev 8124)
@@ -85,17 +85,18 @@
                                //pm.handleHTTPGet(plugin, data);

                                //writeReply(ctx, 200, "text/html", "OK", 
mkPage("plugin", pm.handleHTTPGet(plugin, data)));
-                               try {
-                                       writeReply(ctx, 200, "text/html", "OK", 
pm.handleHTTPGet(plugin, data));
-                               } catch (PluginHTTPException ex) {
-                                       writeReply(ctx, ex.getCode(), 
ex.getMimeType(), ex.getDesc(), ex.getMessage());
-                               }
+                               writeReply(ctx, 200, "text/html", "OK", 
pm.handleHTTPGet(plugin, data));
+       
+

                        }

                        //FetchResult result = fetch(key);
                        //writeReply(ctx, 200, result.getMimeType(), "OK", 
result.asBucket());

+               } catch (PluginHTTPException ex) {
+                       // TODO: make it into html
+                       writeReply(ctx, ex.getCode(), ex.getMimeType(), 
ex.getDesc(), ex.getReply());
                } catch (Throwable t) {
                        Logger.error(this, "Caught "+t, t);
                        String msg = "<html><head><title>Internal 
Error</title></head><body><h1>Internal Error: please report</h1><pre>";