From 34ee7842cc9661be2f1c05a983720a58fad9388f Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Thu, 25 Jan 2007 14:24:54 +0000
Subject: Update installers - now includes all existing bundles and use
 os-specific dir.

---
 resources/install/generic/installer-generic.xml    | 138 ++++---------------
 resources/install/linux/installer-linux.xml        | 151 +++++----------------
 resources/install/linux/run.sh                     |   2 +-
 resources/install/windows/installer-windows.xml    | 140 ++++---------------
 resources/install/windows/run.bat                  |   4 +-
 .../impl/protocol/yahoo/ContactYahooImpl.java      |   2 +-
 6 files changed, 88 insertions(+), 349 deletions(-)

diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml
index babf25f..db2fd84 100755
--- a/resources/install/generic/installer-generic.xml
+++ b/resources/install/generic/installer-generic.xml
@@ -39,126 +39,34 @@
 	</panels>
 
 	<packs>
-
 		<!-- The lib files -->
 		<pack name="lib" required="yes">
-			<description>Include all libraries</description>
-
-			<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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" override="true"/>
+                    <description>Include all libraries</description>
+                    <fileset  targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
+                        <include name="kxml-min.jar"/>
+                        <include name="felix.jar"/>
+                        <include name="servicebinder.jar"/>
+                    </fileset>
+                    <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="bundles" required="yes">
+                    <description>SIP Communicator bundles</description>
+                    <fileset  targetdir="$INSTALL_PATH/sc-bundles" dir="sc-bundles" override="true">
+                        <include name="*.jar"/>
+                        <exclude name="*slick.jar"/>
+                    </fileset>
 		</pack>
-        <pack name="media" required="yes">
-			<description>SIP Communicator bundle Media</description>
-			<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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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"/>
+                    <description>Exceutable</description>
+                    <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>
 	</packs>
 
diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml
index 2c5afe0..dd31eb1 100755
--- a/resources/install/linux/installer-linux.xml
+++ b/resources/install/linux/installer-linux.xml
@@ -35,133 +35,46 @@
 	</panels>
 
 	<packs>
-
 		<!-- The lib files -->
 		<pack name="lib" required="yes">
-			<description>Include all libraries</description>
-
-			<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" 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" override="true"/>
-			<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
+                    <description>Include all libraries</description>
+                    <fileset  targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
+                        <include name="kxml-min.jar"/>
+                        <include name="felix.jar"/>
+                        <include name="servicebinder.jar"/>
+                    </fileset>
+                    <fileset  targetdir="$INSTALL_PATH/lib" dir="os-specific/linux" override="true">
+                        <include name="*.jar"/>
+                        <exclude name="jmf.jar"/>
+                    </fileset>
+                    <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/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" 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" 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" 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" 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" 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" 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" 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" 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" 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" override="true"/>
+                <pack name="native" required="yes">
+                    <description>SIP Communicator Native libs</description>
+                    <fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/linux" override="true">
+                        <include name="*"/>
+                    </fileset>
+		</pack>
+                <pack name="bundles" required="yes">
+                    <description>SIP Communicator bundles</description>
+                    <fileset  targetdir="$INSTALL_PATH/sc-bundles" dir="sc-bundles" override="true">
+                        <include name="*.jar"/>
+                        <exclude name="*slick.jar"/>
+                    </fileset>
 		</pack>
-        <pack name="media" required="yes">
-			<description>SIP Communicator bundle Media</description>
-			<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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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>Executable</description>
-
-            <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"/>
-            <parsable targetfile="inst_path" />
+                    <description>Executable</description>
+                    <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"/>
+                    <parsable targetfile="inst_path" />
 		</pack>
 
         <!-- loose param is not working -->
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index 343e354..b93b2e1 100755
--- a/resources/install/linux/run.sh
+++ b/resources/install/linux/run.sh
@@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
 
 export PATH=$PATH:native
 export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/BrowserLauncher2.jar:lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+${JAVA_HOME}/bin/java -classpath "lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml
index 2cf1027..83a63d9 100755
--- a/resources/install/windows/installer-windows.xml
+++ b/resources/install/windows/installer-windows.xml
@@ -38,125 +38,43 @@
 	</panels>
 
 	<packs>
-
 		<!-- The lib files -->
 		<pack name="lib" required="yes">
-			<description>Include all libraries</description>
-
-            <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"/>
+                    <description>Include all libraries</description>
+                    <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"/>
+                    <fileset  targetdir="$INSTALL_PATH/lib" dir="os-specific/windows" override="true">
+                        <include name="*.jar"/>
+                        <exclude name="jmf.jar"/>
+                        <exclude name="sound.jar"/>
+                    </fileset>
+                    <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" override="true"/>
+                <pack name="native" required="yes">
+                    <description>SIP Communicator Native libs</description>
+                    <fileset  targetdir="$INSTALL_PATH/native" dir="lib/native/windows" override="true">
+                        <include name="*"/>
+                    </fileset>
+		</pack>
+		<pack name="bundles" required="yes">
+			<description>SIP Communicator bundles</description>
+                        <fileset  targetdir="$INSTALL_PATH/sc-bundles" dir="sc-bundles" override="true">
+                            <include name="*.jar"/>
+                            <exclude name="*slick.jar"/>
+                        </fileset>
 		</pack>
-        <pack name="netaddress" required="yes">
-			<description>SIP Communicator bundle Network Address</description>
-			<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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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/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"/>
+                    <description>Exceutable</description>
+                    <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/run.bat b/resources/install/windows/run.bat
index a1d8f4c..a48e4fd 100755
--- a/resources/install/windows/run.bat
+++ b/resources/install/windows/run.bat
@@ -1,3 +1,3 @@
-mkdir %UserProfile%/.sip-communicator/log
+mkdir "%UserProfile%/.sip-communicator/log"
 set PATH=%PATH%;native
-start javaw -classpath "lib/BrowserLauncher2.jar;lib/felix.jar;lib/kxml-min.jar;lib/servicebinder.jar;lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar;sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+start javaw -classpath "lib/felix.jar;lib/kxml-min.jar;lib/servicebinder.jar;lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar;sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
index ddac5c2..3d4f80f 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
@@ -30,7 +30,7 @@ public class ContactYahooImpl
 
     /**
      * Creates an YahooContactImpl with custom yahooID
-     * @param contactID sets the contact Id if its different from the YahooUser id
+     * @param yahooID sets the contact Id if its different from the YahooUser id
      * @param contact the contact object that we will be encapsulating.
      * @param ssclCallback a reference to the ServerStoredContactListImpl
      * instance that created us.
-- 
cgit v1.1