summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2018-09-07 09:33:53 (GMT)
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2018-09-07 09:33:53 (GMT)
commite6817d60624b7e3f97b579fe5b280f829b78902f (patch)
tree6ada5183838d5a9de4afad417c64faf99f0822c0
parent03bee4398bd2aff20fdcb1dee3419c5110145a02 (diff)
downloadmocca-e6817d60624b7e3f97b579fe5b280f829b78902f.zip
mocca-e6817d60624b7e3f97b579fe5b280f829b78902f.tar.gz
mocca-e6817d60624b7e3f97b579fe5b280f829b78902f.tar.bz2
refactored mocca updater
-rw-r--r--Mocca-Installer/mocca.aip58
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/Constants.java (renamed from utils/src/main/java/at/gv/egiz/upater/Constants.java)2
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java (renamed from utils/src/main/java/at/gv/egiz/upater/MoccaUpdater.java)2
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java (renamed from utils/src/main/java/at/gv/egiz/upater/NewVersionDialog.java)5
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/VersionComparator.java (renamed from utils/src/main/java/at/gv/egiz/upater/VersionComparator.java)2
5 files changed, 36 insertions, 33 deletions
diff --git a/Mocca-Installer/mocca.aip b/Mocca-Installer/mocca.aip
index 4e85408..643d646 100644
--- a/Mocca-Installer/mocca.aip
+++ b/Mocca-Installer/mocca.aip
@@ -28,33 +28,47 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
<ROW Component="AI_ExePath" ComponentId="{F2CAAFDB-7455-4F6F-8F1D-0E7BED07A2D1}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
- <ROW Component="BKUCertificates1.1.17SNAPSHOT.jar" ComponentId="{1FF0F239-2C82-40F2-B0EF-BB71BD52E142}" Directory_="BKUWebStart1.3.35SNAPSHOT_Dir" Attributes="0" KeyPath="BKUCertificates1.1.17SNAPSHOT.jar" Type="0"/>
- <ROW Component="BKUWebStart1.3.35SNAPSHOT.jar" ComponentId="{7BD85F5D-E41B-4FAA-A8A1-5BB8BEF97FFC}" Directory_="BKUWebStart1.3.35SNAPSHOT_Dir" Attributes="0" KeyPath="BKUWebStart1.3.35SNAPSHOT.jar"/>
+ <ROW Component="BKUWebStart1.3.35SNAPSHOT.jar" ComponentId="{F229CF58-4D43-4A2F-B27D-E846CF69BC31}" Directory_="BKUWebStart1.3.35SNAPSHOT_Dir" Attributes="0" KeyPath="BKUWebStart1.3.35SNAPSHOT.jar"/>
<ROW Component="ProductInformation" ComponentId="{6ABC7414-EEA9-42A2-8325-439B99DC55BE}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
- <ROW Component="SHORTCUTDIR" ComponentId="{AA5A32EB-638A-44B8-BEB7-885EA4D3CC2B}" Directory_="SHORTCUTDIR" Attributes="0"/>
+ <ROW Component="SHORTCUTDIR" ComponentId="{F348987E-2E1E-45D5-83FA-4870071E8A57}" Directory_="SHORTCUTDIR" Attributes="0"/>
<ROW Component="chip128.png" ComponentId="{9ECA3CF2-15FB-4CC5-A022-A9838F884F87}" Directory_="img_Dir" Attributes="0" KeyPath="chip128.png" Type="0"/>
+ <ROW Component="jaxbcore2.3.0.jar" ComponentId="{37A2840F-6FF3-454D-B3A6-89D5BD1470D9}" Directory_="BKUWebStart1.3.35SNAPSHOT_Dir" Attributes="0" KeyPath="jaxbcore2.3.0.jar" 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 BKUCertificates1.1.17SNAPSHOT.jar BKUWebStart1.3.35SNAPSHOT.jar ProductInformation SHORTCUTDIR chip128.png"/>
+ <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath BKUWebStart1.3.35SNAPSHOT.jar ProductInformation SHORTCUTDIR chip128.png jaxbcore2.3.0.jar"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
- <ROW File="BKUCertificates1.1.17SNAPSHOT.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="BKUCer~1.jar|BKUCertificates-1.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\BKUCertificates-1.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="BKUWebStart1.3.35SNAPSHOT.jar"/>
- <ROW File="BKUWebStart1.3.35SNAPSHOT.jar" Component_="BKUWebStart1.3.35SNAPSHOT.jar" FileName="BKUWeb~1.jar|BKUWebStart-1.3.35-SNAPSHOT.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\BKUWebStart-1.3.35-SNAPSHOT.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>
+ <ROW File="BKUCertificates1.1.17SNAPSHOT.jar" Component_="jaxbcore2.3.0.jar" FileName="BKUCer~1.jar|BKUCertificates-1.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\BKUCertificates-1.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="BKUWebStart1.3.35SNAPSHOT.jar"/>
+ <ROW File="BKUWebStart1.3.35SNAPSHOT.jar" Component_="BKUWebStart1.3.35SNAPSHOT.jar" FileName="BKUWeb~1.jar|BKUWebStart-1.3.35-SNAPSHOT.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\BKUWebStart-1.3.35-SNAPSHOT.jar" SelfReg="false" NextFile="commonsio2.5.jar"/>
+ <ROW File="FastInfoset1.2.13.jar" Component_="jaxbcore2.3.0.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar"/>
<ROW File="chip128.png" Component_="chip128.png" FileName="chip128.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\chip128.png" SelfReg="false" NextFile="chip16.png"/>
<ROW File="chip16.png" Component_="chip128.png" FileName="chip16.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\chip16.png" SelfReg="false" NextFile="chip24.png"/>
<ROW File="chip24.png" Component_="chip128.png" FileName="chip24.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\chip24.png" SelfReg="false" NextFile="chip32.png"/>
<ROW File="chip32.png" Component_="chip128.png" FileName="chip32.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\chip32.png" SelfReg="false" NextFile="chip48.png"/>
<ROW File="chip48.png" Component_="chip128.png" FileName="chip48.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\chip48.png" SelfReg="false" NextFile="splash.png"/>
- <ROW File="iaik_jce_full_signed5.5.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="chip128.png"/>
- <ROW File="jetty6.1.19.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="jetty-~1.jar|jetty-6.1.19.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jetty-6.1.19.jar" SelfReg="false" NextFile="jettyutil6.1.19.jar"/>
- <ROW File="jettyutil6.1.19.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="jetty-~2.jar|jetty-util-6.1.19.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jetty-util-6.1.19.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>
- <ROW File="log4j1.2.17.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\log4j-1.2.17.jar" SelfReg="false" NextFile="servletapi2.520081211.jar"/>
- <ROW File="servletapi2.520081211.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="servle~1.jar|servlet-api-2.5-20081211.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\servlet-api-2.5-20081211.jar" SelfReg="false" NextFile="slf4japi1.6.4.jar"/>
- <ROW File="slf4japi1.6.4.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.4.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\slf4j-api-1.6.4.jar" SelfReg="false" NextFile="slf4jlog4j121.6.4.jar"/>
- <ROW File="slf4jlog4j121.6.4.jar" Component_="BKUCertificates1.1.17SNAPSHOT.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.4.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\slf4j-log4j12-1.6.4.jar" SelfReg="false"/>
+ <ROW File="commonsio2.5.jar" Component_="jaxbcore2.3.0.jar" FileName="common~1.jar|commons-io-2.5.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\commons-io-2.5.jar" SelfReg="false" NextFile="commonslogging1.2.jar"/>
+ <ROW File="commonslogging1.2.jar" Component_="jaxbcore2.3.0.jar" FileName="common~2.jar|commons-logging-1.2.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\commons-logging-1.2.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>
+ <ROW File="iaik_eccelerate3.01.jar" Component_="jaxbcore2.3.0.jar" FileName="iaik_e~1.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>
+ <ROW File="iaik_jce_full_signed5.5.jar" Component_="jaxbcore2.3.0.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="iaik_xsect_signed1.17.jar"/>
+ <ROW File="iaik_xsect_signed1.17.jar" Component_="jaxbcore2.3.0.jar" FileName="iaik_x~1.jar|iaik_xsect_signed-1.17.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\iaik_xsect_signed-1.17.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>
+ <ROW File="istackcommonsruntime3.0.5.jar" Component_="jaxbcore2.3.0.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>
+ <ROW File="jaxbapi2.3.0.jar" Component_="jaxbcore2.3.0.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jaxb-api-2.3.0.jar" SelfReg="false"/>
+ <ROW File="jaxbcore2.3.0.jar" Component_="jaxbcore2.3.0.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>
+ <ROW File="jaxbruntime2.3.0.jar" Component_="jaxbcore2.3.0.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jetty6.1.19.jar"/>
+ <ROW File="jetty6.1.19.jar" Component_="jaxbcore2.3.0.jar" FileName="jetty-~1.jar|jetty-6.1.19.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jetty-6.1.19.jar" SelfReg="false" NextFile="jettyutil6.1.19.jar"/>
+ <ROW File="jettyutil6.1.19.jar" Component_="jaxbcore2.3.0.jar" FileName="jetty-~2.jar|jetty-util-6.1.19.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\jetty-util-6.1.19.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>
+ <ROW File="log4j1.2.17.jar" Component_="jaxbcore2.3.0.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\log4j-1.2.17.jar" SelfReg="false" NextFile="servletapi2.520081211.jar"/>
+ <ROW File="servletapi2.520081211.jar" Component_="jaxbcore2.3.0.jar" FileName="servle~1.jar|servlet-api-2.5-20081211.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\servlet-api-2.5-20081211.jar" SelfReg="false" NextFile="sjsxp1.0.2.jar"/>
+ <ROW File="sjsxp1.0.2.jar" Component_="jaxbcore2.3.0.jar" FileName="sjsxp-~1.jar|sjsxp-1.0.2.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\sjsxp-1.0.2.jar" SelfReg="false" NextFile="slf4japi1.6.4.jar"/>
+ <ROW File="slf4japi1.6.4.jar" Component_="jaxbcore2.3.0.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.4.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\slf4j-api-1.6.4.jar" SelfReg="false" NextFile="slf4jlog4j121.6.4.jar"/>
+ <ROW File="slf4jlog4j121.6.4.jar" Component_="jaxbcore2.3.0.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.4.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\slf4j-log4j12-1.6.4.jar" SelfReg="false" NextFile="staxapi1.0.jar"/>
<ROW File="splash.png" Component_="chip128.png" FileName="splash.png" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\splash.png" SelfReg="false" NextFile="version.xml"/>
- <ROW File="version.xml" Component_="chip128.png" FileName="version.xml" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\version.xml" SelfReg="false" NextFile="jetty6.1.19.jar"/>
+ <ROW File="staxapi1.0.jar" Component_="jaxbcore2.3.0.jar" FileName="stax-a~1.jar|stax-api-1.0.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\stax-api-1.0.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>
+ <ROW File="staxex1.7.8.jar" Component_="jaxbcore2.3.0.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>
+ <ROW File="txw22.3.0.jar" Component_="jaxbcore2.3.0.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\txw2-2.3.0.jar" SelfReg="false" NextFile="utils1.3.35SNAPSHOT.jar"/>
+ <ROW File="utils1.3.35SNAPSHOT.jar" Component_="jaxbcore2.3.0.jar" FileName="utils-~1.jar|utils-1.3.35-SNAPSHOT.jar" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\utils-1.3.35-SNAPSHOT.jar" SelfReg="false" NextFile="BKUCertificates1.1.17SNAPSHOT.jar"/>
+ <ROW File="version.xml" Component_="chip128.png" FileName="version.xml" Attributes="0" SourcePath="..\BKUWebStart\target\BKUWebStart-1.3.35-SNAPSHOT\img\version.xml" SelfReg="false" NextFile="jaxbcore2.3.0.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"/>
@@ -124,7 +138,6 @@
<ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
- <ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
<ROW Action="AI_DATA_SETTER" Type="51" Source="AI_ExtractFiles" Target="[AI_SETUPEXEPATH]"/>
<ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
@@ -150,7 +163,7 @@
<ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
- <ROW Name="BKUWebStart1.3.35SNAPSHOT.exe" SourcePath="img\chip128_g6y_icon.ico" Index="0"/>
+ <ROW Name="BKUWebStart1.3.35SNAPSHOT.exe" SourcePath="icon\chip128_g6y_icon.ico" Index="0"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
<ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
@@ -159,7 +172,6 @@
<ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
<ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
- <ROW Action="AI_AppSearchEx" Sequence="102"/>
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="DefaultBuild"/>
<ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101" Builds="DefaultBuild"/>
<ROW Action="AI_DeleteCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="199" Builds="DefaultBuild"/>
@@ -177,7 +189,6 @@
<ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
<ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
- <ROW Action="AI_AppSearchEx" Sequence="102"/>
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
<ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101"/>
</COMPONENT>
@@ -194,8 +205,8 @@
<ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
- <ROW Shortcut="BKUWebStart1.3.35SNAPSHOT" Directory_="SHORTCUTDIR" Name="Mocca" Component_="BKUWebStart1.3.35SNAPSHOT.jar" Target="[#BKUWebStart1.3.35SNAPSHOT.jar]" Hotkey="0" Icon_="BKUWebStart1.3.35SNAPSHOT.exe" IconIndex="0" ShowCmd="1" WkDir="BKUWebStart1.3.35SNAPSHOT_Dir"/>
- <ROW Shortcut="Mocca" Directory_="DesktopFolder" Name="Mocca" Component_="BKUWebStart1.3.35SNAPSHOT.jar" Target="[#BKUWebStart1.3.35SNAPSHOT.jar]" Hotkey="0" Icon_="BKUWebStart1.3.35SNAPSHOT.exe" IconIndex="0" ShowCmd="1" WkDir="BKUWebStart1.3.35SNAPSHOT_Dir"/>
+ <ROW Shortcut="BKUWebStart1.3.35SNAPSHOT" Directory_="SHORTCUTDIR" Name="MOCCA" Component_="BKUWebStart1.3.35SNAPSHOT.jar" Target="[#BKUWebStart1.3.35SNAPSHOT.jar]" Hotkey="0" Icon_="BKUWebStart1.3.35SNAPSHOT.exe" IconIndex="0" ShowCmd="1" WkDir="BKUWebStart1.3.35SNAPSHOT_Dir"/>
+ <ROW Shortcut="MOCCA" Directory_="DesktopFolder" Name="MOCCA" Component_="BKUWebStart1.3.35SNAPSHOT.jar" Target="[#BKUWebStart1.3.35SNAPSHOT.jar]" Hotkey="0" Icon_="BKUWebStart1.3.35SNAPSHOT.exe" IconIndex="0" ShowCmd="1" WkDir="BKUWebStart1.3.35SNAPSHOT_Dir"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
<ATTRIBUTE name="UsedTheme" value="classic"/>
@@ -204,11 +215,4 @@
<ROW UpgradeCode="[|UpgradeCode]" VersionMax="[|ProductVersion]" Attributes="1025" ActionProperty="OLDPRODUCTS"/>
<ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
</COMPONENT>
- <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
- <ROW PrereqKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C" DisplayName="Java Runtime Environment" VersionMin="1.6.0" SetupFileUrl="http://www.java.com" Location="2" ExactSize="0" Operator="1"/>
- <ATTRIBUTE name="PrereqsOrder" value="EC39D_0B8D_4C2E_A373_7F11E2281A4C"/>
- </COMPONENT>
- <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
- <ROW SearchKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C_JRE_SEARCH" Prereq="EC39D_0B8D_4C2E_A373_7F11E2281A4C" SearchType="1" SearchString="HKLM\SOFTWARE\JavaSoft\Java Runtime Environment" VerMin="1.6.0" Order="1" Property="AI_JRE_PREREQSEARCH_PROP"/>
- </COMPONENT>
</DOCUMENT>
diff --git a/utils/src/main/java/at/gv/egiz/upater/Constants.java b/utils/src/main/java/at/gv/egiz/updater/Constants.java
index 5a61003..e836bae 100644
--- a/utils/src/main/java/at/gv/egiz/upater/Constants.java
+++ b/utils/src/main/java/at/gv/egiz/updater/Constants.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.upater;
+package at.gv.egiz.updater;
public class Constants {
diff --git a/utils/src/main/java/at/gv/egiz/upater/MoccaUpdater.java b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java
index c6907ac..1e1bc6c 100644
--- a/utils/src/main/java/at/gv/egiz/upater/MoccaUpdater.java
+++ b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.upater;
+package at.gv.egiz.updater;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/utils/src/main/java/at/gv/egiz/upater/NewVersionDialog.java b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java
index 2199b7f..2765bc8 100644
--- a/utils/src/main/java/at/gv/egiz/upater/NewVersionDialog.java
+++ b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.upater;
+package at.gv.egiz.updater;
import java.awt.BorderLayout;
import java.awt.Desktop;
@@ -19,7 +19,6 @@ import javax.swing.JLabel;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
-import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -60,7 +59,7 @@ public class NewVersionDialog extends JDialog {
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(null);
- BufferedImage myPicture = ImageIO.read(new File("C:/Users/aabraham/Downloads/information-icon.png"));
+ BufferedImage myPicture = ImageIO.read(getClass().getResource("/at/gv/egiz/updater/information-icon.png"));
ImageIcon icon = new ImageIcon(myPicture.getScaledInstance(50, 50, Image.SCALE_SMOOTH));
{
JLabel lblNewVersion = new JLabel("New Mocca Version " + version + " available.");
diff --git a/utils/src/main/java/at/gv/egiz/upater/VersionComparator.java b/utils/src/main/java/at/gv/egiz/updater/VersionComparator.java
index c1196cf..19a96a6 100644
--- a/utils/src/main/java/at/gv/egiz/upater/VersionComparator.java
+++ b/utils/src/main/java/at/gv/egiz/updater/VersionComparator.java
@@ -13,7 +13,7 @@
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
-package at.gv.egiz.upater;
+package at.gv.egiz.updater;
// Imports
import java.util.Comparator;