<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>bin/osp_ctl</filename>
    </added>
    <added>
      <filename>ebin/osp.app</filename>
    </added>
    <added>
      <filename>include/conf.hrl</filename>
    </added>
    <added>
      <filename>include/httpd.conf</filename>
    </added>
    <added>
      <filename>log/.gitignore</filename>
    </added>
    <added>
      <filename>src/Makefile</filename>
    </added>
    <added>
      <filename>src/osp.erl</filename>
    </added>
    <added>
      <filename>src/osp_admin.erl</filename>
    </added>
    <added>
      <filename>src/osp_app.erl</filename>
    </added>
    <added>
      <filename>src/osp_broker.erl</filename>
    </added>
    <added>
      <filename>src/osp_file.erl</filename>
    </added>
    <added>
      <filename>src/osp_mnesia.erl</filename>
    </added>
    <added>
      <filename>src/osp_proto.erl</filename>
    </added>
    <added>
      <filename>src/osp_socket.erl</filename>
    </added>
    <added>
      <filename>src/osp_sup.erl</filename>
    </added>
    <added>
      <filename>src/osp_web.erl</filename>
    </added>
    <added>
      <filename>www/index.html</filename>
    </added>
    <added>
      <filename>www/jquery.js</filename>
    </added>
    <added>
      <filename>www/style.css</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,7 +1,7 @@
 Open Server Platform Admin Guide
-Version 0.3
-5/2/09
-Coyright 2008 Jacob Torrey
+Version 0.4
+5/4/09
+Coyright 2009 Jacob Torrey
 			
 Introduction
 	Welcome to OSP! Hopefully you'll find it as exciting as we do! Let's 
@@ -11,15 +11,11 @@ Requirements
 	Before you can get started, you'll need a few dependancies installed:
 	       -&gt; erlang (HiPE or regular (HiPE reccomended)
 	       -&gt; The XML::Simple perl module
-	
+	       -&gt; Netcat
+
 Starting OSP
 	Once you have the OSP environment downloaded, edit the osp.conf and run:
-	     	      	./setup-osp.sh
-
-	This will setup the Mnesia redundant data store on the node (run this once)
-
-	Now you can run the following command to start the node:
-	 		./start-osp.sh
+	 		./bin/osp_ctl start
 	 							
 	This will start an OSP instance on the local machine prepared to server
 code to remote nodes and running the Mnesia shared state database. It will
@@ -27,6 +23,11 @@ also start the administrator console listening on port 9876. Once this script
 is complete, telnet to 127.0.0.1 on port 9876. You are now in the admin 
 console for OSP, from whence you can see stats about the current system, add
 other nodes to the OSP cluster, and manage running applications.
+      In addition to the telnet interface, there is a CLI script in ./bin that
+provides a more scriptable interface to the OSP cluster.
+      As of version 0.4, there is also a web management console which can be
+found at http://localhost:9877 that provides a more user friendly management
+interface.
 
 Adding other nodes
 	To add other diskless nodes (nodes without a copy of OSP, just copy </diff>
      <filename>OSP-ADMIN</filename>
    </modified>
    <modified>
      <diff>@@ -18,7 +18,7 @@ my $cookie = &lt;STDIN&gt;; chomp($cookie);
 open(FP, &quot;&gt;$output&quot;);
 print FP &quot;#!/bin/bash\n\nNODENAME=\&quot;$name\&quot;\nBOOTSERVER=\&quot;$server\&quot;\nFQDN=$fqdn # Use FQDN for node name: 0 for false, 1 for true\nMASTERNODE=\&quot;$master\&quot;\n&quot;;
     print FP &quot;COOKIE=\&quot;$cookie\&quot;\nNAME=\&quot;-sname\&quot;\nif [ \$FQDN -eq 1 ]\nthen\n\tNAME=\&quot;-name\&quot;\nfi\n&quot;;
-print FP &quot;LOADER=\&quot;-loader inet -hosts\&quot;\nif [ -a \&quot;osp.beam\&quot; ]\nthen\n\tLOADER=\&quot;\&quot;\n\tBOOTSERVER=\&quot;\&quot;\nfi\nepmd -daemon\nerl -noshell -detached \$NAME \$NODENAME -id \$NODENAME \$LOADER \$BOOTSERVER -setcookie \$COOKIE -s osp join \$MASTERNODE\n&quot;;
+print FP &quot;LOADER=\&quot;-loader inet -hosts\&quot;\nif [ -a \&quot;osp.beam\&quot; ]\nthen\n\tLOADER=\&quot;\&quot;\n\tBOOTSERVER=\&quot;\&quot;\nfi\nepmd -daemon\nerl -noshell -detached \$NAME \$NODENAME -id \$NODENAME \$LOADER \$BOOTSERVER -pa ./ebin -setcookie \$COOKIE -s osp join \$MASTERNODE\n&quot;;
 close(FP);
 `chmod +x $output`;
 print &quot;\nRun ./join.sh to join an existing OSP cluster\n&quot;;</diff>
      <filename>gen-join.pl</filename>
    </modified>
    <modified>
      <diff>@@ -20,6 +20,10 @@
 proto() -&gt;
     PROTO.
 
+%% @doc Opens a file for reading or writing
+fopen(Filename, Flags) -&gt;
+    osp_file:fopen(MOD, Filename, Flags).
+
 %% @doc Stores a value in the mnesia database
 store(Key, Val) -&gt;
     osp_mnesia:store(MOD_table, Key, Val).</diff>
      <filename>header.erl</filename>
    </modified>
    <modified>
      <diff>@@ -22,4 +22,4 @@ then
 fi
 
 epmd -daemon
-erl -noshell -detached $NAME $NODENAME -id $NODENAME $LOADER $BOOTSERVER -setcookie $COOKIE -s osp join $MASTERNODE
+erl -noshell -detached $NAME $NODENAME -id $NODENAME $LOADER $BOOTSERVER -pa ./ebin -setcookie $COOKIE -s osp join $MASTERNODE</diff>
      <filename>join.sh.sample</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,5 @@
 #!/bin/bash
 
 echo &quot;Setting up OSP&quot;
-erl -smp auto -detached -run osp setup
+epmd -daemon
+erl -smp auto -detached -pa ./ebin -run osp setup</diff>
      <filename>setup-osp.sh</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,10 @@
 #!/bin/bash
 
-echo &quot;Starting OSP&quot;
+echo &quot;Starting Open Server Platform&quot;
+echo &quot;v0.4 (C) 2009 Jacob Torrey&quot;
+echo &quot;http://www.openserverplatform.com&quot;
 epmd -daemon
-erl -smp auto -run osp -detached
-echo &quot;OSP started, telnet to the localhost management port (default 9876) to continue&quot;
+erl -smp auto -detached -boot osp_rel-0.4 -pa ./ebin
+sleep 10
+echo &quot;Open Server Platform started&quot;
+echo &quot;Telnet to localhost port 9876 or go to http://localhost:9877 to continue&quot;</diff>
      <filename>start-osp.sh</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>osp.conf</filename>
    </removed>
    <removed>
      <filename>osp.erl</filename>
    </removed>
    <removed>
      <filename>osp_admin.erl</filename>
    </removed>
    <removed>
      <filename>osp_app.erl</filename>
    </removed>
    <removed>
      <filename>osp_broker.erl</filename>
    </removed>
    <removed>
      <filename>osp_mnesia.erl</filename>
    </removed>
    <removed>
      <filename>osp_proto.erl</filename>
    </removed>
    <removed>
      <filename>osp_socket.erl</filename>
    </removed>
    <removed>
      <filename>osp_sup.erl</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>c32487993026bdb7c73268e8a4ed02382f924c51</id>
    </parent>
    <parent>
      <id>d38893953165c969087e9d43d6adf64f930da10f</id>
    </parent>
  </parents>
  <author>
    <name>Jacob Torrey</name>
    <email>torreyji@clarkson.edu</email>
  </author>
  <url>http://github.com/ranok/open-server-platform/commit/3372897010380dfbbc903a19dd698a0bfc7275fa</url>
  <id>3372897010380dfbbc903a19dd698a0bfc7275fa</id>
  <committed-date>2009-05-05T13:52:43-07:00</committed-date>
  <authored-date>2009-05-05T13:52:43-07:00</authored-date>
  <message>Merge branch 'otp'

Conflicts:

	Makefile
	OSP-ADMIN
	src/osp_admin.erl
	start-osp.sh</message>
  <tree>0f4eecc4fa98fda55c9d589092502238d6dbd0bb</tree>
  <committer>
    <name>Jacob Torrey</name>
    <email>torreyji@clarkson.edu</email>
  </committer>
</commit>
