summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUWebStart/pom.xml2
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java10
-rw-r--r--BKUWebStart/src/main/jnlp/resources/version.xml77
-rw-r--r--BKUWebStart/src/main/jnlp/template.xml6
-rw-r--r--BKUWebStart/src/main/jnlp/template_dev.xml39
-rw-r--r--BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties10
6 files changed, 57 insertions, 87 deletions
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index ec5fd976..25683dba 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -15,7 +15,7 @@
|-->
<version>1.0.3-SNAPSHOT</version>
<url>http://mocca.egovlabs.gv.at/</url>
- <description>Web Start B├╝rgerkartenumgebung (MOCCA-lokal)</description>
+ <description>B├╝rgerkartenumgebung (MOCCA Web Start)</description>
<build>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
index 3d09fb00..b1fc29be 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
@@ -64,6 +64,8 @@ public class BKULauncher implements BKUControllerInterface {
/** resource bundle messages */
public static final String GREETING_CAPTION = "Greetings.Caption";
public static final String GREETING_MESSAGE = "Greetings.Message";
+ public static final String STARTUP_CAPTION = "Startup.Caption";
+ public static final String STARTUP_MESSAGE = "Startup.Message";
public static final String VERSION_FILE = ".version";
private static Log log = LogFactory.getLog(BKULauncher.class);
private ResourceBundle resourceBundle = null;
@@ -204,7 +206,7 @@ public class BKULauncher implements BKUControllerInterface {
}
TrayIconDialog.getInstance().init(resourceBundle);
TrayIconDialog.getInstance().setShutdownHook(this);
- TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE);
+// TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE);
}
private void initStart() {
@@ -277,8 +279,12 @@ public class BKULauncher implements BKUControllerInterface {
File configDir = new File(System.getProperty("user.home") + '/' + CONFIG_DIR);
boolean installCert = launcher.ensureConfig(configDir);
- launcher.startUpServer();
launcher.initTrayIcon();
+ TrayIconDialog.getInstance().displayInfo(STARTUP_CAPTION, STARTUP_MESSAGE);
+ launcher.startUpServer();
+ TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE);
+
+// launcher.initTrayIcon();
launcher.initFinished(installCert);
} catch (Exception e) {
log.fatal("Failed to launch BKU: " + e.getMessage(), e);
diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml
index a5b10b47..197c05b5 100644
--- a/BKUWebStart/src/main/jnlp/resources/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/version.xml
@@ -15,27 +15,6 @@
</pattern>
<file>commons-logging-1.0.4.jar</file>
</resource>
- <!--resource>
- <pattern>
- <name>commons-fileupload-1.2.1.jar</name>
- <version-id>1.2.1</version-id>
- </pattern>
- <file>commons-fileupload-1.2.1.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>commons-httpclient-3.1.jar</name>
- <version-id>3.1</version-id>
- </pattern>
- <file>commons-httpclient-3.1.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>commons-codec-1.2.jar</name>
- <version-id>1.2</version-id>
- </pattern>
- <file>commons-codec-1.2.jar</file>
- </resource-->
<resource>
<pattern>
@@ -74,13 +53,6 @@
</pattern>
<file>iaik_xsect-1.14.jar</file>
</resource>
- <!--resource>
- <pattern>
- <name>iaik_pki-1.0-MOCCA.jar</name>
- <version-id>1.0-MOCCA</version-id>
- </pattern>
- <file>iaik_pki-1.0-MOCCA.jar</file>
- </resource-->
<resource>
<pattern>
@@ -125,34 +97,6 @@
</pattern>
<file>stax-api-1.0-2.jar</file>
</resource>
- <!--resource>
- <pattern>
- <name>xalan-2.7.1.jar</name>
- <version-id>2.7.1</version-id>
- </pattern>
- <file>xalan-2.7.1.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>serializer-2.7.1.jar</name>
- <version-id>2.7.1</version-id>
- </pattern>
- <file>serializer-2.7.1.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>xercesImpl-2.9.1.jar</name>
- <version-id>2.9.1</version-id>
- </pattern>
- <file>xercesImpl-2.9.1.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>xml-apis-1.3.04.jar</name>
- <version-id>1.3.04</version-id>
- </pattern>
- <file>xml-apis-1.3.04.jar</file>
- </resource-->
<resource>
<pattern>
@@ -161,26 +105,5 @@
</pattern>
<file>utils-1.1.2-SNAPSHOT.jar</file>
</resource>
- <!--resource>
- <pattern>
- <name>bkucommon-1.1.2-SNAPSHOT.jar</name>
- <version-id>1.1.2-SNAPSHOT</version-id>
- </pattern>
- <file>bkucommon-1.1.2-SNAPSHOT.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>STALExt-1.1.2-SNAPSHOT.jar</name>
- <version-id>1.1.2-SNAPSHOT</version-id>
- </pattern>
- <file>STALExt-1.1.2-SNAPSHOT.jar</file>
- </resource>
- <resource>
- <pattern>
- <name>STAL-1.1.2-SNAPSHOT.jar</name>
- <version-id>1.1.2-SNAPSHOT</version-id>
- </pattern>
- <file>STAL-1.1.2-SNAPSHOT.jar</file>
- </resource-->
</jnlp-versions>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index a355da77..07e1c28a 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -5,11 +5,11 @@
<jnlp spec="$jnlpspec" codebase="$$codebase" context="$$context" href="$$name">
<information>
- <title>$project.Name</title>
+ <title>$project.Name EarlyAccess</title>
<vendor>$project.Organization.Name</vendor>
<homepage href="$project.Url"/>
- <description>$project.Description</description>
- <description kind="short">$project.Description</description>
+ <description>$project.Description EarlyAccess</description>
+ <description kind="short">$project.Description EarlyAccess</description>
<icon href="img/logo.png" kind="default" version="1.0-SNAPSHOT"/>
<icon href="img/splash.png" kind="splash" version="1.0-SNAPSHOT"/>
<shortcut online="false">
diff --git a/BKUWebStart/src/main/jnlp/template_dev.xml b/BKUWebStart/src/main/jnlp/template_dev.xml
new file mode 100644
index 00000000..2d8e8133
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/template_dev.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="$jnlpspec" codebase="$project.Url" href="$outputFile">
+
+ <information>
+ <title>$project.Name</title>
+ <vendor>$project.Organization.Name</vendor>
+ <homepage href="$project.Url"/>
+ <description>$project.Description</description>
+ <description kind="short">$project.Description</description>
+ <icon href="img/logo.png" kind="default" version="1.0-SNAPSHOT"/>
+ <icon href="img/splash.png" kind="splash" version="1.0-SNAPSHOT"/>
+ <shortcut online="false">
+ <desktop/>
+ <menu submenu="e-Government"/>
+ </shortcut>
+
+#if($offlineAllowed)
+ <offline-allowed/>
+#end
+
+ </information>
+
+
+#if($allPermissions)
+ <security>
+ <all-permissions/>
+ </security>
+#end
+
+ <resources>
+ <!-- initial-heap-size="32m" max-heap-size="128m" -->
+ <j2se version="$j2seVersion"/>
+ <property name="jnlp.versionEnabled" value="true"/>
+
+ $dependencies
+
+ </resources>
+ <application-desc main-class="$mainClass"/>
+</jnlp> \ No newline at end of file
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties
index 873d03ef..6ee1a510 100644
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties
@@ -1,9 +1,11 @@
#-------- tray icon messages -------
-TrayMenu.Tooltip=MOCCA
-TrayMenu.Shutdown=MOCCA Beenden
+TrayMenu.Tooltip=B\u00FCrgerkartenumgebung (MOCCA Web Start)
+TrayMenu.Shutdown=B\u00FCrgerkartenumgebung beenden
-Greetings.Message=MOCCA up and running
-Greetings.Caption=MOCCA Started
+Startup.Message=B\u00FCrgerkartenumgebung wird gestartet...
+Startup.Caption=B\u00FCrgerkartenumgebung (MOCCA Web Start)
+Greetings.Message=B\u00FCrgerkartenumgebung erfolgreich gestartet
+Greetings.Caption=B\u00FCrgerkartenumgebung (MOCCA Web Start)
Message.RequestCaption=New Request
Message.InfoboxReadRequest=Reading Infobox