xitiomet / placebohttp / changeset / c7dfd452b26c

Up to file-list src/PlaceboBase.java:

@@ -10,7 +10,8 @@ public class PlaceboBase
+    {
         System.err.println("Openstatic.org HTTP Server");
         System.err.println("");
-        System.err.println("  --debug                        Turn debugging output on.");
+        System.err.println("  --debug                        Turn debugging output on");
         System.err.println("  --showdata                     Show response data (debug must be on)");
         System.err.println("  --root [path]                  Set webroot");
         System.err.println("  --port [port]                  Specify HTTP listening port");
         System.err.println("  --help                         display this menu");
@@ -22,8 +23,9 @@ public class PlaceboBase
     public static void main(String[] args)
+    {
-        int http_port = 80;
+        int http_port = 8090;
         boolean debug = false;
         boolean show_data = false;
         String web_root = "placebohttp.jar/www";
         boolean start_engine = false;
         Hashtable<String, String> plugins = new Hashtable<String, String>();
@@ -71,6 +73,11 @@ public class PlaceboBase
                 System.err.println("----------------------------------");
                 debug = true;
+            }
             if (arg.equals("--showdata"))
+            {
                 show_data = true;
+            }
             if (arg.equals("--headless"))
+            {
@@ -86,6 +93,7 @@ public class PlaceboBase
             x.setPort(http_port);
             x.setWebRoot(web_root);
             x.setDebug(debug);
             x.setShowData(show_data);
             x.start();
             x.addPlugins(plugins);
         } else {
@@ -93,6 +101,7 @@ public class PlaceboBase
             cp.setPort(http_port);
             cp.setWebRoot(web_root);
             cp.setDebug(debug);
             cp.setShowData(show_data);
             cp.setPlugins(plugins);
+        }
+    }

Up to file-list src/org/openstatic/http/HttpRequest.java:

@@ -123,9 +123,22 @@ public class HttpRequest
         try
+        {
             int inputByte;
             if (this.myServer.isShowData())
+            {
                 this.myServer.getDebugStream().println("-------------Outbound Data-------------");
+            }
             while ( (inputByte = data.read()) > -1 )
+            {
                 this.socket_output_stream.write(inputByte);
                 if (this.myServer.isShowData())
+                {
                     this.myServer.getDebugStream().print((char) inputByte);
+                }
+            }
             if (this.myServer.isShowData())
+            {
                 this.myServer.getDebugStream().println("");
                 this.myServer.getDebugStream().println("---------------------------------------");
+            }
             data.close();
             this.socket_output_stream.flush();

Up to file-list src/org/openstatic/http/PlaceboHttpServer.java:

@@ -13,6 +13,7 @@ public class PlaceboHttpServer extends T
     private String myName;
     private PrintStream debug_stream;
     private boolean debug_mode;
     private boolean show_data;
     private boolean keep_running;
     private Hashtable<String, PlaceboSession> sessions;
     private LinkedBlockingQueue<PlaceboSession> session_queue;
@@ -166,11 +167,21 @@ public class PlaceboHttpServer extends T
+    {
         this.debug_mode = value;
+    }
     public void setShowData(boolean value)
+    {
         this.show_data = value;
+    }
     public boolean isDebug()
+    {
         return this.debug_mode;
+    }
     public boolean isShowData()
+    {
         return this.show_data;
+    }
     public void setDebugStream(OutputStream value)
+    {

Up to file-list src/org/openstatic/placebo/ControlPanel.java:

@@ -39,6 +39,7 @@ public class ControlPanel extends JFrame
     private JTextField url_path;
     private JTextField url_class_name;
     private JCheckBox debug_field;
     private JCheckBox show_data_field;
     private DefaultListModel apps;
     private DefaultListModel sessions;
     private JTextAreaOutputStream log_output;
@@ -65,6 +66,11 @@ public class ControlPanel extends JFrame
+    {
         this.debug_field.setSelected(value);
+    }
     public void setShowData(boolean value)
+    {
         this.show_data_field.setSelected(value);
+    }
     public void setWebRoot(String value)
+    {
@@ -119,6 +125,9 @@ public class ControlPanel extends JFrame
         JLabel debug_label = new JLabel("Debug:", JLabel.TRAILING);
         debug_field = new JCheckBox();
         JLabel show_data_label = new JLabel("Show Data:", JLabel.TRAILING);
         show_data_field = new JCheckBox();
         start_btn = new JButton("Start Server");
         start_btn.setActionCommand("start");
         start_btn.addActionListener(this);
@@ -134,6 +143,8 @@ public class ControlPanel extends JFrame
         pane.add(root_field);
         pane.add(debug_label);
         pane.add(debug_field);
         pane.add(show_data_label);
         pane.add(show_data_field);
         main_pane.add(pane, BorderLayout.PAGE_START);
         JPanel button_pane = new JPanel(new GridLayout(0,2,6,6));
@@ -243,6 +254,7 @@ public class ControlPanel extends JFrame
             core.setPort(Integer.valueOf(port_field.getText()).intValue());
             core.setWebRoot(root_field.getText());
             core.setDebug(debug_field.isSelected());
             core.setShowData(show_data_field.isSelected());
             core.setDebugStream(log_output);
             core.start();

Up to file-list src/org/openstatic/placebo/CoreServer.java:

@@ -23,6 +23,7 @@ public class CoreServer extends Thread
     private int http_port;
     private String web_root;
     private boolean debug;
     private boolean show_data;
     private OutputStream debug_out;
     private boolean keep_running;
     private PlaceboHttpServer server;
@@ -35,6 +36,7 @@ public class CoreServer extends Thread
         this.debug_out = System.err;
         this.keep_running = true;
         this.debug = false;
         this.show_data = false;
         this.server = new PlaceboHttpServer(http_port);
         this.plugins = new Hashtable<String, PlaceboPlugin>();
+    }
@@ -124,6 +126,11 @@ public class CoreServer extends Thread
         this.debug = value;
+    }
     public void setShowData(boolean value)
+    {
         this.show_data = value;
+    }
     public void setWebRoot(String value)
+    {
         this.web_root = value;
@@ -150,6 +157,7 @@ public class CoreServer extends Thread
+    {
         // Create new server object
         server.setDebug(debug);
         server.setShowData(show_data);
         server.setDebugStream(debug_out);
         server.setPort(this.http_port);
         // Launch thread.

commit 34:	c7dfd452b26c
parent 33:	76efabe6b8ff
branch:	default

xitiomet / placebohttp (http://openstatic.org/)