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

1 files changed, 4 insertions, 138 deletions

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 @@
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <!-- 
-   | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
-   | include-webstart profile in BKUOnline if version changes
-   |-->
   <version>1.2.4-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
@@ -39,6 +35,7 @@
                 <artifactItem>
                   <groupId>at.gv.egiz</groupId>
                   <artifactId>BKULocal</artifactId>
+                  <version>${project.version}</version><!-- make sure BKUWebStart and BKULocal equal -->
                   <type>war</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -50,64 +47,6 @@
         </executions>
       </plugin>
 
-      <!-- Build the web start app
-       |   Default is to build BKUWebStart.zip incl. mocca.jnlp with versioning enabled and
-       |   containing DownloadServlet specific placeholders (for codebase, etc).
-       |   If pkcs11-sign is active (ie. the release build), pack200/gzip will be activated,
-       |   the the PKCS11 keystore will be used (and the adopted version of the plugin will be used).
-       |   If local-webstart is active, the jnlp will be prepared for local execution (development build)
-       |-->
-      <plugin>
-        <artifactId>webstart-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo.webstart</groupId>
-        <executions>
-          <execution>
-            <!-- no default phase, need lifecycle phase binding -->
-            <phase>package</phase>
-            <goals>
-              <!-- IMPORTANT: USE jnlp-inline, otherwise no execution in install phase and
-                  the .zip artifact is not installed
-                  (parallel lifecycle build finished prior to install phase?) -->
-              <goal>jnlp-inline</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <excludeTransitive>false</excludeTransitive>
-          <!-- causes unsignAlreadySignedJars to fail
-               (cf. http://jira.codehaus.org/browse/MWEBSTART-107)
-          <libPath>lib</libPath-->
-          <jnlp>
-            <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
-            <inputTemplate>template.xml</inputTemplate>
-            <outputFile>mocca.jnlp</outputFile>
-            <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
-            <j2seVersion>1.6+</j2seVersion>
-            <offlineAllowed>true</offlineAllowed>
-            <allPermissions>true</allPermissions>
-          </jnlp>
-          <sign>
-            <alias>test-applet signer</alias>
-            <keystore>${project.basedir}/keystore.ks</keystore>
-            <!-- Attention: configuration inherited by pkcs11-sign, uncomment!
-                 (fixed in maven-webstart-plugin-1.0-beta-1-SNAPSHOT) -->
-            <storepass>storepass</storepass>
-            <keypass>keypass</keypass>
-            <verify>true</verify>
-            <keystoreConfig>
-              <delete>false</delete>
-              <gen>false</gen>
-            </keystoreConfig>
-          </sign>
-          <pack200>false</pack200>
-          <gzip>false</gzip>
-          <outputJarVersions>false</outputJarVersions>
-          <!-- unsign IAIK signed libs -->
-          <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
-          <verbose>true</verbose>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-buildnumber-plugin</artifactId>
         <groupId>org.codehaus.mojo</groupId>
@@ -143,81 +82,6 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>standalone (non-webstart)</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
-            <groupId>org.apache.maven.plugins</groupId>
-            <configuration>
-              <archive>
-                <manifest>
-                  <addClasspath>true</addClasspath>
-                  <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
-                </manifest>
-                <manifestEntries>
-                  <mode>development</mode>
-                  <url>${pom.url}</url>
-                  <SplashScreen-Image>at/gv/egiz/bku/webstart/splash.png</SplashScreen-Image>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <!-- TODO somehow provide javaws.jar on manifest class-path -->
-    </profile>
-
-    <profile>
-      <id>pkcs11-sign</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>webstart-maven-plugin</artifactId>
-            <groupId>org.codehaus.mojo.webstart</groupId>
-            <!-- use pkcs11-patched webstart-maven-plugin-->
-            <version>1.0-beta-1-mocca</version>
-            <configuration>
-              <sign>
-                <keystore>NONE</keystore>
-                <storetype>PKCS11</storetype>
-                <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
-                <alias>a-sit</alias>
-                <storepass>${pkcs11-pass}</storepass>
-                <verify>true</verify>
-                <keystoreConfig>
-                  <delete>false</delete>
-                  <gen>false</gen>
-                </keystoreConfig>
-              </sign>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <!-- development profile -->
-      <id>local-webstart</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>webstart-maven-plugin</artifactId>
-            <groupId>org.codehaus.mojo.webstart</groupId>
-            <configuration>
-              <jnlp>
-                <inputTemplate>template-local.xml</inputTemplate>
-                <outputFile>mocca-local.jnlp</outputFile>
-              </jnlp>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <dependencies>
     <!-- ATTENTION update of application descriptor (jnlp file) is special...
      |   The JNLP Client must use the Last-Modified header field returned by
@@ -230,8 +94,10 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>${project.version}</version>
       <type>war</type>
+      <!-- make dependency not transitive -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>