sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

1. smack library bundle to be used from bundles needing smack library

Browse Source 
2. Fix overriding character encoding for icq messages in installers. Discussed with Pavel.
cusax-fix
Damian Minkov 19 years ago
parent ba1491c343
commit 2dfda98983
14 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File

31
build.xml
Unescape View File

@ -743,7 +743,7 @@
<!-- Tell felix to run sip-communicator-->
<sysproperty key="felix.config.properties"
value="file:./lib/felix.client.run.properties"/>
<!-- Tell java.util.logging about our logging preferences -->
<sysproperty key="java.util.logging.config.file"
value="lib/logging.properties"/>
@ -841,7 +841,7 @@
bundle-netaddr,bundle-netaddr-slick,bundle-slickless,
bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess,
bundle-fileaccess-slick,bundle-media,bundle-media-slick,
bundle-protocol,bundle-icq,bundle-icq-slick,bundle-mock,
bundle-protocol,bundle-icq,bundle-icq-slick,bundle-mock,bundle-smacklib,
bundle-jabber,bundle-jabber-slick,bundle-swing-ui,
bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick,
bundle-contactlist,meta-contactlist,meta-contactlist-slick,
@ -1144,6 +1144,18 @@ javax.swing.event, javax.swing.border"/>
prefix="resources/images"/>
</jar>
</target>
<target name="bundle-smacklib">
<!-- Creates a bundle containing the smack lib.-->
<jar compress="false" destfile="${bundles.dest}/smacklib.jar"
manifest="${lib.noinst}/smack.manifest.mf">
<zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
<zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
</jar>
</target>
<!-- BUNDLE-ICQ -->
<target name="bundle-icq">
@ -1196,11 +1208,6 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/jabber"
prefix="net/java/sip/communicator/impl/protocol/jabber"/>
<zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
<zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
<zipfileset dir="resources/images/jabber"
prefix="resources/images/jabber"/>
</jar>
@ -1214,11 +1221,6 @@ javax.swing.event, javax.swing.border"/>
manifest="test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/jabber"
prefix="net/java/sip/communicator/slick/protocol/jabber"/>
<zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
<zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
</jar>
</target>
@ -1370,11 +1372,6 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/plugin/jabberaccregwizz"
prefix="net/java/sip/communicator/plugin/jabberaccregwizz"/>
<zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
<zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
<zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
<zipfileset dir="resources/images/jabber"
prefix="resources/images/jabber"/>
</jar>

1
lib/felix.client.run.properties
Unescape View File

@ -62,6 +62,7 @@ felix.auto.start.50= \
reference:file:sc-bundles/media.jar \
reference:file:sc-bundles/protocol-icq.jar \
reference:file:sc-bundles/protocol-sip.jar \
reference:file:sc-bundles/smacklib.jar \
reference:file:sc-bundles/protocol-jabber.jar \
reference:file:sc-bundles/protocol-msn.jar \
reference:file:sc-bundles/protocol-yahoo.jar \

1
lib/felix.unit.test.properties
Unescape View File

@ -56,6 +56,7 @@ felix.auto.start.4= \
file:sc-bundles/fileaccess.jar \
file:sc-bundles/history.jar \
file:sc-bundles/protocol-icq.jar \
file:sc-bundles/smacklib.jar \
file:sc-bundles/protocol-jabber.jar \
file:sc-bundles/protocol-msn.jar \
file:sc-bundles/protocol-sip.jar \

13
lib/installer-exclude/smack.manifest.mf
Unescape View File

@ -0,0 +1,13 @@
Bundle-Name: Smack Lib Provider
Bundle-Description: Smack Lib Provider
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: javax.net.ssl
Export-Package: org.jivesoftware.smack,
org.jivesoftware.smack.packet,
org.jivesoftware.smack.provider,
org.jivesoftware.smack.util,
org.jivesoftware.smack.filter,
org.jivesoftware.smackx,
org.jivesoftware.smackx.muc,
org.jivesoftware.smackx.packet

2
resources/install/debian/sip-communicator.sh.tmpl
Unescape View File

@ -32,6 +32,6 @@ cd $SCDIR
if [ -f $javabin ]
then
$javabin -classpath "$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$SCDIR/sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
$javabin -classpath "$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
exit $?
fi

2
resources/install/generic/run.sh
Unescape View File

@ -1,4 +1,4 @@
mkdir -p $HOME/.sip-communicator/log
export PATH=$PATH:native
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" -Djava.library.path=native -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 -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" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

2
resources/install/linux/run.sh
Unescape View File

@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
export PATH=$PATH:native
export JAVA_HOME=jre
${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" -Djava.library.path=native -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" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

2
resources/install/windows/run.bat
Unescape View File

@ -1,3 +1,3 @@
mkdir "%UserProfile%/.sip-communicator/log"
set PATH=%PATH%;native
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
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" -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

1
src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
Unescape View File

@ -14,7 +14,6 @@
import org.jivesoftware.smack.provider.*;
import org.jivesoftware.smack.util.*;
import org.jivesoftware.smackx.*;
import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.Message;
import net.java.sip.communicator.service.protocol.event.*;

1
src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
Unescape View File

@ -17,7 +17,6 @@
import net.java.sip.communicator.service.protocol.jabberconstants.*;
import net.java.sip.communicator.util.*;
import org.jivesoftware.smack.filter.*;
import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
import net.java.sip.communicator.impl.protocol.jabber.extensions.version.*;
/**

14
src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
Unescape View File

@ -4,12 +4,14 @@ Bundle-Description: An Jabber implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
javax.net.ssl,
javax.swing,
javax.xml.parsers,
javax.naming,
javax.naming.directory,
org.w3c.dom,
org.jivesoftware.smack,
org.jivesoftware.smack.packet,
org.jivesoftware.smack.provider,
org.jivesoftware.smack.util,
org.jivesoftware.smack.filter,
org.jivesoftware.smackx,
org.jivesoftware.smackx.muc,
org.jivesoftware.smackx.packet,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.util,
net.java.sip.communicator.service.configuration.event,

1
src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
Unescape View File

@ -130,7 +130,6 @@ void reconnect()
/**
* Connects and logins to the server
* @param authority SecurityAuthority
* @throws XMPPException if we cannot connect to the server - network problem
* @throws OperationFailedException if login parameters
* as server port are not correct
*/

2
src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
Unescape View File

@ -34,4 +34,4 @@ Import-Package: org.osgi.framework,
javax.swing.tree,
javax.swing.undo,
javax.swing.border,
javax.net.ssl
org.jivesoftware.smack

2
src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
Unescape View File

@ -1,4 +1,4 @@
Bundle-Name: ICQ Protocol Provider Service
Bundle-Name: Protocol Provider Service
Bundle-Description: Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1

Write Preview
Loading…
Cancel
Save