support reader configuration (disablePinpad) in BKUWebStart

webstart-local -> template-local.xml
pkcs11sign -> template.xml
default -> template-unstable.xml

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

4 files changed, 6 insertions, 6 deletions

diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index bcc40ac5..af7edda8 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -89,7 +89,7 @@
             <excludeTransitive>false</excludeTransitive>
             <jnlp>
               <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
-              <inputTemplate>template.xml</inputTemplate>
+              <inputTemplate>template-unstable.xml</inputTemplate>
               <outputFile>mocca.jnlp</outputFile>
               <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
             </jnlp>
@@ -156,7 +156,7 @@
             <excludeTransitive>false</excludeTransitive>
             <jnlp>
               <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
-              <inputTemplate>template-unstable.xml</inputTemplate>
+              <inputTemplate>template.xml</inputTemplate>
               <outputFile>mocca.jnlp</outputFile>
               <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
             </jnlp>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
index d8fe3e70..37638510 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
@@ -59,7 +59,7 @@ public class Configurator {
    * configurations with less than this (major) version will be backuped and updated
    * allowed: MAJOR[.MINOR[.X[-SNAPSHOT]]]
    */
-  public static final String MIN_CONFIG_VERSION = "1.2.4-SNAPSHOT";
+  public static final String MIN_CONFIG_VERSION = "1.2.11-SNAPSHOT";
   public static final String CONFIG_DIR = ".mocca/conf/";
   public static final String CERTS_DIR = ".mocca/certs/";
   public static final String VERSION_FILE = ".version";
diff --git a/BKUWebStart/src/main/jnlp/template-unstable.xml b/BKUWebStart/src/main/jnlp/template-unstable.xml
index b473f492..b6574715 100644
--- a/BKUWebStart/src/main/jnlp/template-unstable.xml
+++ b/BKUWebStart/src/main/jnlp/template-unstable.xml
@@ -3,14 +3,14 @@
  |   To strip versions from jar filenames do
  |   for JAR in *jar; do mv JAR {JAR/-[0-9]*/.jar}; done
  |-->
-<jnlp spec="$jnlpspec" codebase="http://localhost/webstart/" context="http://localhost/" href="$outputFile">
+<jnlp spec="$jnlpspec" codebase="http://localhost:8080/webstart/" context="http://localhost:8080/" href="$outputFile">
 
   <information>
     <title>MOCCA Unstable</title>
     <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
     <homepage href="${project.Url}"/>
-    <description>${project.Description} (BKU) MOCCA Web Start - Unstable Build</description>
-    <description kind="short">${project.Description}</description>
+    <description>MOCCA Web Start - Unstable Build</description>
+    <description kind="short">MOCCA Web Start - Unstable Build</description>
     <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
     <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
     <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/conf.zip b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/conf.zip
index 7ed90b7b..3a3eb26d 100644
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/conf.zip
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/conf.zip