43 files changed, 307 insertions, 2 deletions
diff --git a/Mocca-Installer/.gitignore b/Mocca-Installer/.gitignore
index 76780025..31efc292 100644
--- a/Mocca-Installer/.gitignore
+++ b/Mocca-Installer/.gitignore
@@ -1,2 +1,6 @@
 mocca-cache
-mocca-SetupFiles
-\ No newline at end of file
+mocca-SetupFiles
+installer/linux/*
+installer/mac/*
+installer/win/*
+installer/tmp/*
+\ No newline at end of file
diff --git a/Mocca-Installer/installer/README.md b/Mocca-Installer/installer/README.md
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/Mocca-Installer/installer/README.md
diff --git a/Mocca-Installer/installer/create_installer.sh b/Mocca-Installer/installer/create_installer.sh
new file mode 100644
index 00000000..ac2be59f
--- /dev/null
+++ b/Mocca-Installer/installer/create_installer.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# check version and snapshot
+
+WORKINGDIR=($PWD)
+echo $WORKINGDIR
+cd ../../BKUWebStart/target
+VERSIONNUMBER=$(find -name "BKUWebStart*.zip")
+VERSIONNUMBER=${VERSIONNUMBER#.*-}
+LENGTH=${#VERSIONNUMBER}
+VERSION=${VERSIONNUMBER:0:LENGTH-4}
+
+
+cd $WORKINGDIR
+echo Version number $VERSION
+
+array=(win linux mac tmp)
+
+for i in "${array[@]}"
+do
+	echo creating directory $i
+	rm -rf $i
+	mkdir $i
+	mkdir $i/bin
+done
+
+cp ../../BKUWebStart/target/BKUWebStart-$VERSION.zip tmp/mocca-$VERSION.zip
+cd tmp 
+unzip mocca-$VERSION.zip
+
+# remove unnecessary files 
+rm -f mocca.jnlp
+rm -f player.jnlp
+rm -f mocca-$VERSION.zip
+rm -rf bin
+rm -rf img
+mv BKUWebStart-1.3.35-SNAPSHOT.jar mocca.jar
+
+#prepare packages 
+echo preparing packages...
+cd .. 
+cp -r tmp/* win/bin
+cp -r tmp/* linux/bin
+cp -r tmp/* mac/bin 
+cp files/win/mocca_win.bat win/mocca_win.bat
+cp files/linux/mocca_linux.sh linux/mocca_linux.sh 
+cp -r files/mac/Mocca.app mac/Mocca.app
+cp -r files/icon win/
+echo preparing packages... done!
+echo preparing windows package... done!
+
+#generating linux package
+echo generating linux zip...
+cd linux 
+chmod -R +x * 
+zip -r mocca-$VERSION.zip * 
+cd ..
+echo generating linux zip... done!
+
+
+#generating mac package 
+echo generating mac app...
+cd mac
+rm -rf Mocca.app/Contents/Java/*
+cp -r bin/ Mocca.app/Contents/Java/
+echo generating mac app... done!
+
+#cleanup
+rm -rf tmp
+
+
+
diff --git a/Mocca-Installer/installer/files/icon/chip128.icns b/Mocca-Installer/installer/files/icon/chip128.icns
new file mode 100644
index 00000000..befa4763
--- /dev/null
+++ b/Mocca-Installer/installer/files/icon/chip128.icns
diff --git a/Mocca-Installer/installer/files/icon/chip128.ico b/Mocca-Installer/installer/files/icon/chip128.ico
new file mode 100644
index 00000000..d04adfc9
--- /dev/null
+++ b/Mocca-Installer/installer/files/icon/chip128.ico
diff --git a/Mocca-Installer/installer/files/linux/mocca_linux.sh b/Mocca-Installer/installer/files/linux/mocca_linux.sh
new file mode 100644
index 00000000..5f0b65c1
--- /dev/null
+++ b/Mocca-Installer/installer/files/linux/mocca_linux.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+#This is a start script for mocca on linux
+java -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar "bin/mocca.jar"
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist
new file mode 100644
index 00000000..eb4095cc
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Info.plist
@@ -0,0 +1,66 @@
+<?xml version="1.0" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <!-- This file was autogenerated by jar2app 1.0.1 (https://github.com/Jorl17/jar2app) -->
+    <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+
+    <key>CFBundleExecutable</key>
+    <string>JavaAppLauncher</string>
+
+    <key>CFBundleIconFile</key>
+    <string></string>
+
+    <key>CFBundleIdentifier</key>
+    <string>com.jar2app.example.BKUWebStart-1.3.35-SNAPSHOT</string>
+
+    <key>CFBundleDisplayName</key>
+    <string>BKUWebStart-1.3.35-SNAPSHOT</string>
+
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+
+    <key>CFBundleName</key>
+    <string>BKUWebStart-1.3.35-SNAPSHOT</string>
+
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
+
+    <key>CFBundleShortVersionString</key>
+    <string>1.0.1</string>
+
+    <key>CFBundleSignature</key>
+    <string>????</string>
+
+    <key>CFBundleVersion</key>
+    <string>1.0.1</string>
+
+    <key>NSHumanReadableCopyright</key>
+    <string></string>
+
+    
+
+    <key>JVMMainClassName</key>
+    <string>at.gv.egiz.bku.webstart.Launcher</string>
+
+    <key>JVMOptions</key>
+    <array>
+        <string>-Duser.dir=$APP_ROOT/Contents</string>
+	<string>-Djavax.net.ssl.trustStoreType=jks</string>
+	<string>-Djavax.net.ssl.keyStoreType=jks</string>        
+	<string>-Xdock:name=BKUWebStart-1.3.35-SNAPSHOT</string>
+    </array>
+
+    <key>JVMArguments</key>
+    <array>
+
+    </array>
+
+    </dict>
+</plist>
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar
new file mode 100644
index 00000000..661a1cd1
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUCertificates-1.1.17-SNAPSHOT.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar
new file mode 100644
index 00000000..9e603941
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/BKUWebStart-1.3.35-SNAPSHOT.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar
new file mode 100644
index 00000000..2501c271
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/FastInfoset-1.2.13.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar
new file mode 100644
index 00000000..8d9a5e37
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/commons-io-2.5.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar
new file mode 100644
index 00000000..9d5cacce
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_eccelerate-3.01.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar
new file mode 100644
index 00000000..821cbd9d
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_jce_full_signed-5.5.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar
new file mode 100644
index 00000000..e786aa68
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/iaik_xsect_signed-1.17.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png
new file mode 100644
index 00000000..c36d8079
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip128.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png
new file mode 100644
index 00000000..96b580e9
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip16.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png
new file mode 100644
index 00000000..efd6dbeb
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip24.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png
new file mode 100644
index 00000000..e7efb020
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip32.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png
new file mode 100644
index 00000000..491fbcac
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/chip48.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png
new file mode 100644
index 00000000..597fbc60
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/splash.png
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/img/version.xml
new file mode 100644
index 00000000..944406eb
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/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/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar
new file mode 100644
index 00000000..52483bbd
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/istack-commons-runtime-3.0.5.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar
new file mode 100644
index 00000000..5495d3fb
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-api-2.3.0.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar
new file mode 100644
index 00000000..a5791ae8
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-core-2.3.0.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar
new file mode 100644
index 00000000..684e3d40
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jaxb-runtime-2.3.0.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar
new file mode 100644
index 00000000..bec744e4
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-6.1.19.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar
new file mode 100644
index 00000000..771f89ee
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/jetty-util-6.1.19.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar
new file mode 100644
index 00000000..6489ab52
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/log4j-1.2.17.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp
new file mode 100644
index 00000000..8575eda8
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/mocca.jnlp
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://localhost:8080/webstart/" context="http://localhost:8080/" href="mocca.jnlp">
+
+  <information>
+    <title>MOCCA Webstart Unstable</title>
+    <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
+    <homepage href="http://joinup.ec.europa.eu/site/mocca/"/>
+    <description>MOCCA Webstart - Unstable Build</description>
+    <description kind="short">MOCCA Webstart Unstable</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="shortcut" href="img/chip128.png" width="128" height="128"/>
+    <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="default" href="img/chip128.png" width="128" height="128"/>
+    <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.7+" />
+    <java version="1.6" java-vm-args="-d32"/>
+         
+    <jar href="BKUWebStart-1.3.35-SNAPSHOT.jar" main="true"/>
+    <jar href="BKUCertificates-1.1.17-SNAPSHOT.jar"/>
+    <jar href="iaik_jce_full_signed-5.5.jar"/>
+    <jar href="utils-1.3.35-SNAPSHOT.jar"/>
+    <jar href="iaik_eccelerate-3.01.jar"/>
+    <jar href="iaik_xsect_signed-1.17.jar"/>
+    <jar href="jaxb-runtime-2.3.0.jar"/>
+    <jar href="jaxb-core-2.3.0.jar"/>
+    <jar href="jaxb-api-2.3.0.jar"/>
+    <jar href="txw2-2.3.0.jar"/>
+    <jar href="istack-commons-runtime-3.0.5.jar"/>
+    <jar href="stax-ex-1.7.8.jar"/>
+    <jar href="FastInfoset-1.2.13.jar"/>
+    <jar href="sjsxp-1.0.2.jar"/>
+    <jar href="stax-api-1.0.jar"/>
+    <jar href="commons-io-2.5.jar"/>
+    <jar href="jetty-6.1.19.jar"/>
+    <jar href="jetty-util-6.1.19.jar"/>
+    <jar href="servlet-api-2.5-20081211.jar"/>
+    <jar href="slf4j-api-1.6.4.jar"/>
+    <jar href="slf4j-log4j12-1.6.4.jar"/>
+    <jar href="log4j-1.2.17.jar"/>
+
+  </resources>
+
+  <resources>
+    <java version="1.6+"/>
+         
+    <jar href="BKUWebStart-1.3.35-SNAPSHOT.jar" main="true"/>
+    <jar href="BKUCertificates-1.1.17-SNAPSHOT.jar"/>
+    <jar href="iaik_jce_full_signed-5.5.jar"/>
+    <jar href="utils-1.3.35-SNAPSHOT.jar"/>
+    <jar href="iaik_eccelerate-3.01.jar"/>
+    <jar href="iaik_xsect_signed-1.17.jar"/>
+    <jar href="jaxb-runtime-2.3.0.jar"/>
+    <jar href="jaxb-core-2.3.0.jar"/>
+    <jar href="jaxb-api-2.3.0.jar"/>
+    <jar href="txw2-2.3.0.jar"/>
+    <jar href="istack-commons-runtime-3.0.5.jar"/>
+    <jar href="stax-ex-1.7.8.jar"/>
+    <jar href="FastInfoset-1.2.13.jar"/>
+    <jar href="sjsxp-1.0.2.jar"/>
+    <jar href="stax-api-1.0.jar"/>
+    <jar href="commons-io-2.5.jar"/>
+    <jar href="jetty-6.1.19.jar"/>
+    <jar href="jetty-util-6.1.19.jar"/>
+    <jar href="servlet-api-2.5-20081211.jar"/>
+    <jar href="slf4j-api-1.6.4.jar"/>
+    <jar href="slf4j-log4j12-1.6.4.jar"/>
+    <jar href="log4j-1.2.17.jar"/>
+
+  </resources>
+
+  <application-desc main-class="at.gv.egiz.bku.webstart.Launcher"/>
+</jnlp>
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/player.jnlp
new file mode 100644
index 00000000..d4f97dbc
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/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/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar
new file mode 100644
index 00000000..b5447355
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/servlet-api-2.5-20081211.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar
new file mode 100644
index 00000000..9ee61671
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/sjsxp-1.0.2.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar
new file mode 100644
index 00000000..c0e8273e
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-api-1.6.4.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar
new file mode 100644
index 00000000..7aca6728
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/slf4j-log4j12-1.6.4.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar
new file mode 100644
index 00000000..82422e32
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-api-1.0.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar
new file mode 100644
index 00000000..81e56f9c
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/stax-ex-1.7.8.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar
new file mode 100644
index 00000000..613b55b1
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/txw2-2.3.0.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar
new file mode 100644
index 00000000..ec4a104f
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Java/utils-1.3.35-SNAPSHOT.jar
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher
new file mode 100644
index 00000000..7bddebea
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/MacOS/JavaAppLauncher
diff --git a/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings
new file mode 100644
index 00000000..0d306aaa
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/Mocca.app/Contents/Resources/en.lproj/Localizable.strings
@@ -0,0 +1,3 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
diff --git a/Mocca-Installer/installer/files/mac/mocca_mac.sh b/Mocca-Installer/installer/files/mac/mocca_mac.sh
new file mode 100644
index 00000000..ed26750e
--- /dev/null
+++ b/Mocca-Installer/installer/files/mac/mocca_mac.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+#This is a start script for mocca on mac
+java -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar "BKUWebStart-1.3.35-SNAPSHOT.jar"
diff --git a/Mocca-Installer/installer/files/win/mocca_win.bat b/Mocca-Installer/installer/files/win/mocca_win.bat
new file mode 100644
index 00000000..a932721c
--- /dev/null
+++ b/Mocca-Installer/installer/files/win/mocca_win.bat
@@ -0,0 +1,4 @@
+REM This is a start script for mocca on windows 
+echo off 
+start /b javaw -Djavax.net.ssl.trustStoreType=jks -Djavax.net.ssl.keyStoreType=jks -jar bin\mocca.jar
+
diff --git a/utils/src/test/requests/CreateXMLSignatureRequest02.xml_bound.xml b/utils/src/test/requests/CreateXMLSignatureRequest02.xml_bound.xml
index 2816598c..54af272b 100644
--- a/utils/src/test/requests/CreateXMLSignatureRequest02.xml_bound.xml
+++ b/utils/src/test/requests/CreateXMLSignatureRequest02.xml_bound.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:CreateXMLSignatureRequest xmlns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns2="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"><ns2:KeyboxIdentifier>SecureSignatureKeypair</ns2:KeyboxIdentifier><ns2:DataObjectInfo Structure="detached"><ns2:DataObject Reference=""/><ns2:TransformsInfo><ns2:FinalDataMetaInfo><ns2:MimeType>application/xhtml+xml</ns2:MimeType></ns2:FinalDataMetaInfo></ns2:TransformsInfo><ns2:TransformsInfo><ns2:FinalDataMetaInfo><ns2:MimeType>text/html</ns2:MimeType></ns2:FinalDataMetaInfo></ns2:TransformsInfo></ns2:DataObjectInfo><ns2:SignatureInfo><ns2:SignatureEnvironment><ns2:XMLContent/></ns2:SignatureEnvironment><ns2:SignatureLocation Index="2">/saml:Assertion</ns2:SignatureLocation></ns2:SignatureInfo></ns2:CreateXMLSignatureRequest>
-\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><CreateXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"><KeyboxIdentifier>SecureSignatureKeypair</KeyboxIdentifier><DataObjectInfo Structure="detached"><DataObject Reference=""/><TransformsInfo><FinalDataMetaInfo><MimeType>application/xhtml+xml</MimeType></FinalDataMetaInfo></TransformsInfo><TransformsInfo><FinalDataMetaInfo><MimeType>text/html</MimeType></FinalDataMetaInfo></TransformsInfo></DataObjectInfo><SignatureInfo><SignatureEnvironment><XMLContent/></SignatureEnvironment><SignatureLocation Index="2">/saml:Assertion</SignatureLocation></SignatureInfo></CreateXMLSignatureRequest>
+\ No newline at end of file