From f0105e9f1279487a2a8f84f9d42db1642a2ac7c1 Mon Sep 17 00:00:00 2001
From: Christos Stathis <chstath@ebs.gr>
Date: Fri, 2 Mar 2012 17:29:50 +0200
Subject: [PATCH] Cloudbar variables and loginUrl are configurable through
 runtime.properties and build.xml

---
 build.xml                                          |   35 ++++++++++++++++++--
 runtime.properties                                 |    5 +++
 src/gr/grnet/pithos/web/client/Configuration.java  |    6 ----
 .../pithos/web/client/Configuration.properties     |    1 -
 src/gr/grnet/pithos/web/client/Pithos.java         |    4 ++-
 src/gr/grnet/pithos/web/public/index.html          |    5 +++
 6 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 runtime.properties

diff --git a/build.xml b/build.xml
index 76fd86d..d132a2e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<project name="pithos" default="gwt-compile" basedir=".">
+<project name="pithos" default="main" basedir=".">
 	<description>The Pithos web client project build file</description>
 
 	<property file="build.properties"/>
+	<property file="runtime.properties"/>
     <property name="deps.dir" value="dependencies"/>
 
     <property name="gwt.workers" value="1"/>
@@ -73,10 +74,38 @@
 				<pathelement path="${src.dir}" />
 		    </classpath>
 		</java>
-        <!--move file="${gwt.www.dir}/${gwt.module}/${gwt.module.class}.html" tofile="${gwt.www.dir}/${gwt.module}/index.html"/-->
 	</target>
+    
+    <target name="main" depends="gwt-compile">
+        <!--Fix the index html file variables -->
+	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+	                   match="CLOUDBAR_ACTIVE_SERVICE = (.*)"
+	                   replace="CLOUDBAR_ACTIVE_SERVICE = '${CLOUDBAR_ACTIVE_SERVICE}';"
+	                   byline="true"
+	    />
+	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+	                   match="CLOUDBAR_LOCATION = (.*)"
+	                   replace="CLOUDBAR_LOCATION = &quot;${CLOUDBAR_LOCATION}&quot;;"
+	                   byline="true"
+	    />
+   	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+   	                   match="CLOUDBAR_SERVICES = (.*)"
+   	                   replace="CLOUDBAR_SERVICES = &quot;${CLOUDBAR_SERVICES}&quot;;"
+   	                   byline="true"
+   	    />
+   	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+   	                   match="CLOUDBAR_MENU = (.*)"
+   	                   replace="CLOUDBAR_MENU = &quot;${CLOUDBAR_MENU}&quot;;"
+   	                   byline="true"
+   	    />
+   	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+   	                   match="loginUrl: (.*)"
+   	                   replace="loginUrl: &quot;${loginUrl}&quot;"
+   	                   byline="true"
+   	    />
+    </target>
 
-    <target name="uploadToVM" depends="gwt-compile">
+    <target name="uploadToVM" depends="main">
         <scp todir="chstath@pithos.dev.grnet.gr:/var/www/pithos_web_client" keyfile="${ssh.key}" passphrase="${passphrase}">
             <fileset dir="${gwt.www.dir}/${gwt.module}"/>
         </scp>
diff --git a/runtime.properties b/runtime.properties
new file mode 100644
index 0000000..675bbef
--- /dev/null
+++ b/runtime.properties
@@ -0,0 +1,5 @@
+loginUrl=/im/login?next=/ui
+CLOUDBAR_ACTIVE_SERVICE = pithos
+CLOUDBAR_LOCATION = /static/im/cloudbar/
+CLOUDBAR_SERVICES = /im/get_services
+CLOUDBAR_MENU = /im/get_menu
diff --git a/src/gr/grnet/pithos/web/client/Configuration.java b/src/gr/grnet/pithos/web/client/Configuration.java
index a3ce127..5715b95 100644
--- a/src/gr/grnet/pithos/web/client/Configuration.java
+++ b/src/gr/grnet/pithos/web/client/Configuration.java
@@ -44,12 +44,6 @@ import com.google.gwt.i18n.client.Constants;
  */
 public interface Configuration extends Constants {
 	/**
-	 * @return the login URL
-	 */
-	@DefaultStringValue("/im/login?next=/ui")
-	String loginUrl();
-
-	/**
 	 * @return the authentication cookie name
 	 */
 	@DefaultStringValue("_pithos2_a")
diff --git a/src/gr/grnet/pithos/web/client/Configuration.properties b/src/gr/grnet/pithos/web/client/Configuration.properties
index 46d2bc0..a76c6ae 100644
--- a/src/gr/grnet/pithos/web/client/Configuration.properties
+++ b/src/gr/grnet/pithos/web/client/Configuration.properties
@@ -39,4 +39,3 @@ apiPath=/v1/
 version=0.8.1
 authTokenCookie=X-Auth-Token
 shibSessionCookiePrefix=_shibsession_
-loginUrl=/im/login?next=/ui
diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java
index 28f5d89..9d75105 100644
--- a/src/gr/grnet/pithos/web/client/Pithos.java
+++ b/src/gr/grnet/pithos/web/client/Pithos.java
@@ -75,6 +75,7 @@ import com.google.gwt.http.client.RequestCallback;
 import com.google.gwt.http.client.RequestException;
 import com.google.gwt.http.client.Response;
 import com.google.gwt.http.client.URL;
+import com.google.gwt.i18n.client.Dictionary;
 import com.google.gwt.i18n.client.NumberFormat;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
@@ -545,7 +546,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
 	 * Redirect the user to the login page for authentication.
 	 */
 	protected void authenticateUser() {
-        Window.Location.assign(config.loginUrl());
+		Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
+        Window.Location.assign(otherProperties.get("loginUrl"));
 	}
 
 	protected void fetchAccount(final Command callback) {
diff --git a/src/gr/grnet/pithos/web/public/index.html b/src/gr/grnet/pithos/web/public/index.html
index 905f9f2..19e4377 100644
--- a/src/gr/grnet/pithos/web/public/index.html
+++ b/src/gr/grnet/pithos/web/public/index.html
@@ -64,6 +64,11 @@
 		      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
 		    })
 		</script>
+		<script>
+			var otherProperties = {
+				loginUrl: "/im/login?next=/ui"
+			}
+		</script>
     </head>
 	<body>
 		<iframe src="javascript:''" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0"></iframe>
-- 
1.7.10.4