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

17 files changed, 384 insertions, 174 deletions

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 @@
       </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>
@@ -277,10 +275,6 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                      <!--
-                          Copy the webstart bundle in as a resource
-                          before packaging starts.
-                      -->
                 <phase>process-resources</phase>
                 <goals>
                   <goal>unpack</goal>
@@ -289,38 +283,38 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>at.gv.egiz</groupId>
-                      <artifactId>BKUWebStart</artifactId>
+                      <artifactId>BKUWebStartPackage</artifactId>
                       <type>zip</type>
                     </artifactItem>
                   </artifactItems>
-                  <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                 </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
-
       <dependencies>
         <!-- not yet available in IBIBLIO, install locally
          |   NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
+         |-->
         <dependency>
           <groupId>org.codehaus.mojo.webstart</groupId>
           <artifactId>webstart-jnlp-servlet</artifactId>
           <version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
-        </dependency-->
+        </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
          |   (version defined in super-pom dependencyManagement, version won't be adjusted by release:prepare) -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
-          <artifactId>BKUWebStart</artifactId>
+          <artifactId>BKUWebStartPackage</artifactId>
+          <version>${project.version}</version>
           <scope>provided</scope>
           <type>zip</type>
         </dependency>
       </dependencies>
-          
     </profile>
   </profiles>
   <properties>
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>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>CUSTOM-assembly</actionName>
+            <displayName>assembly</displayName>
+            <goals>
+                <goal>assembly:assembly</goal>
+            </goals>
+        </action>
+    </actions>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bku</artifactId>
+    <groupId>at.gv.egiz</groupId>
+    <version>1.2.4-SNAPSHOT</version>
+  </parent>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>BKUWebStartPackage</artifactId>
+  <version>1.2.4-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>BKU Web Start Package</name>
+  <description>Bürgerkartenumgebung</description>
+  <url>http://mocca.egovlabs.gv.at/</url>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>webstart-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo.webstart</groupId>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>jnlp-download-servlet</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outputDirectoryName>webstart</outputDirectoryName>
+
+          <excludeTransitive>false</excludeTransitive>
+
+          <jnlpFiles>
+            <jnlpFile>
+              <templateFilename>template.xml</templateFilename>
+              <outputFilename>mocca.jnlp</outputFilename>
+              <jarResources>
+                <jarResource>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>BKUWebStart</artifactId>
+                  <version>${project.version}</version>
+                  <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+                </jarResource>
+              </jarResources>
+            </jnlpFile>
+          </jnlpFiles>
+
+          <sign>
+            <alias>test-applet signer</alias>
+            <keystore>${project.basedir}/src/main/jnlp/keystore.ks</keystore>
+            <storepass>storepass</storepass>
+            <keypass>keypass</keypass>
+            <verify>true</verify>
+            <keystoreConfig>
+              <delete>false</delete>
+              <gen>false</gen>
+            </keystoreConfig>
+          </sign>
+
+          <unsign>true</unsign>
+          <verifyjar>false</verifyjar>
+
+          <pack200>false</pack200>
+          <gzip>false</gzip>
+          <outputJarVersions>false</outputJarVersions>
+          <verbose>true</verbose>
+
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>${basedir}/src/main/assemblies/zip-webstart.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <artifactId>BKUWebStart</artifactId>
+      <groupId>at.gv.egiz</groupId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <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>
+              <jnlpFiles>
+                <jnlpFile>
+                  <templateFilename>template-local.xml</templateFilename>
+                  <outputFilename>mocca-local.jnlp</outputFilename>
+                  <jarResources>
+                    <jarResource>
+                      <groupId>at.gv.egiz</groupId>
+                      <artifactId>BKUWebStart</artifactId>
+                      <version>${project.version}</version>
+                      <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+                    </jarResource>
+                  </jarResources>
+                </jnlpFile>
+              </jnlpFiles>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+    <profile>
+      <id>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>
+  </profiles>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2008 Federal Chancellery Austria and
+  Graz University of Technology
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<assembly>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/${project.build.finalName}/</directory>
+      <includes>
+        <include>webstart/**</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
+
+
diff --git a/BKUWebStartPackage/src/main/jnlp/keystore.ks b/BKUWebStartPackage/src/main/jnlp/keystore.ks
new file mode 100644
index 00000000..824c3a40
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/keystore.ks
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png
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
--- /dev/null
+++ b/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp-versions>
+  <resource>
+    <pattern>
+      <name>chip16.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip16.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>chip24.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip24.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>chip32.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip32.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>chip48.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip48.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>chip64.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip64.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>chip128.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>chip128.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>splash.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>splash.png</file>
+  </resource>
+</jnlp-versions>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Jump specific JNL file for launching the player -->
+<player/>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="$jnlpspec" codebase="file:/home/clemens/workspace/bku/BKUWebStart/target/jnlp" href="$outputFile">
+
+  <information>
+    <title>${project.Description}</title>
+    <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
+    <homepage href="${project.Url}"/>
+    <description>${project.Description} (BKU) MOCCA Web Start</description>
+    <description kind="short">${project.Description}</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"/>
+    <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="splash" href="img/splash.png"/>
+    <shortcut online="true">
+      <desktop/>
+      <menu submenu="e-Government"/>
+    </shortcut>
+
+    <offline-allowed/>
+
+  </information>
+  
+  <security>
+    <all-permissions/>
+  </security>
+
+  <update check="timeout" policy="prompt-update"/>
+
+  <resources>
+    <java version="1.6+" java-vm-args="-Djava.security.debug=access,failure"/>
+    <property name="jnlp.versionEnabled" value="false"/>
+     $dependencies
+  </resources>
+
+  <application-desc main-class="$mainClass"/>
+</jnlp>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="$jnlpspec" codebase="http://localhost:8080/webstart/" context="http://localhost:8080" href="mocca.jnlp">
+
+  <information>
+    <title>${project.Description}</title>
+    <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
+    <homepage href="${project.Url}"/>
+    <description>${project.Description} (BKU) MOCCA Web Start</description>
+    <description kind="short">${project.Description}</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"/>
+    <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="splash" href="img/splash.png"/>
+    <shortcut online="true">
+      <desktop/>
+      <menu submenu="e-Government"/>
+    </shortcut>
+
+    <offline-allowed/>
+
+  </information>
+  
+  <security>
+    <all-permissions/>
+  </security>
+
+  <update check="timeout" policy="prompt-update"/>
+
+  <resources os="Mac OS X">
+    <java version="1.6+" java-vm-args="-d32"/>
+     $dependencies
+  </resources>
+
+  <resources>
+    <java version="1.6+"/>
+     $dependencies
+  </resources>
+
+  <application-desc main-class="$mainClass"/>
+</jnlp>
\ 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 @@
     <module>BKUHelp</module>
     <module>BKUGuiExt</module>
     <module>smccSTALExt</module>
+    <module>BKUWebStartPackage</module>
   </modules>
   <developers>
     <developer>
@@ -83,7 +84,7 @@
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.2-beta-2</version>
+          <version>2.2-beta-4</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -123,29 +124,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>${basedir}/src/main/assemblies/assembly-test.xml</descriptor>
-						<!--
-							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor -->
-          </descriptors>
-        </configuration>
-				<!--
-					don't include execution here, but explicitly in the execute command
-					(see custom goals: mvn clean package assembly:assembly) | NOTE:
-					Because of a quirk in Maven 2.0's execution model relating to
-					aggregator mojos and the inheritance hierarchy, | we need to
-					explicitly execute the package phase ahead of the assembly
-					invocation, to ensure all modules have been built. <executions>
-					<execution> <phase>package</phase> <goals> <goal>attached</goal>
-					</goals> </execution> </executions -->
-      </plugin>
-    </plugins>
   </build>
   <repositories>
     <repository>