From 4f4fedd4cccf07f88eb714614ccff752bca0b70e Mon Sep 17 00:00:00 2001
From: thierry <thierry.rakotoarivelo@nicta.com.au>
Date: Wed, 25 Feb 2015 15:03:23 +1100
Subject: [PATCH] Updated OEDL App defs

---
 gec22_demo/vlc-oml.oedl                   |  2 +-
 gec22_demo/web_redirector/configure       |  3 ++
 gec22_demo/web_redirector/redirector      |  5 ---
 gec22_demo/web_redirector/redirector.oedl | 38 +++++++++++++----------
 4 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100755 gec22_demo/web_redirector/configure
 delete mode 100755 gec22_demo/web_redirector/redirector

diff --git a/gec22_demo/vlc-oml.oedl b/gec22_demo/vlc-oml.oedl
index efbb6c8..a7b71eb 100644
--- a/gec22_demo/vlc-oml.oedl
+++ b/gec22_demo/vlc-oml.oedl
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# Copyright (c) 2015 National ICT Australia Limited (NICTA).
 # This software may be used and distributed solely under the terms of the MIT license (License).
 # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
diff --git a/gec22_demo/web_redirector/configure b/gec22_demo/web_redirector/configure
new file mode 100755
index 0000000..17c164f
--- /dev/null
+++ b/gec22_demo/web_redirector/configure
@@ -0,0 +1,3 @@
+#!/bin/bash
+CONFIG=$1
+echo -e "$CONFIG" >/root/web-redirector/config.yaml
diff --git a/gec22_demo/web_redirector/redirector b/gec22_demo/web_redirector/redirector
deleted file mode 100755
index 27d0570..0000000
--- a/gec22_demo/web_redirector/redirector
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-HOST=$1
-CONFIG=$2
-echo -e $CONFIG >/root/web-redirector/config.yaml
-rackup -o $HOST config.ru
diff --git a/gec22_demo/web_redirector/redirector.oedl b/gec22_demo/web_redirector/redirector.oedl
index 405c4cd..31d8076 100644
--- a/gec22_demo/web_redirector/redirector.oedl
+++ b/gec22_demo/web_redirector/redirector.oedl
@@ -1,33 +1,37 @@
-# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# Copyright (c) 2015 National ICT Australia Limited (NICTA).
 # This software may be used and distributed solely under the terms of the MIT license (License).
 # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
-# This is the OMF6 Application Definition for the OML-Instrumented VLC app,
-# which was contributed by NYPoly [1]. The OML Measurement Point described in 
-# this app definition are the ones defined in the header file of the source code
-# available at [1].
+# This is the OMF6 Application Definition for the simple Ruby-based web redirector
 #
-# As described by the doc at [1], the current limitation of this OML-enabled
-# VLC app is that it cannot report at the same time both the 'usual' VLC stats
-# and the DASH-specific stats. Thus, you need to choose at runtime which set of
-# stats to enable. When used with OMF6 via this app definition, this selection
-# is done by setting/unsetting the 'enable_classic_measurement' property.
-#
-# [1] http://witestlab.poly.edu/site/page/oml-enabled-applications
+# First run the 'web_redirector_config' to write the config yaml file for the 
+# Rack application. Then run 'web_redirector' to start the Rack application which
+# does the redirection
+
+defApplication('web_redirector_config') do |app|
+  app.quiet = true
+  app.binary_path = "/root/web-redirector/configure"
+  app.description = "Configuration for a Simple Ruby-based web-redirector" 
+  app.defProperty(
+    "config", 
+    "YAML-formated config string", 
+    "",
+    :type => :string, :dynamic => false)
+end
 
 defApplication('web_redirector') do |app|
   app.quiet = true
-  app.binary_path = "/root/web-redirector/redirector"
+  app.binary_path = "/usr/local/bin/rackup"
   app.description = "Simple Ruby-based web-redirector" 
   app.defProperty(
     "host", 
     "Address to listen to", 
     "", 
-    :order => 1, :type => :string, :dynamic => false)
+    :order => 1, :type => :string, :dynamic => false, :mandatory => true, :default => 'localhost')
   app.defProperty(
-    "config", 
-    "YAML-formated config string", 
+    "rackapp", 
+    "Path to the redirector Rack Application", 
     "",
-    :order => 2, :type => :string, :dynamic => false)
+    :order => 2, :type => :string, :dynamic => false, :mandatory => true, :default => '/root/web-redirector/config.ru')
 end