diff options
| -rw-r--r-- | BKUOnline/pom.xml | 13 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/css/main.css | 7 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/img/webstart.png | bin | 0 -> 4643 bytes | |||
| -rw-r--r-- | BKUOnline/src/main/webapp/index.html | 2 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/js/deployJava.js | 23 | ||||
| -rw-r--r-- | BKUWebStart/pom.xml | 32 | ||||
| -rw-r--r-- | BKUWebStart/src/main/jnlp/resources/version.xml | 6 | ||||
| -rw-r--r-- | BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/template.zip | bin | 24829 -> 0 bytes | |||
| -rw-r--r-- | BKUWebStart/src/main/resources/splash_standalone.png | bin | 0 -> 54978 bytes | |||
| -rw-r--r-- | pom.xml | 8 |
10 files changed, 76 insertions, 15 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index bd46041f..17fa78b0 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -215,6 +215,8 @@ </build> </profile> <profile> + <!-- make sure this profile is active when building entire BKU, + | in order to account for BKUWebStart dependency in reactor build order --> <id>include-webstart</id> <build> <plugins> @@ -235,7 +237,6 @@ <artifactItem> <groupId>at.gv.egiz</groupId> <artifactId>BKUWebStart</artifactId> - <version>1.0.3-SNAPSHOT</version> <type>zip</type> </artifactItem> </artifactItems> @@ -254,6 +255,16 @@ <artifactId>jnlp-servlet</artifactId> <version>1.6.0.10</version> </dependency> + <!-- dependency to ensure BKUWebStart is build prior to BKUOnline; + | transitive dependencies shall not be included in WEB-INF/lib + | and are provided in the BKUWebStart zip --> + <dependency> + <groupId>at.gv.egiz</groupId> + <artifactId>BKUWebStart</artifactId> + <version>1.0.4-SNAPSHOT</version> + <scope>provided</scope> + <type>zip</type> + </dependency> </dependencies> </profile> diff --git a/BKUOnline/src/main/webapp/css/main.css b/BKUOnline/src/main/webapp/css/main.css index 114b8da9..b6d6e906 100644 --- a/BKUOnline/src/main/webapp/css/main.css +++ b/BKUOnline/src/main/webapp/css/main.css @@ -24,6 +24,13 @@ h1 { font-size: 16px; } +.disabled { + /* for IE */ + filter:alpha(opacity=60); + /* CSS3 standard */ + opacity:0.4; +} + .box { margin-top: 10px; color: #292929; diff --git a/BKUOnline/src/main/webapp/img/webstart.png b/BKUOnline/src/main/webapp/img/webstart.png Binary files differnew file mode 100644 index 00000000..87d1cf7b --- /dev/null +++ b/BKUOnline/src/main/webapp/img/webstart.png diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html index 2ec41746..fd37ce35 100644 --- a/BKUOnline/src/main/webapp/index.html +++ b/BKUOnline/src/main/webapp/index.html @@ -40,6 +40,7 @@ <!-- MOCCA Web Start | (activate 'include-webstart' profile) + --> <div id="animDiv" class="box"> <p> <h1>MOCCA Web Start</h1> @@ -52,6 +53,5 @@ <p><a href="webstart/player.jnlp">Java Cache Viewer</a> (local installation)</p> </p> </div> - |--> </body> </html> diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js index dbeab995..225ca80f 100644 --- a/BKUOnline/src/main/webapp/js/deployJava.js +++ b/BKUOnline/src/main/webapp/js/deployJava.js @@ -36,6 +36,11 @@ * (lines 95-99) * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP * (lines 501-506) + * + * features: + * [#425] Disable WebStart Launch Button for MacOS + * (lines 492-504) + * */ /* @@ -75,8 +80,7 @@ var deployJava = { mimeType: 'application/npruntime-scriptable-plugin;DeploymentToolkit', // location of the Java Web Start launch button graphic - launchButtonPNG: 'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png', - + launchButtonPNG: 'img/webstart.png', /** * Returns an array of currently-installed JRE version strings. @@ -485,11 +489,20 @@ var deployJava = { 'if (deployJava.launch("' + jnlp + '")) {}' + '}'; - document.write('<' + 'a href="' + url + + // [#425] Disable WebStart Launch Button for MacOS + if (navigator.appVersion.toLowerCase().indexOf("mac")!=-1) { + document.write('<' + 'a disabled="disabled"' + + ' onMouseOver="window.status=\'\'; ' + + 'return true;"><' + 'img class="disabled"' + + 'src="' + deployJava.launchButtonPNG + '" ' + + 'border="0" /><' + '/' + 'a' + '>'); + } else { + document.write('<' + 'a href="' + url + '" onMouseOver="window.status=\'\'; ' + 'return true;"><' + 'img ' + - 'src="' + deployJava.launchButtonPNG + '" ' + + 'src="' + deployJava.launchButtonPNG + '" ' + 'border="0" /><' + '/' + 'a' + '>'); + } }, @@ -636,7 +649,7 @@ var deployJava = { if (deployJava.debug) { alert('userAgent -> ' + browser); } - + if ((navigator.vendor) && (navigator.vendor.toLowerCase().indexOf('apple') != -1) && (browser.indexOf('safari') != -1)) { diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index fb72f26f..09574814 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -11,9 +11,10 @@ <packaging>jar</packaging> <name>BKU Web Start</name> <!-- - | IMPORTANT: update jnlp/resources/version.xml if version changes + | IMPORTANT: update jnlp/resources/version.xml and + | include-webstart profile in BKUOnline if version changes |--> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.4-SNAPSHOT</version> <url>http://mocca.egovlabs.gv.at/</url> <description>Bürgerkartenumgebung (MOCCA Web Start)</description> @@ -276,4 +277,31 @@ </profiles> --> + <profiles> + <profile> + <id>standalone (non-webstart)</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>at.gv.egiz.bku.webstart.BKULauncher</mainClass> + </manifest> + <manifestEntries> + <mode>development</mode> + <url>${pom.url}</url> + <SplashScreen-Image>splash_standalone.png</SplashScreen-Image> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>
\ No newline at end of file diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml index 197c05b5..872b8703 100644 --- a/BKUWebStart/src/main/jnlp/resources/version.xml +++ b/BKUWebStart/src/main/jnlp/resources/version.xml @@ -2,10 +2,10 @@ <jnlp-versions> <resource> <pattern> - <name>BKUWebStart-1.0.3-SNAPSHOT.jar</name> - <version-id>1.0.3-SNAPSHOT</version-id> + <name>BKUWebStart-1.0.4-SNAPSHOT.jar</name> + <version-id>1.0.4-SNAPSHOT</version-id> </pattern> - <file>BKUWebStart-1.0.3-SNAPSHOT.jar</file> + <file>BKUWebStart-1.0.4-SNAPSHOT.jar</file> </resource> <resource> diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/template.zip b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/template.zip Binary files differdeleted file mode 100644 index f14b0c19..00000000 --- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/conf/template.zip +++ /dev/null diff --git a/BKUWebStart/src/main/resources/splash_standalone.png b/BKUWebStart/src/main/resources/splash_standalone.png Binary files differnew file mode 100644 index 00000000..72c1d868 --- /dev/null +++ b/BKUWebStart/src/main/resources/splash_standalone.png @@ -59,9 +59,11 @@ <groupId>org.apache.maven.plugins</groupId> <version>2.0.2</version> <configuration> - <!-- - fork>true</fork> <executable>${java_6_sun}/bin/javac</executable> - <compilerVersion>1.6</compilerVersion --> + <!-- + <fork>true</fork> + <executable>${java_150_sun}/bin/javac</executable> + <compilerVersion>1.5</compilerVersion> + --> <source>1.6</source> <target>1.6</target> <verbose>true</verbose> |
