make "include-webstart" profile default (added "local-webstart" for development)

updateRequired (versioning) bug fixed
AboutDialog
Branding (removed MOCCA/Bean)


git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@444 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

5 files changed, 15 insertions, 27 deletions

diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_24.png b/BKUWebStart/src/main/jnlp/resources/img/logo_24.png
new file mode 100644
index 00000000..a9074f01
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/logo_24.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/splash.png b/BKUWebStart/src/main/jnlp/resources/img/splash.png
index 72c1d868..597fbc60 100644
--- a/BKUWebStart/src/main/jnlp/resources/img/splash.png
+++ b/BKUWebStart/src/main/jnlp/resources/img/splash.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/version.xml b/BKUWebStart/src/main/jnlp/resources/img/version.xml
index 31f43441..1ba3ecda 100644
--- a/BKUWebStart/src/main/jnlp/resources/img/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/img/version.xml
@@ -2,43 +2,29 @@
 <jnlp-versions>
   <resource>
     <pattern>
-      <name>logo_16.xpm</name>
-      <version-id>1.0-SNAPSHOT</version-id>
+      <name>logo_24</name>
+      <version-id>1.0</version-id>
     </pattern>
-    <file>logo_16.xpm</file>
+    <file>logo_24.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>logo_16.ico</name>
-      <version-id>1.0-SNAPSHOT</version-id>
-    </pattern>
-    <file>logo_16.ico</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>logo_16.png</name>
-      <version-id>1.0-SNAPSHOT</version-id>
-    </pattern>
-    <file>logo_16.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>logo_32.png</name>
-      <version-id>1.0-SNAPSHOT</version-id>
+      <name>logo_32</name>
+      <version-id>1.0</version-id>
     </pattern>
     <file>logo_32.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>logo_64.png</name>
-      <version-id>1.0-SNAPSHOT</version-id>
+      <name>logo_64</name>
+      <version-id>1.0</version-id>
     </pattern>
     <file>logo_64.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>splash.png</name>
-      <version-id>1.0-SNAPSHOT</version-id>
+      <name>splash</name>
+      <version-id>2.0</version-id>
     </pattern>
     <file>splash.png</file>
   </resource>
diff --git a/BKUWebStart/src/main/jnlp/template-local.xml b/BKUWebStart/src/main/jnlp/template-local.xml
index 9135ba1b..80447c89 100644
--- a/BKUWebStart/src/main/jnlp/template-local.xml
+++ b/BKUWebStart/src/main/jnlp/template-local.xml
@@ -10,7 +10,9 @@
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
     <!--icon kind="shortcut" href="img/logo_16.ico" width="16" height="16" version="1.0-SNAPSHOT"/-->
+    <icon kind="shortcut" href="img/logo_24.png" width="24" height="24"/>
     <icon kind="shortcut" href="img/logo_32.png" width="32" height="32"/>
+    <icon kind="default" href="img/logo_24.png" width="24" height="24"/>
     <icon kind="default" href="img/logo_32.png" width="32" height="32"/>
     <icon kind="default" href="img/logo_64.png" width="64" height="64"/>
     <icon kind="splash" href="img/splash.png"/>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index 0176376a..bbc4c466 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -10,10 +10,10 @@
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
     <!--icon kind="shortcut" href="img/logo_16.ico" width="16" height="16" version="1.0-SNAPSHOT"/-->
-    <icon kind="shortcut" href="img/logo_32.png" width="32" height="32" version="1.0-SNAPSHOT"/>
-    <icon kind="default" href="img/logo_32.png" width="32" height="32" version="1.0-SNAPSHOT"/>
-    <icon kind="default" href="img/logo_64.png" width="64" height="64" version="1.0-SNAPSHOT"/>
-    <icon kind="splash" href="img/splash.png" version="1.0-SNAPSHOT"/>
+    <icon kind="shortcut" href="img/logo_32.png" width="32" height="32" version="1.0"/>
+    <icon kind="default" href="img/logo_32.png" width="32" height="32" version="1.0"/>
+    <icon kind="default" href="img/logo_64.png" width="64" height="64" version="1.0"/>
+    <icon kind="splash" href="img/splash.png" version="2.0"/>
     <shortcut online="false">
       <desktop/>
       <menu submenu="e-Government"/>