mocca linux script changed line endings to unix

2 files changed, 30 insertions, 30 deletions

diff --git a/Mocca-Installer/installer/files/linux/mocca_linux.sh b/Mocca-Installer/installer/files/linux/mocca_linux.sh
index 5f0b65c1..0b99dbb2 100644
--- a/Mocca-Installer/installer/files/linux/mocca_linux.sh
+++ b/Mocca-Installer/installer/files/linux/mocca_linux.sh
@@ -1,4 +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"

+#!/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/mocca.aip b/Mocca-Installer/mocca.aip
index 4bca07b4..ba2754af 100644
--- a/Mocca-Installer/mocca.aip
+++ b/Mocca-Installer/mocca.aip
@@ -33,38 +33,38 @@
     <ROW Component="ProductInformation" ComponentId="{6ABC7414-EEA9-42A2-8325-439B99DC55BE}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>

     <ROW Component="SHORTCUTDIR" ComponentId="{D47BA79D-CAB2-4E31-A5F0-00AAD25B9174}" Directory_="SHORTCUTDIR" Attributes="0"/>

     <ROW Component="chip128.icns" ComponentId="{9098EAF5-70B2-4980-8688-DDA9A8BFBDC7}" Directory_="icon_Dir" Attributes="0" KeyPath="chip128.ico" Type="0"/>

-    <ROW Component="iaik_jce_full_signed5.5.jar" ComponentId="{B15B954E-5C4D-41ED-A877-0E393D484915}" Directory_="bin_Dir" Attributes="0" KeyPath="iaik_jce_full_signed5.5.jar" Type="0"/>

+    <ROW Component="iaik_xsect2.13.jar" ComponentId="{E08DC91C-1C19-4491-9B2D-55352B543C77}" Directory_="bin_Dir" Attributes="0" KeyPath="iaik_xsect2.13.jar" Type="0"/>

     <ROW Component="mocca_win.bat" ComponentId="{E8F10C9D-A9D3-446D-A9C8-6871000D7E82}" Directory_="BKUWebStart1.3.35SNAPSHOT_Dir" Attributes="0" KeyPath="mocca_win.bat" Type="0"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">

-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath ProductInformation SHORTCUTDIR chip128.icns iaik_jce_full_signed5.5.jar mocca_win.bat"/>

+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath ProductInformation SHORTCUTDIR chip128.icns iaik_xsect2.13.jar mocca_win.bat"/>

     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">

-    <ROW File="BKUCertificates1.1.17SNAPSHOT.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="BKUCer~1.jar|BKUCertificates-1.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="installer\win\bin\BKUCertificates-1.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="commonsio2.5.jar"/>

-    <ROW File="FastInfoset1.2.13.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="installer\win\bin\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar"/>

-    <ROW File="chip128.ico" Component_="chip128.icns" FileName="chip128.ico" Attributes="0" SourcePath="installer\win\icon\chip128.ico" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>

-    <ROW File="commonsio2.5.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="common~1.jar|commons-io-2.5.jar" Attributes="0" SourcePath="installer\win\bin\commons-io-2.5.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>

-    <ROW File="iaik_eccelerate3.01.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="iaik_e~1.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="installer\win\bin\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="mocca_win.bat"/>

-    <ROW File="iaik_jce_full_signed5.5.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="installer\win\bin\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="iaik_xsect_signed1.17.jar"/>

-    <ROW File="iaik_xsect_signed1.17.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="iaik_x~1.jar|iaik_xsect_signed-1.17.jar" Attributes="0" SourcePath="installer\win\bin\iaik_xsect_signed-1.17.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>

-    <ROW File="istackcommonsruntime3.0.5.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="installer\win\bin\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>

-    <ROW File="jaxbapi2.3.0.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar"/>

-    <ROW File="jaxbcore2.3.0.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>

-    <ROW File="jaxbruntime2.3.0.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jetty6.1.19.jar"/>

-    <ROW File="jetty6.1.19.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="jetty-~1.jar|jetty-6.1.19.jar" Attributes="0" SourcePath="installer\win\bin\jetty-6.1.19.jar" SelfReg="false" NextFile="jettyutil6.1.19.jar"/>

-    <ROW File="jettyutil6.1.19.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="jetty-~2.jar|jetty-util-6.1.19.jar" Attributes="0" SourcePath="installer\win\bin\jetty-util-6.1.19.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>

-    <ROW File="log4j1.2.17.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="installer\win\bin\log4j-1.2.17.jar" SelfReg="false" NextFile="mocca.jar"/>

-    <ROW File="mocca.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="mocca.jar" Attributes="0" SourcePath="installer\win\bin\mocca.jar" SelfReg="false" NextFile="servletapi2.520081211.jar"/>

-    <ROW File="mocca_win.bat" Component_="mocca_win.bat" FileName="mocca_~1.bat|mocca_win.bat" Attributes="0" SourcePath="installer\win\mocca_win.bat" SelfReg="false"/>

-    <ROW File="servletapi2.520081211.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="servle~1.jar|servlet-api-2.5-20081211.jar" Attributes="0" SourcePath="installer\win\bin\servlet-api-2.5-20081211.jar" SelfReg="false" NextFile="sjsxp1.0.2.jar"/>

-    <ROW File="sjsxp1.0.2.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="sjsxp-~1.jar|sjsxp-1.0.2.jar" Attributes="0" SourcePath="installer\win\bin\sjsxp-1.0.2.jar" SelfReg="false" NextFile="slf4japi1.6.4.jar"/>

-    <ROW File="slf4japi1.6.4.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.4.jar" Attributes="0" SourcePath="installer\win\bin\slf4j-api-1.6.4.jar" SelfReg="false" NextFile="slf4jlog4j121.6.4.jar"/>

-    <ROW File="slf4jlog4j121.6.4.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.4.jar" Attributes="0" SourcePath="installer\win\bin\slf4j-log4j12-1.6.4.jar" SelfReg="false" NextFile="staxapi1.0.jar"/>

-    <ROW File="staxapi1.0.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="stax-a~1.jar|stax-api-1.0.jar" Attributes="0" SourcePath="installer\win\bin\stax-api-1.0.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>

-    <ROW File="staxex1.7.8.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="installer\win\bin\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>

-    <ROW File="txw22.3.0.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\txw2-2.3.0.jar" SelfReg="false" NextFile="utils1.3.35SNAPSHOT.jar"/>

-    <ROW File="utils1.3.35SNAPSHOT.jar" Component_="iaik_jce_full_signed5.5.jar" FileName="utils-~1.jar|utils-1.3.35-SNAPSHOT.jar" Attributes="0" SourcePath="installer\win\bin\utils-1.3.35-SNAPSHOT.jar" SelfReg="false" NextFile="BKUCertificates1.1.17SNAPSHOT.jar"/>

+    <ROW File="BKUCertificates1.1.17SNAPSHOT.jar" Component_="iaik_xsect2.13.jar" FileName="BKUCer~1.jar|BKUCertificates-1.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="installer\win\bin\BKUCertificates-1.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="commonsio2.5.jar"/>

+    <ROW File="FastInfoset1.2.13.jar" Component_="iaik_xsect2.13.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="installer\win\bin\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="iaik_eccelerate5.0.jar"/>

+    <ROW File="chip128.ico" Component_="chip128.icns" FileName="chip128.ico" Attributes="0" SourcePath="installer\win\icon\chip128.ico" SelfReg="false" NextFile="mocca_win.bat"/>

+    <ROW File="commonsio2.5.jar" Component_="iaik_xsect2.13.jar" FileName="common~1.jar|commons-io-2.5.jar" Attributes="0" SourcePath="installer\win\bin\commons-io-2.5.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>

+    <ROW File="iaik_eccelerate5.0.jar" Component_="iaik_xsect2.13.jar" FileName="iaik_e~1.jar|iaik_eccelerate-5.0.jar" Attributes="0" SourcePath="installer\win\bin\iaik_eccelerate-5.0.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.52.jar"/>

+    <ROW File="iaik_jce_full_signed5.52.jar" Component_="iaik_xsect2.13.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.52.jar" Attributes="0" SourcePath="installer\win\bin\iaik_jce_full_signed-5.52.jar" SelfReg="false"/>

+    <ROW File="iaik_xsect2.13.jar" Component_="iaik_xsect2.13.jar" FileName="iaik_x~1.jar|iaik_xsect-2.13.jar" Attributes="0" SourcePath="installer\win\bin\iaik_xsect-2.13.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>

+    <ROW File="istackcommonsruntime3.0.5.jar" Component_="iaik_xsect2.13.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="installer\win\bin\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>

+    <ROW File="jaxbapi2.3.0.jar" Component_="iaik_xsect2.13.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar"/>

+    <ROW File="jaxbcore2.3.0.jar" Component_="iaik_xsect2.13.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>

+    <ROW File="jaxbruntime2.3.0.jar" Component_="iaik_xsect2.13.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jetty6.1.19.jar"/>

+    <ROW File="jetty6.1.19.jar" Component_="iaik_xsect2.13.jar" FileName="jetty-~1.jar|jetty-6.1.19.jar" Attributes="0" SourcePath="installer\win\bin\jetty-6.1.19.jar" SelfReg="false" NextFile="jettyutil6.1.19.jar"/>

+    <ROW File="jettyutil6.1.19.jar" Component_="iaik_xsect2.13.jar" FileName="jetty-~2.jar|jetty-util-6.1.19.jar" Attributes="0" SourcePath="installer\win\bin\jetty-util-6.1.19.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>

+    <ROW File="log4j1.2.17.jar" Component_="iaik_xsect2.13.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="installer\win\bin\log4j-1.2.17.jar" SelfReg="false" NextFile="mocca.jar"/>

+    <ROW File="mocca.jar" Component_="iaik_xsect2.13.jar" FileName="mocca.jar" Attributes="0" SourcePath="installer\win\bin\mocca.jar" SelfReg="false" NextFile="servletapi2.520081211.jar"/>

+    <ROW File="mocca_win.bat" Component_="mocca_win.bat" FileName="mocca_~1.bat|mocca_win.bat" Attributes="0" SourcePath="installer\win\mocca_win.bat" SelfReg="false" NextFile="iaik_xsect2.13.jar"/>

+    <ROW File="servletapi2.520081211.jar" Component_="iaik_xsect2.13.jar" FileName="servle~1.jar|servlet-api-2.5-20081211.jar" Attributes="0" SourcePath="installer\win\bin\servlet-api-2.5-20081211.jar" SelfReg="false" NextFile="sjsxp1.0.2.jar"/>

+    <ROW File="sjsxp1.0.2.jar" Component_="iaik_xsect2.13.jar" FileName="sjsxp-~1.jar|sjsxp-1.0.2.jar" Attributes="0" SourcePath="installer\win\bin\sjsxp-1.0.2.jar" SelfReg="false" NextFile="slf4japi1.6.4.jar"/>

+    <ROW File="slf4japi1.6.4.jar" Component_="iaik_xsect2.13.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.4.jar" Attributes="0" SourcePath="installer\win\bin\slf4j-api-1.6.4.jar" SelfReg="false" NextFile="slf4jlog4j121.6.4.jar"/>

+    <ROW File="slf4jlog4j121.6.4.jar" Component_="iaik_xsect2.13.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.4.jar" Attributes="0" SourcePath="installer\win\bin\slf4j-log4j12-1.6.4.jar" SelfReg="false" NextFile="staxapi1.0.jar"/>

+    <ROW File="staxapi1.0.jar" Component_="iaik_xsect2.13.jar" FileName="stax-a~1.jar|stax-api-1.0.jar" Attributes="0" SourcePath="installer\win\bin\stax-api-1.0.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>

+    <ROW File="staxex1.7.8.jar" Component_="iaik_xsect2.13.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="installer\win\bin\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>

+    <ROW File="txw22.3.0.jar" Component_="iaik_xsect2.13.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="installer\win\bin\txw2-2.3.0.jar" SelfReg="false" NextFile="utils1.3.35SNAPSHOT.jar"/>

+    <ROW File="utils1.3.35SNAPSHOT.jar" Component_="iaik_xsect2.13.jar" FileName="utils-~1.jar|utils-1.3.35-SNAPSHOT.jar" Attributes="0" SourcePath="installer\win\bin\utils-1.3.35-SNAPSHOT.jar" SelfReg="false" NextFile="BKUCertificates1.1.17SNAPSHOT.jar"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">

     <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" UseLargeSchema="true" UACExecutionLevel="2"/>