Display the version number in the web client and set the next release to become 1.2.

diff --git a/jboss/conf/gss.properties b/jboss/conf/gss.properties
index 89ce3e8..824d64f 100644 (file)
--- a/jboss/conf/gss.properties
+++ b/jboss/conf/gss.properties
@@ -4,7 +4,7 @@ restUrl=http://127.0.0.1:8080/pithos/rest/
 loginUrl=http://127.0.0.1:8080/pithos/login
 externalApiPath=gss/ExternalAPIBean/local
 adminApiPath=gss/AdminAPIBean/local
-version=1.0.0-beta
+version=1.2
 noUsernameMessage=<B>No username found in the Shibboleth attributes!</B><P>Your Identity Provider sent the following attributes:
 fileRepositoryPath=/tmp/gss-root
 # Default quota in bytes (10GB)

diff --git a/src/gr/ebs/gss/client/AboutDialog.java b/src/gr/ebs/gss/client/AboutDialog.java
index d27b57f..1adf09e 100644 (file)
--- a/src/gr/ebs/gss/client/AboutDialog.java
+++ b/src/gr/ebs/gss/client/AboutDialog.java
@@ -50,9 +50,9 @@ public class AboutDialog extends DialogBox {
                // Create the 'about' text and set the style.\r
                final HTML text = new HTML("This is the Web client for the " + service +\r
                                        " service. You can use it to store, retrieve and share " +\r
-                                       "files in the " + service + " server grid. <p>Design and" +\r
-                                       " implementation: <a href='http://www.ebs.gr' " +\r
-                                       "target='about'>EBS</a></p>");\r
+                                       "files in the " + service + " server grid. <p>Version: " +\r
+                                       conf.version() + "<br>Design and implementation: " +\r
+                                       "<a href='http://www.ebs.gr' target='about'>EBS</a></p>");\r
                text.setStyleName("gss-AboutText");\r
                outer.add(text);\r
 \r

diff --git a/src/gr/ebs/gss/client/Configuration.java b/src/gr/ebs/gss/client/Configuration.java
index 3435fdc..c5a3bf6 100644 (file)
--- a/src/gr/ebs/gss/client/Configuration.java
+++ b/src/gr/ebs/gss/client/Configuration.java
@@ -89,4 +89,10 @@ public interface Configuration extends Constants {
        @DefaultStringValue("")
        String tokenTTLNote();
 
+       /**
+        * @return the version string
+        */
+       @DefaultStringValue("")
+       String version();
+
 }

diff --git a/src/gr/ebs/gss/client/Configuration.properties b/src/gr/ebs/gss/client/Configuration.properties
index 75e9988..cb83042 100644 (file)
--- a/src/gr/ebs/gss/client/Configuration.properties
+++ b/src/gr/ebs/gss/client/Configuration.properties
@@ -7,4 +7,5 @@ cookieSeparator=|
 apiPath=rest/
 serviceHome=https://pithos.grnet.gr/
 webdavUrl=webdav/
-tokenTTLNote=The token is valid for 30 days.
\ No newline at end of file
+tokenTTLNote=The token is valid for 30 days.
+version=1.2
\ No newline at end of file