From 84979f098de0022e30a01e1b94e52faa7560fade Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Thu, 14 Dec 2006 17:43:58 +0000
Subject: [PATCH] Fix windows installation and overriding files

---
 resources/install/build.xml                   |  2 +-
 .../install/generic/installer-generic.xml     | 62 +++++++--------
 resources/install/linux/installer-linux.xml   | 79 +++++++++----------
 .../install/windows/installer-windows.xml     | 75 ++++++++----------
 resources/install/windows/launcher.ini        |  2 +-
 5 files changed, 107 insertions(+), 113 deletions(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index f4129f520..c75539f3b 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -154,7 +154,7 @@
 
         <izpack
                input="${basedir}/${inst.resrc}/windows/installer-windows.xml"
-               output="${windows.app.dir}/tmp/sip-communicator-${sip-communicator.version}-windows.jar"
+               output="${windows.app.dir}/tmp/sip-communicator-windows.jar"
                installerType="standard"
                basedir="${basedir}"
                izPackDir="${izpack.dir}/"/>
diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml
index 08693ee30..babf25f0f 100755
--- a/resources/install/generic/installer-generic.xml
+++ b/resources/install/generic/installer-generic.xml
@@ -44,119 +44,119 @@
 		<pack name="lib" required="yes">
 			<description>Include all libraries</description>
 
-			<fileset  targetdir="$INSTALL_PATH/lib" dir="lib">
+			<fileset  targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
 				<include name="kxml-min.jar"/>
                 <include name="felix.jar"/>
                 <include name="servicebinder.jar"/>
                 <include name="BrowserLauncher2.jar"/>
 			</fileset>
-            <fileset  targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle">
+            <fileset  targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true">
 				<include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/>
 			</fileset>
 
 
-			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
-			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
+			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
 		</pack>
 
 		<pack name="util" required="yes">
 			<description>SIP Communicator util</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar" override="true"/>
 		</pack>
 		<pack name="configuration" required="yes">
 			<description>SIP Communicator bundle configuration</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar" override="true"/>
 		</pack>
 		<pack name="file-access" required="yes">
 			<description>SIP Communicator bundle File Access</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar" override="true"/>
 		</pack>
 		<pack name="protocol" required="yes">
 			<description>SIP Communicator bundle Protocol</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar" override="true"/>
 		</pack>
 		<pack name="contactlist" required="yes">
 			<description>SIP Communicator bundle Contactlist</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar" override="true"/>
 		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
 		<pack name="protocol-icq" required="yes">
 			<description>SIP Communicator bundle Protocol ICQ</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar" override="true"/>
 		</pack>
         <pack name="protocol-jabber" required="yes">
 			<description>SIP Communicator bundle Protocol Jabber</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar" override="true"/>
 		</pack>
         <pack name="protocol-sip" required="yes">
 			<description>SIP Communicator bundle Protocol SIP</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar" override="true"/>
 		</pack>
         <pack name="protocol-msn" required="yes">
 			<description>SIP Communicator bundle Protocol MSN</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar" override="true"/>
 		</pack>
         <pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
 		<pack name="netaddress" required="yes">
 			<description>SIP Communicator bundle Network Address</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar" override="true"/>
 		</pack>
 		<pack name="metacontact-list" required="yes">
 			<description>SIP Communicator bundle MetaContact List</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar" override="true"/>
 		</pack>
 		<pack name="history" required="yes">
 			<description>SIP Communicator bundle History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar" override="true"/>
 		</pack>
 		<pack name="msg-history" required="yes">
 			<description>SIP Communicator bundle Message History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar" override="true"/>
 		</pack>
 		<pack name="call-history" required="yes">
 			<description>SIP Communicator bundle Call History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar" override="true"/>
 		</pack>
         <pack name="swing-ui" required="yes">
 			<description>SIP Communicator bundle Swing UI</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar" override="true"/>
 		</pack>
 		<pack name="icqaccregwizz" required="yes">
 			<description>SIP Communicator bundle ICQ Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="jabberaccregwizz" required="yes">
 			<description>SIP Communicator bundle Jabber Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="sipaccregwizz" required="yes">
 			<description>SIP Communicator bundle SIP Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="msnaccregwizz" required="yes">
 			<description>SIP Communicator bundle MSN Account Registrattion Wizzard</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="version" required="yes">
 			<description>SIP Communicator bundle Version</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar" override="true"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar" override="true"/>
 		</pack>
 
 		<!-- The executable files -->
 		<pack name="run" required="yes">
 			<description>Exceutable</description>
 
-                        <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" os="windows"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/windows/sc-logo.ico" os="windows"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" os="windows" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/windows/sc-logo.ico" os="windows" override="true"/>
 			<executable targetfile="$INSTALL_PATH/run.sh" stage="never" os="linux"/>
 			<executable targetfile="$INSTALL_PATH/run.bat" stage="never" os="windows"/>
 		</pack>
diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml
index 10840e968..f390ba228 100755
--- a/resources/install/linux/installer-linux.xml
+++ b/resources/install/linux/installer-linux.xml
@@ -42,115 +42,115 @@
 		<pack name="lib" required="yes">
 			<description>Include all libraries</description>
 
-			<fileset  targetdir="$INSTALL_PATH/lib" dir="lib">
+			<fileset  targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
 				<include name="kxml-min.jar"/>
                 <include name="felix.jar"/>
                 <include name="servicebinder.jar"/>
                 <include name="BrowserLauncher2.jar"/>
 			</fileset>
-            <fileset  targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle">
+            <fileset  targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true">
 				<include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/>
 			</fileset>
 
 
-			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
-			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
+			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
 		</pack>
 
         <pack name="native" required="yes">
 			<description>SIP Communicator Native libs</description>
-			<fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/linux">
+			<fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/linux" override="true">
                 <include name="*"/>
             </fileset>
 		</pack>
 		<pack name="util" required="yes">
 			<description>SIP Communicator util</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar" override="true"/>
 		</pack>
 		<pack name="configuration" required="yes">
 			<description>SIP Communicator bundle configuration</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar" override="true"/>
 		</pack>
 		<pack name="file-access" required="yes">
 			<description>SIP Communicator bundle File Access</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar" override="true"/>
 		</pack>
 		<pack name="protocol" required="yes">
 			<description>SIP Communicator bundle Protocol</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar" override="true"/>
 		</pack>
 		<pack name="contactlist" required="yes">
 			<description>SIP Communicator bundle Contactlist</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar" override="true"/>
 		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
 		<pack name="protocol-icq" required="yes">
 			<description>SIP Communicator bundle Protocol ICQ</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar" override="true"/>
 		</pack>
 		<pack name="protocol-jabber" required="yes">
 			<description>SIP Communicator bundle Protocol Jabber</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar" override="true"/>
 		</pack>
         <pack name="protocol-sip" required="yes">
 			<description>SIP Communicator bundle Protocol SIP</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar" override="true"/>
 		</pack>
         <pack name="protocol-msn" required="yes">
 			<description>SIP Communicator bundle Protocol MSN</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar" override="true"/>
 		</pack>
         <pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
 		<pack name="netaddress" required="yes">
 			<description>SIP Communicator bundle Network Address</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar" override="true"/>
 		</pack>
 		<pack name="metacontact-list" required="yes">
 			<description>SIP Communicator bundle MetaContact List</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar" override="true"/>
 		</pack>
 		<pack name="history" required="yes">
 			<description>SIP Communicator bundle History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar" override="true"/>
 		</pack>
 		<pack name="msg-history" required="yes">
 			<description>SIP Communicator bundle Message History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar" override="true"/>
 		</pack>
         <pack name="call-history" required="yes">
 			<description>SIP Communicator bundle Call History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar" override="true"/>
 		</pack>
 		<pack name="swing-ui" required="yes">
 			<description>SIP Communicator bundle Swing UI</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar" override="true"/>
 		</pack>
 		<pack name="icqaccregwizz" required="yes">
 			<description>SIP Communicator bundle ICQ Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="jabberaccregwizz" required="yes">
 			<description>SIP Communicator bundle Jabber Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="sipaccregwizz" required="yes">
 			<description>SIP Communicator bundle SIP Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="msnaccregwizz" required="yes">
 			<description>SIP Communicator bundle MSN Account Registrattion Wizzard</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="version" required="yes">
 			<description>SIP Communicator bundle Version</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar" override="true"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar" override="true"/>
 		</pack>
 
 
@@ -158,22 +158,21 @@
 		<pack name="run" required="yes">
 			<description>Executable</description>
 
-                        <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/linux/uninstall.sh"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux"  override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/linux/uninstall.sh"  override="true"/>
 			<executable targetfile="$INSTALL_PATH/run.sh" stage="never" os="linux"/>
-                        <executable targetfile="$INSTALL_PATH/uninstall.sh" stage="never" os="linux"/>
-                        <executable targetfile="$INSTALL_PATH/jre/bin/java" stage="never" os="linux"/>
+            <executable targetfile="$INSTALL_PATH/uninstall.sh" stage="never" os="linux"/>
+            <executable targetfile="$INSTALL_PATH/jre/bin/java" stage="never" os="linux"/>
 		</pack>
 
-            <pack name="jre" required="yes" loose="true">
-                <description>SIP Communicator included jre</description>
-
-                <fileset  targetdir="$INSTALL_PATH/jre" dir="release/linux/tmp/jre">
-                    <include name="**/*"/>
-                </fileset>
-            </pack>
+        <pack name="jre" required="yes" loose="true">
+          <description>SIP Communicator included jre</description>
 
+          <fileset  targetdir="$INSTALL_PATH/jre" dir="release/linux/tmp/jre">
+            <include name="**/*"/>
+          </fileset>
+        </pack>
 	</packs>
 
 </installation>
diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml
index 205562190..2cf1027a1 100755
--- a/resources/install/windows/installer-windows.xml
+++ b/resources/install/windows/installer-windows.xml
@@ -43,114 +43,109 @@
 		<pack name="lib" required="yes">
 			<description>Include all libraries</description>
 
-			<fileset  targetdir="$INSTALL_PATH/lib" dir="lib">
-				<include name="kxml-min.jar"/>
-                <include name="felix.jar"/>
-                <include name="servicebinder.jar"/>
-                <include name="BrowserLauncher2.jar"/>
-			</fileset>
-            <fileset  targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle">
-				<include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/>
-			</fileset>
-
-			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
-			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/>
+            <file targetdir="$INSTALL_PATH/lib" src="lib/kxml-min.jar" override="true"/>
+            <file targetdir="$INSTALL_PATH/lib" src="lib/felix.jar" override="true"/>
+            <file targetdir="$INSTALL_PATH/lib" src="lib/servicebinder.jar" override="true"/>
+            <file targetdir="$INSTALL_PATH/lib" src="lib/BrowserLauncher2.jar" override="true"/>
+            <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
+			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
 		</pack>
 
         <pack name="native" required="yes">
 			<description>SIP Communicator Native libs</description>
-			<fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/windows">
+			<fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/windows" override="true">
                 <include name="*"/>
             </fileset>
 		</pack>
 		<pack name="util" required="yes">
 			<description>SIP Communicator util</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/util.jar" override="true"/>
 		</pack>
 		<pack name="configuration" required="yes">
 			<description>SIP Communicator bundle configuration</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/configuration.jar" override="true"/>
 		</pack>
 		<pack name="file-access" required="yes">
 			<description>SIP Communicator bundle File Access</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/fileaccess.jar" override="true"/>
 		</pack>
 		<pack name="protocol" required="yes">
 			<description>SIP Communicator bundle Protocol</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar" override="true"/>
 		</pack>
         <pack name="contactlist" required="yes">
 			<description>SIP Communicator bundle Contactlist</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar" override="true"/>
 		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
 		<pack name="protocol-icq" required="yes">
 			<description>SIP Communicator bundle Protocol ICQ</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-icq.jar" override="true"/>
 		</pack>
 		<pack name="protocol-jabber" required="yes">
 			<description>SIP Communicator bundle Protocol Jabber</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-jabber.jar" override="true"/>
 		</pack>
         <pack name="protocol-sip" required="yes">
 			<description>SIP Communicator bundle Protocol SIP</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-sip.jar" override="true"/>
 		</pack>
         <pack name="protocol-msn" required="yes">
 			<description>SIP Communicator bundle Protocol MSN</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol-msn.jar" override="true"/>
 		</pack>
         <pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar" override="true"/>
 		</pack>
         <pack name="netaddress" required="yes">
 			<description>SIP Communicator bundle Network Address</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/netaddr.jar" override="true"/>
 		</pack>
 		<pack name="metacontact-list" required="yes">
 			<description>SIP Communicator bundle MetaContact List</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/meta-cl.jar" override="true"/>
 		</pack>
 		<pack name="history" required="yes">
 			<description>SIP Communicator bundle History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/history.jar" override="true"/>
 		</pack>
 		<pack name="msg-history" required="yes">
 			<description>SIP Communicator bundle Message History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msghistory.jar" override="true"/>
 		</pack>
         <pack name="call-history" required="yes">
 			<description>SIP Communicator bundle Call History</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/callhistory.jar" override="true"/>
 		</pack>
 		<pack name="swing-ui" required="yes">
 			<description>SIP Communicator bundle Swing UI</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/swing-ui.jar" override="true"/>
 		</pack>
 		<pack name="icqaccregwizz" required="yes">
 			<description>SIP Communicator bundle ICQ Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/icqaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="jabberaccregwizz" required="yes">
 			<description>SIP Communicator bundle Jabber Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/jabberaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="sipaccregwizz" required="yes">
 			<description>SIP Communicator bundle SIP Account Registrattion Wizzard</description>
-			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar"/>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/sipaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="msnaccregwizz" required="yes">
 			<description>SIP Communicator bundle MSN Account Registrattion Wizzard</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar" override="true"/>
 		</pack>
         <pack name="version" required="yes">
 			<description>SIP Communicator bundle Version</description>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/>
-            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar" override="true"/>
+            <file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar" override="true"/>
 		</pack>
 
 
@@ -158,10 +153,10 @@
 		<pack name="run" required="yes">
 			<description>Exceutable</description>
 
-                        <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/windows/uninstall.bat"/>
-                        <file targetdir="$INSTALL_PATH" src="resources/install/windows/sc-logo.ico"/>
-			<executable targetfile="$INSTALL_PATH/run.bat" stage="never"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/windows/uninstall.bat" override="true"/>
+            <file targetdir="$INSTALL_PATH" src="resources/install/windows/sc-logo.ico" override="true"/>
+            <executable targetfile="$INSTALL_PATH/run.bat" stage="never" override="true"/>
 		</pack>
 	</packs>
 
diff --git a/resources/install/windows/launcher.ini b/resources/install/windows/launcher.ini
index 8e6e1022b..c94699c09 100755
--- a/resources/install/windows/launcher.ini
+++ b/resources/install/windows/launcher.ini
@@ -1,4 +1,4 @@
-jar = sip-communicator-1.0.alpha1-windows.jar
+jar = sip-communicator-windows.jar
 download = http://java.sun.com/j2se/1.4.2/download.html
 
 [win32]