X-Git-Url: https://code.grnet.gr/git/pithos-web-client/blobdiff_plain/f6445935289ba68a8feb08ba41dde1d44433fb6d..87644bfaffbf78eade3421486a01bd33297aec58:/build.xml

diff --git a/build.xml b/build.xml
index 72ae3b1..682ff23 100644
--- a/build.xml
+++ b/build.xml
@@ -1,13 +1,14 @@
 <?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"/>
 
-    <property name="gwt.version" value="2.1.1"/>
+    <property name="gwt.version" value="2.4.0"/>
 	<property name="gwt.home" value="${deps.dir}/gwt-${gwt.version}"/>
     <property name="gwt.filename" value="gwt-${gwt.version}.zip"/>
     <property name="gwt.download.url" value="http://google-web-toolkit.googlecode.com/files/${gwt.filename}"/>
@@ -73,15 +74,59 @@
 				<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"
+   	    />
+   	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+   	                   match="feedbackUrl: (.*)"
+   	                   replace="feedbackUrl: &quot;${feedbackUrl}&quot;,"
+   	                   byline="true"
+   	    />
+   	    <replaceregexp file="${gwt.www.dir}/${gwt.module}/index.html"
+   	                   match="authCookie: (.*)"
+   	                   replace="authCookie: &quot;${authCookie}&quot;"
+   	                   byline="true"
+   	    />
+    </target>
 
-    <target name="uploadToVM" depends="gwt-compile">
-        <scp todir="chstath@pithos.dev.grnet.gr:/var/www/pithos_web_client" keyfile="/home/chstath/.ssh/id_rsa" passphrase="r0bax45">
+    <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>
     </target>
 
+    <target name="uploadCSSToVM">
+        <scp todir="chstath@pithos.dev.grnet.gr:/var/www/pithos_web_client" keyfile="${ssh.key}" passphrase="${passphrase}">
+            <fileset dir="${src.dir}/${gwt.root.path}/public" includes="pithos.css"/>
+        </scp>
+    </target>
+
 	<target name="clean" description="Delete all build artifacts">
 		<delete dir="${build.dir}"/>
 	</target>
@@ -103,10 +148,10 @@
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=55555"/>
             <arg value="-war"/>
-            <arg value="${gwt.www.dir}/${gwt.module}"/>
+            <arg value="${gwt.www.dir}"/>
             <arg value="-noserver"/>
             <arg value="-startupUrl"/>
-            <arg value="http://127.0.0.1:8080/client/pithos.html"/>
+            <arg value="http://127.0.0.1:8080/client"/>
             <arg value="${gwt.module}"/>
         </java>
     </target>