From 49439f0912a2f0e23cf4bcf63967d177658a837c Mon Sep 17 00:00:00 2001 From: clemenso Date: Thu, 27 Aug 2009 20:02:45 +0000 Subject: seperate BKUWebStart main jar and BKUWebStart bundle use webstart-maven-plugin:jnlp-download-servlet goal to get versions right git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@478 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUOnline/pom.xml | 18 +- BKUWebStart/pom.xml | 142 +--------------- BKUWebStartPackage/nbactions.xml | 10 ++ BKUWebStartPackage/pom.xml | 186 +++++++++++++++++++++ .../src/main/assemblies/zip-webstart.xml | 35 ++++ BKUWebStartPackage/src/main/jnlp/keystore.ks | Bin 0 -> 5635 bytes .../src/main/jnlp/resources/img/chip128.png | Bin 0 -> 7775 bytes .../src/main/jnlp/resources/img/chip16.png | Bin 0 -> 787 bytes .../src/main/jnlp/resources/img/chip24.png | Bin 0 -> 1227 bytes .../src/main/jnlp/resources/img/chip32.png | Bin 0 -> 1753 bytes .../src/main/jnlp/resources/img/chip48.png | Bin 0 -> 2771 bytes .../src/main/jnlp/resources/img/splash.png | Bin 0 -> 41455 bytes .../src/main/jnlp/resources/img/version.xml | 52 ++++++ .../src/main/jnlp/resources/player.jnlp | 3 + .../src/main/jnlp/template-local.xml | 41 +++++ BKUWebStartPackage/src/main/jnlp/template.xml | 45 +++++ pom.xml | 26 +-- 17 files changed, 384 insertions(+), 174 deletions(-) create mode 100644 BKUWebStartPackage/nbactions.xml create mode 100644 BKUWebStartPackage/pom.xml create mode 100644 BKUWebStartPackage/src/main/assemblies/zip-webstart.xml create mode 100644 BKUWebStartPackage/src/main/jnlp/keystore.ks create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/splash.png create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/img/version.xml create mode 100644 BKUWebStartPackage/src/main/jnlp/resources/player.jnlp create mode 100644 BKUWebStartPackage/src/main/jnlp/template-local.xml create mode 100644 BKUWebStartPackage/src/main/jnlp/template.xml diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index 9fc36d63..72738b0d 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -268,8 +268,6 @@ - include-webstart @@ -277,10 +275,6 @@ maven-dependency-plugin - process-resources unpack @@ -289,38 +283,38 @@ at.gv.egiz - BKUWebStart + BKUWebStartPackage zip - ${project.build.directory}/${project.build.finalName}/webstart + ${project.build.directory}/${project.build.finalName} - org.codehaus.mojo.webstart webstart-jnlp-servlet 1.0-6.0.02_ea_b02.1-SNAPSHOT - + at.gv.egiz - BKUWebStart + BKUWebStartPackage + ${project.version} provided zip - diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index cef65ac2..d6369dec 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -9,10 +9,6 @@ BKUWebStart jar BKU Web Start - 1.2.4-SNAPSHOT http://mocca.egovlabs.gv.at/ Bürgerkartenumgebung @@ -39,6 +35,7 @@ at.gv.egiz BKULocal + ${project.version} war false ${project.build.directory}/classes @@ -50,64 +47,6 @@ - - - webstart-maven-plugin - org.codehaus.mojo.webstart - - - - package - - - jnlp-inline - - - - - false - - - ${project.basedir}/src/main/jnlp - template.xml - mocca.jnlp - at.gv.egiz.bku.webstart.Launcher - 1.6+ - true - true - - - test-applet signer - ${project.basedir}/keystore.ks - - storepass - keypass - true - - false - false - - - false - false - false - - true - true - - - maven-buildnumber-plugin org.codehaus.mojo @@ -143,81 +82,6 @@ - - - standalone (non-webstart) - - - - maven-jar-plugin - org.apache.maven.plugins - - - - true - at.gv.egiz.bku.webstart.Launcher - - - development - ${pom.url} - at/gv/egiz/bku/webstart/splash.png - - - - - - - - - - - pkcs11-sign - - - - webstart-maven-plugin - org.codehaus.mojo.webstart - - 1.0-beta-1-mocca - - - NONE - PKCS11 - iaik.pkcs.pkcs11.provider.IAIKPkcs11 - a-sit - ${pkcs11-pass} - true - - false - false - - - - - - - - - - - local-webstart - - - - webstart-maven-plugin - org.codehaus.mojo.webstart - - - template-local.xml - mocca-local.jnlp - - - - - - - - + provided at.gv.egiz diff --git a/BKUWebStartPackage/nbactions.xml b/BKUWebStartPackage/nbactions.xml new file mode 100644 index 00000000..b3a586c0 --- /dev/null +++ b/BKUWebStartPackage/nbactions.xml @@ -0,0 +1,10 @@ + + + + CUSTOM-assembly + assembly + + assembly:assembly + + + diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml new file mode 100644 index 00000000..2f9ccb5f --- /dev/null +++ b/BKUWebStartPackage/pom.xml @@ -0,0 +1,186 @@ + + + 4.0.0 + + bku + at.gv.egiz + 1.2.4-SNAPSHOT + + at.gv.egiz + BKUWebStartPackage + 1.2.4-SNAPSHOT + pom + BKU Web Start Package + Bürgerkartenumgebung + http://mocca.egovlabs.gv.at/ + + + + + webstart-maven-plugin + org.codehaus.mojo.webstart + + + process-resources + + jnlp-download-servlet + + + + + webstart + + false + + + + template.xml + mocca.jnlp + + + at.gv.egiz + BKUWebStart + ${project.version} + at.gv.egiz.bku.webstart.Launcher + + + + + + + test-applet signer + ${project.basedir}/src/main/jnlp/keystore.ks + storepass + keypass + true + + false + false + + + + true + false + + false + false + false + true + + + + + + maven-assembly-plugin + + + package + + single + + + + + + ${basedir}/src/main/assemblies/zip-webstart.xml + + + + + + + + + + BKUWebStart + at.gv.egiz + ${project.version} + + + + + + pkcs11-sign + + + + webstart-maven-plugin + org.codehaus.mojo.webstart + + 1.0-beta-1-mocca + + + NONE + PKCS11 + iaik.pkcs.pkcs11.provider.IAIKPkcs11 + a-sit + ${pkcs11-pass} + true + + false + false + + + + + + + + + + + local-webstart + + + + webstart-maven-plugin + org.codehaus.mojo.webstart + + + + template-local.xml + mocca-local.jnlp + + + at.gv.egiz + BKUWebStart + ${project.version} + at.gv.egiz.bku.webstart.Launcher + + + + + + + + + + + + non-webstart + + + + maven-jar-plugin + org.apache.maven.plugins + + + + true + at.gv.egiz.bku.webstart.Launcher + + + development + ${pom.url} + at/gv/egiz/bku/webstart/splash.png + + + + + + + + + + diff --git a/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml b/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml new file mode 100644 index 00000000..fa39bdf0 --- /dev/null +++ b/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml @@ -0,0 +1,35 @@ + + + + + + zip + + false + + + ${project.build.directory}/${project.build.finalName}/ + + webstart/** + + / + + + + + diff --git a/BKUWebStartPackage/src/main/jnlp/keystore.ks b/BKUWebStartPackage/src/main/jnlp/keystore.ks new file mode 100644 index 00000000..824c3a40 Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/keystore.ks differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png new file mode 100644 index 00000000..c36d8079 Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png new file mode 100644 index 00000000..96b580e9 Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png new file mode 100644 index 00000000..efd6dbeb Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png new file mode 100644 index 00000000..e7efb020 Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png new file mode 100644 index 00000000..491fbcac Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png b/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png new file mode 100644 index 00000000..597fbc60 Binary files /dev/null and b/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png differ diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml b/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml new file mode 100644 index 00000000..5e160beb --- /dev/null +++ b/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml @@ -0,0 +1,52 @@ + + + + + chip16.png + 2.0 + + chip16.png + + + + chip24.png + 2.0 + + chip24.png + + + + chip32.png + 2.0 + + chip32.png + + + + chip48.png + 2.0 + + chip48.png + + + + chip64.png + 2.0 + + chip64.png + + + + chip128.png + 2.0 + + chip128.png + + + + splash.png + 2.0 + + splash.png + + diff --git a/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp b/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp new file mode 100644 index 00000000..da08ebc2 --- /dev/null +++ b/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/BKUWebStartPackage/src/main/jnlp/template-local.xml b/BKUWebStartPackage/src/main/jnlp/template-local.xml new file mode 100644 index 00000000..d17c2782 --- /dev/null +++ b/BKUWebStartPackage/src/main/jnlp/template-local.xml @@ -0,0 +1,41 @@ + + + + + ${project.Description} + E-Government Innovationszentrum (EGIZ) + + ${project.Description} (BKU) MOCCA Web Start + ${project.Description} + + + + + + + + + + + + + + + + + + + + + + + + + + + + $dependencies + + + + \ No newline at end of file diff --git a/BKUWebStartPackage/src/main/jnlp/template.xml b/BKUWebStartPackage/src/main/jnlp/template.xml new file mode 100644 index 00000000..dfb66c55 --- /dev/null +++ b/BKUWebStartPackage/src/main/jnlp/template.xml @@ -0,0 +1,45 @@ + + + + + ${project.Description} + E-Government Innovationszentrum (EGIZ) + + ${project.Description} (BKU) MOCCA Web Start + ${project.Description} + + + + + + + + + + + + + + + + + + + + + + + + + + + $dependencies + + + + + $dependencies + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 42938cf0..4d5e44b7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ BKUHelp BKUGuiExt smccSTALExt + BKUWebStartPackage @@ -83,7 +84,7 @@ maven-assembly-plugin org.apache.maven.plugins - 2.2-beta-2 + 2.2-beta-4 maven-dependency-plugin @@ -123,29 +124,6 @@ - - - maven-assembly-plugin - - - ${basedir}/src/main/assemblies/assembly-test.xml - - - - - - -- cgit v1.2.3