From f96e20aef7cce6d47535ab63c36452f6c9e1c444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Wed, 30 Jan 2013 22:13:31 +0100
Subject: Rename example 'static' to 'static_world' to avoid confusion

---
 examples/README.md                             |   4 +-
 examples/static/README.md                      |  49 -------------------------
 examples/static/priv/small.mp4                 | Bin 383631 -> 0 bytes
 examples/static/priv/small.ogv                 | Bin 872453 -> 0 bytes
 examples/static/priv/test.txt                  |   1 -
 examples/static/priv/video.html                |  11 ------
 examples/static/rebar.config                   |   6 ---
 examples/static/src/static.app.src             |  15 --------
 examples/static/src/static.erl                 |  14 -------
 examples/static/src/static_app.erl             |  28 --------------
 examples/static/src/static_sup.erl             |  23 ------------
 examples/static/start.sh                       |   4 --
 examples/static_world/README.md                |  49 +++++++++++++++++++++++++
 examples/static_world/priv/small.mp4           | Bin 0 -> 383631 bytes
 examples/static_world/priv/small.ogv           | Bin 0 -> 872453 bytes
 examples/static_world/priv/test.txt            |   1 +
 examples/static_world/priv/video.html          |  11 ++++++
 examples/static_world/rebar.config             |   6 +++
 examples/static_world/src/static_world.app.src |  15 ++++++++
 examples/static_world/src/static_world.erl     |  14 +++++++
 examples/static_world/src/static_world_app.erl |  28 ++++++++++++++
 examples/static_world/src/static_world_sup.erl |  23 ++++++++++++
 examples/static_world/start.sh                 |   4 ++
 23 files changed, 153 insertions(+), 153 deletions(-)
 delete mode 100644 examples/static/README.md
 delete mode 100644 examples/static/priv/small.mp4
 delete mode 100644 examples/static/priv/small.ogv
 delete mode 100644 examples/static/priv/test.txt
 delete mode 100644 examples/static/priv/video.html
 delete mode 100644 examples/static/rebar.config
 delete mode 100644 examples/static/src/static.app.src
 delete mode 100644 examples/static/src/static.erl
 delete mode 100644 examples/static/src/static_app.erl
 delete mode 100644 examples/static/src/static_sup.erl
 delete mode 100755 examples/static/start.sh
 create mode 100644 examples/static_world/README.md
 create mode 100644 examples/static_world/priv/small.mp4
 create mode 100644 examples/static_world/priv/small.ogv
 create mode 100644 examples/static_world/priv/test.txt
 create mode 100644 examples/static_world/priv/video.html
 create mode 100644 examples/static_world/rebar.config
 create mode 100644 examples/static_world/src/static_world.app.src
 create mode 100644 examples/static_world/src/static_world.erl
 create mode 100644 examples/static_world/src/static_world_app.erl
 create mode 100644 examples/static_world/src/static_world_sup.erl
 create mode 100755 examples/static_world/start.sh

(limited to 'examples')

diff --git a/examples/README.md b/examples/README.md
index 3ba7c5b..10a2b86 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -25,8 +25,8 @@ Cowboy Examples
  *  [rest_hello_world](./examples/rest_hello_world):
     return the data type that matches the request type (ex: html, text, json)
 
- *  [static](./examples/static):
-    an example file server
+ *  [static_world](./examples/static_world):
+    static file handler
 
  *  [websocket](./examples/websocket):
     websocket example
diff --git a/examples/static/README.md b/examples/static/README.md
deleted file mode 100644
index 78f5338..0000000
--- a/examples/static/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-Cowboy Static Files Server
-==========================
-
-To compile this example you need rebar in your PATH.
-
-Type the following command:
-```
-$ rebar get-deps compile
-```
-
-You can then start the Erlang node with the following command:
-```
-./start.sh
-```
-
-Cowboy will serve all the files you put in the priv/ directory.
-You can replace the filename given in the example URL with the
-one of a file you added to this directory to receive that file.
-
-Example
--------
-
-Show that the file is returned as an octet-stream
-
-``` bash
-$ curl -i http://localhost:8080/test.txt
-HTTP/1.1 200 OK
-connection: keep-alive
-server: Cowboy
-date: Fri, 28 Sep 2012 04:19:40 GMT
-content-length: 52
-Content-Type: application/octet-stream
-Last-Modified: Fri, 28 Sep 2012 04:01:20 GMT
-
-If you read this then the static file server works!
-```
-
-Finally download and cat the file to verify
-
-``` bash
-$ curl -sLO http://localhost:8080/test.txt
-$ cat test.txt
-If you read this then the static file server works!
-```
-
-HTML5 Video Example
--------------------
-
-Open http://localhost:8080/video.html in your favorite browser.
diff --git a/examples/static/priv/small.mp4 b/examples/static/priv/small.mp4
deleted file mode 100644
index 1fc4788..0000000
Binary files a/examples/static/priv/small.mp4 and /dev/null differ
diff --git a/examples/static/priv/small.ogv b/examples/static/priv/small.ogv
deleted file mode 100644
index 6409d6e..0000000
Binary files a/examples/static/priv/small.ogv and /dev/null differ
diff --git a/examples/static/priv/test.txt b/examples/static/priv/test.txt
deleted file mode 100644
index 760cddb..0000000
--- a/examples/static/priv/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-If you read this then the static file server works!
diff --git a/examples/static/priv/video.html b/examples/static/priv/video.html
deleted file mode 100644
index eca63ee..0000000
--- a/examples/static/priv/video.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-	<h1>HTML5 Video Example</h1>
-	<video controls>
-		<source src="small.ogv" type="video/ogg"/> 
-		<source src="small.mp4" type="video/mp4"/>
-	</video>
-	<p>Videos taken from <a href="http://techslides.com/sample-webm-ogg-and-mp4-video-files-for-html5/">TechSlides</a></p>
-</body>
-</html>
diff --git a/examples/static/rebar.config b/examples/static/rebar.config
deleted file mode 100644
index eb6f194..0000000
--- a/examples/static/rebar.config
+++ /dev/null
@@ -1,6 +0,0 @@
-{deps, [
-	{cowboy, ".*",
-		{git, "git://github.com/extend/cowboy.git", "master"}},
-	{mimetypes, ".*",
-		{git, "git://github.com/spawngrid/mimetypes.git", "master"}}
-]}.
diff --git a/examples/static/src/static.app.src b/examples/static/src/static.app.src
deleted file mode 100644
index bf7512d..0000000
--- a/examples/static/src/static.app.src
+++ /dev/null
@@ -1,15 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
-{application, static, [
-	{description, "Cowboy static file server example."},
-	{vsn, "1"},
-	{modules, []},
-	{registered, []},
-	{applications, [
-		kernel,
-		stdlib,
-		cowboy
-	]},
-	{mod, {static_app, []}},
-	{env, []}
-]}.
diff --git a/examples/static/src/static.erl b/examples/static/src/static.erl
deleted file mode 100644
index d3eb319..0000000
--- a/examples/static/src/static.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
--module(static).
-
-%% API.
--export([start/0]).
-
-%% API.
-
-start() ->
-	ok = application:start(crypto),
-	ok = application:start(ranch),
-	ok = application:start(cowboy),
-	ok = application:start(static).
diff --git a/examples/static/src/static_app.erl b/examples/static/src/static_app.erl
deleted file mode 100644
index a2b9c31..0000000
--- a/examples/static/src/static_app.erl
+++ /dev/null
@@ -1,28 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
-%% @private
--module(static_app).
--behaviour(application).
-
-%% API.
--export([start/2]).
--export([stop/1]).
-
-%% API.
-
-start(_Type, _Args) ->
-	Dispatch = cowboy_router:compile([
-		{'_', [
-			{"/[...]", cowboy_static, [
-				{directory, {priv_dir, static, []}},
-				{mimetypes, {fun mimetypes:path_to_mimes/2, default}}
-			]} 
-		]}
-	]),
-	{ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [
-		{env, [{dispatch, Dispatch}]}
-	]),
-	static_sup:start_link().
-
-stop(_State) ->
-	ok.
diff --git a/examples/static/src/static_sup.erl b/examples/static/src/static_sup.erl
deleted file mode 100644
index a3b2e16..0000000
--- a/examples/static/src/static_sup.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
-%% @private
--module(static_sup).
--behaviour(supervisor).
-
-%% API.
--export([start_link/0]).
-
-%% supervisor.
--export([init/1]).
-
-%% API.
-
--spec start_link() -> {ok, pid()}.
-start_link() ->
-	supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-%% supervisor.
-
-init([]) ->
-	Procs = [],
-	{ok, {{one_for_one, 10, 10}, Procs}}.
diff --git a/examples/static/start.sh b/examples/static/start.sh
deleted file mode 100755
index bc67846..0000000
--- a/examples/static/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-erl -pa ebin deps/*/ebin -s static \
-	-eval "io:format(\"Point your browser at http://localhost:8080/test.txt~n\")." \
-	-eval "io:format(\"Point your browser at http://localhost:8080/video.html~n\")."
diff --git a/examples/static_world/README.md b/examples/static_world/README.md
new file mode 100644
index 0000000..e947ebb
--- /dev/null
+++ b/examples/static_world/README.md
@@ -0,0 +1,49 @@
+Cowboy Static File Handler
+==========================
+
+To compile this example you need rebar in your PATH.
+
+Type the following command:
+```
+$ rebar get-deps compile
+```
+
+You can then start the Erlang node with the following command:
+```
+./start.sh
+```
+
+Cowboy will serve all the files you put in the priv/ directory.
+You can replace the filename given in the example URL with the
+one of a file you added to this directory to receive that file.
+
+Example
+-------
+
+Show that the file is returned as an octet-stream
+
+``` bash
+$ curl -i http://localhost:8080/test.txt
+HTTP/1.1 200 OK
+connection: keep-alive
+server: Cowboy
+date: Fri, 28 Sep 2012 04:19:40 GMT
+content-length: 52
+Content-Type: application/octet-stream
+Last-Modified: Fri, 28 Sep 2012 04:01:20 GMT
+
+If you read this then the static file server works!
+```
+
+Finally download and cat the file to verify
+
+``` bash
+$ curl -sLO http://localhost:8080/test.txt
+$ cat test.txt
+If you read this then the static file server works!
+```
+
+HTML5 Video Example
+-------------------
+
+Open http://localhost:8080/video.html in your favorite browser.
diff --git a/examples/static_world/priv/small.mp4 b/examples/static_world/priv/small.mp4
new file mode 100644
index 0000000..1fc4788
Binary files /dev/null and b/examples/static_world/priv/small.mp4 differ
diff --git a/examples/static_world/priv/small.ogv b/examples/static_world/priv/small.ogv
new file mode 100644
index 0000000..6409d6e
Binary files /dev/null and b/examples/static_world/priv/small.ogv differ
diff --git a/examples/static_world/priv/test.txt b/examples/static_world/priv/test.txt
new file mode 100644
index 0000000..760cddb
--- /dev/null
+++ b/examples/static_world/priv/test.txt
@@ -0,0 +1 @@
+If you read this then the static file server works!
diff --git a/examples/static_world/priv/video.html b/examples/static_world/priv/video.html
new file mode 100644
index 0000000..eca63ee
--- /dev/null
+++ b/examples/static_world/priv/video.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body>
+	<h1>HTML5 Video Example</h1>
+	<video controls>
+		<source src="small.ogv" type="video/ogg"/> 
+		<source src="small.mp4" type="video/mp4"/>
+	</video>
+	<p>Videos taken from <a href="http://techslides.com/sample-webm-ogg-and-mp4-video-files-for-html5/">TechSlides</a></p>
+</body>
+</html>
diff --git a/examples/static_world/rebar.config b/examples/static_world/rebar.config
new file mode 100644
index 0000000..eb6f194
--- /dev/null
+++ b/examples/static_world/rebar.config
@@ -0,0 +1,6 @@
+{deps, [
+	{cowboy, ".*",
+		{git, "git://github.com/extend/cowboy.git", "master"}},
+	{mimetypes, ".*",
+		{git, "git://github.com/spawngrid/mimetypes.git", "master"}}
+]}.
diff --git a/examples/static_world/src/static_world.app.src b/examples/static_world/src/static_world.app.src
new file mode 100644
index 0000000..b65995d
--- /dev/null
+++ b/examples/static_world/src/static_world.app.src
@@ -0,0 +1,15 @@
+%% Feel free to use, reuse and abuse the code in this file.
+
+{application, static_world, [
+	{description, "Cowboy static file handler example."},
+	{vsn, "1"},
+	{modules, []},
+	{registered, []},
+	{applications, [
+		kernel,
+		stdlib,
+		cowboy
+	]},
+	{mod, {static_world_app, []}},
+	{env, []}
+]}.
diff --git a/examples/static_world/src/static_world.erl b/examples/static_world/src/static_world.erl
new file mode 100644
index 0000000..6425a99
--- /dev/null
+++ b/examples/static_world/src/static_world.erl
@@ -0,0 +1,14 @@
+%% Feel free to use, reuse and abuse the code in this file.
+
+-module(static_world).
+
+%% API.
+-export([start/0]).
+
+%% API.
+
+start() ->
+	ok = application:start(crypto),
+	ok = application:start(ranch),
+	ok = application:start(cowboy),
+	ok = application:start(static_world).
diff --git a/examples/static_world/src/static_world_app.erl b/examples/static_world/src/static_world_app.erl
new file mode 100644
index 0000000..6470f12
--- /dev/null
+++ b/examples/static_world/src/static_world_app.erl
@@ -0,0 +1,28 @@
+%% Feel free to use, reuse and abuse the code in this file.
+
+%% @private
+-module(static_world_app).
+-behaviour(application).
+
+%% API.
+-export([start/2]).
+-export([stop/1]).
+
+%% API.
+
+start(_Type, _Args) ->
+	Dispatch = cowboy_router:compile([
+		{'_', [
+			{"/[...]", cowboy_static, [
+				{directory, {priv_dir, static_world, []}},
+				{mimetypes, {fun mimetypes:path_to_mimes/2, default}}
+			]} 
+		]}
+	]),
+	{ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [
+		{env, [{dispatch, Dispatch}]}
+	]),
+	static_world_sup:start_link().
+
+stop(_State) ->
+	ok.
diff --git a/examples/static_world/src/static_world_sup.erl b/examples/static_world/src/static_world_sup.erl
new file mode 100644
index 0000000..a57d07a
--- /dev/null
+++ b/examples/static_world/src/static_world_sup.erl
@@ -0,0 +1,23 @@
+%% Feel free to use, reuse and abuse the code in this file.
+
+%% @private
+-module(static_world_sup).
+-behaviour(supervisor).
+
+%% API.
+-export([start_link/0]).
+
+%% supervisor.
+-export([init/1]).
+
+%% API.
+
+-spec start_link() -> {ok, pid()}.
+start_link() ->
+	supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% supervisor.
+
+init([]) ->
+	Procs = [],
+	{ok, {{one_for_one, 10, 10}, Procs}}.
diff --git a/examples/static_world/start.sh b/examples/static_world/start.sh
new file mode 100755
index 0000000..995f913
--- /dev/null
+++ b/examples/static_world/start.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+erl -pa ebin deps/*/ebin -s static_world \
+	-eval "io:format(\"Point your browser at http://localhost:8080/test.txt~n\")." \
+	-eval "io:format(\"Point your browser at http://localhost:8080/video.html~n\")."
-- 
cgit v1.2.3