Fix installers to include and start jdic

5 files changed, 8 insertions, 12 deletions

diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml
index db2fd84..4188c56 100755
--- a/resources/install/generic/installer-generic.xml
+++ b/resources/install/generic/installer-generic.xml
@@ -43,9 +43,7 @@
 		<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="*.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"/>
diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml
index 9e2d4c8..6caffb3 100755
--- a/resources/install/linux/installer-linux.xml
+++ b/resources/install/linux/installer-linux.xml
@@ -39,9 +39,7 @@
 		<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="*.jar"/>
                     </fileset>
                     <fileset  targetdir="$INSTALL_PATH/lib" dir="lib/os-specific/linux" override="true">
                         <include name="*.jar"/>
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index b93b2e1..dcff40a 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/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/jdic-all.jar:lib/jdic_stub.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
diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml
index 1f8d4ba..f3de99d 100755
--- a/resources/install/windows/installer-windows.xml
+++ b/resources/install/windows/installer-windows.xml
@@ -41,9 +41,9 @@
 		<!-- 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"/>
+                    <fileset  targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
+                        <include name="*.jar"/>
+                    </fileset>
                     <fileset  targetdir="$INSTALL_PATH/lib" dir="lib/os-specific/windows" override="true">
                         <include name="*.jar"/>
                         <exclude name="jmf.jar"/>
@@ -70,7 +70,7 @@
                 
                 <pack name="bundles-os-specific" required="yes">
                     <description>SIP Communicator windows bundles</description>
-                    <fileset  targetdir="$INSTALL_PATH/sc-bundles/os-specific/windows" dir="sc-bundles" override="true">
+                    <fileset  targetdir="$INSTALL_PATH/sc-bundles" dir="sc-bundles/os-specific/windows" override="true">
                         <include name="*.jar"/>
                         <exclude name="*slick.jar"/>
                     </fileset>
diff --git a/resources/install/windows/run.bat b/resources/install/windows/run.bat
index a48e4fd..466dd9c 100755
--- a/resources/install/windows/run.bat
+++ b/resources/install/windows/run.bat
@@ -1,3 +1,3 @@
 mkdir "%UserProfile%/.sip-communicator/log"
 set PATH=%PATH%;native
-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
+start javaw -classpath "lib/jdic-all.jar;lib/jdic_stub.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