Use OSGI'fied libjitsi and fmj@102+package=bundle

smack4
Ingo Bauersachs 10 years ago
parent e2ae9b34e1
commit 49ee4c5ff2

@ -20,7 +20,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/installer-exclude/easymock-3.1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/fmj.jar" sourcepath="/fmj"/>
<classpathentry kind="lib" path="lib/installer-exclude/fmj-1.0-SNAPSHOT.jar" sourcepath="/fmj"/>
<classpathentry kind="lib" path="lib/installer-exclude/forms-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-1.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-meta-1.0.jar"/>
@ -58,7 +58,7 @@
<attribute name="javadoc_location" value="http://dbus.freedesktop.org/doc/dbus-java/api/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/installer-exclude/libjitsi.jar" sourcepath="/libjitsi/src"/>
<classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar" sourcepath="/libjitsi/src"/>
<classpathentry kind="lib" path="lib/bundle/log4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>

@ -497,7 +497,7 @@
<classpath>
<pathelement path="${dest}"/>
<pathelement location="${lib.noinst}/libjitsi.jar"/>
<pathelement location="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar"/>
</classpath>
</taskdef>
@ -1309,28 +1309,11 @@
</target>
<!--BUNDLE-LIBJITSI -->
<target name="bundle-libjitsi"
depends="bundle-libjitsi-dynamically,bundle-libjitsi-statically" />
<target name="bundle-libjitsi-dynamically" if="dynamic.linking">
<jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
prefix="net/java/sip/communicator/impl/libjitsi" />
<zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
</jar>
</target>
<target name="bundle-libjitsi-statically" unless="dynamic.linking">
<jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
prefix="net/java/sip/communicator/impl/libjitsi" />
<zipfileset src="${lib.noinst}/bcpkix-jdk15on-151.jar" prefix=""
excludes="META-INF/BCKEY.*" />
<zipfileset src="${lib.noinst}/fmj.jar" prefix="" />
<zipfileset src="${lib.noinst}/jitsi-lgpl-dependencies.jar"
prefix="" />
<zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
</jar>
<target name="bundle-libjitsi">
<copy file="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/libjitsi.jar"/>
<copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/>
<copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
<copy file="${lib.noinst}/bcpkix-jdk15on-151.jar" tofile="${bundles.dest}/bcpkix.jar"/>
</target>
<!--BUNDLE-NEOMEDIA-->

@ -24,14 +24,16 @@ org.osgi.framework.system.packages.extra= \
sun.net.util; \
sun.net.dns; \
sun.security.action; \
sun.security.pkcs11
sun.security.pkcs11;\
sun.audio
felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
#slf4j-jdk is an OSGi fragment, so install but don't start it
felix.auto.install.10= \
reference:file:sc-bundles/slf4j-jdk14.jar
reference:file:sc-bundles/slf4j-jdk14.jar \
reference:file:sc-bundles/jitsi-lgpl-dependencies.jar
felix.auto.start.10= \
reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
@ -45,7 +47,15 @@ felix.auto.start.10= \
# file:lib/bundle/servicebinder.jar \
# file:lib/bundle/tablelayout.jar
felix.auto.start.14= \
reference:file:sc-bundles/commons-codec.jar
felix.auto.start.15= \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/sdes4j.jar
felix.auto.start.16= \
reference:file:sc-bundles/fmj.jar \
reference:file:sc-bundles/bcpkix.jar \
reference:file:sc-bundles/libjitsi.jar \
reference:file:sc-bundles/dnsservice.jar \
reference:file:sc-bundles/hsqldb.jar
@ -70,7 +80,6 @@ felix.auto.start.32= \
reference:file:sc-bundles/dnsconfig.jar
felix.auto.start.35= \
reference:file:sc-bundles/commons-codec.jar \
reference:file:sc-bundles/httpcore.jar \
reference:file:sc-bundles/httpclient.jar \
reference:file:sc-bundles/httputil.jar
@ -102,8 +111,6 @@ felix.auto.start.45= \
felix.auto.start.49= \
reference:file:sc-bundles/provisioning.jar \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/sdes4j.jar \
reference:file:sc-bundles/protocol.jar \
reference:file:sc-bundles/protocol-media.jar \
reference:file:sc-bundles/hid-service.jar \

Binary file not shown.

@ -1,71 +0,0 @@
/*
* Jitsi, the OpenSource Java VoIP and Instant Messaging client.
*
* Copyright @ 2015 Atlassian Pty Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.java.sip.communicator.impl.libjitsi;
import java.lang.reflect.*;
import org.jitsi.service.libjitsi.*;
import org.osgi.framework.*;
public class LibJitsiActivator
implements BundleActivator
{
public void start(BundleContext bundleContext)
throws Exception
{
/*
* XXX To start/initialize the libjitsi library, simply call
* LibJitsi#start(). The following is a temporary workaround for the
* benefit of the Jitsi Videobridge project (which uses Jitsi's libjitsi
* bundle and runs on an incomplete OSGi implementation) and not the
* Jitsi project.
*/
Method start;
try
{
start = LibJitsi.class.getDeclaredMethod("start", Object.class);
if (Modifier.isStatic(start.getModifiers()))
{
start.setAccessible(true);
if (!start.isAccessible())
start = null;
}
else
start = null;
}
catch (NoSuchMethodException nsme)
{
start = null;
}
catch (SecurityException se)
{
start = null;
}
if (start == null)
LibJitsi.start();
else
start.invoke(null, bundleContext);
}
public void stop(BundleContext bundleContext)
throws Exception
{
LibJitsi.stop();
}
}

@ -1,97 +0,0 @@
Bundle-Activator: net.java.sip.communicator.impl.libjitsi.LibJitsiActivator
Bundle-Description: The core of Jitsi as a stand-alone library
Bundle-Name: libjitsi
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Bundle-SymbolicName: net.java.sip.communicator.libjitsi
Export-Package: javax.media,
javax.media.protocol,
org.jitsi.impl.neomedia,
org.jitsi.impl.neomedia.codec,
org.jitsi.impl.neomedia.codec.video.h264,
org.jitsi.impl.neomedia.device,
org.jitsi.impl.neomedia.format,
org.jitsi.impl.neomedia.recording,
org.jitsi.service.audionotifier,
org.jitsi.service.configuration,
org.jitsi.service.fileaccess,
org.jitsi.service.libjitsi,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.codec,
org.jitsi.service.neomedia.control,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.neomedia.recording,
org.jitsi.service.packetlogging,
org.jitsi.service.protocol,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.service.version,
org.jitsi.service.version.util,
org.jitsi.util,
org.jitsi.util.event,
org.jitsi.util.swing,
org.jitsi.util.xml
Import-Package: apple.awt,
ch.imvs.sdes4j,
ch.imvs.sdes4j.srtp,
com.sun.jna,
com.sun.jna.ptr,
com.sun.jna.win32,
gnu.java.zrtp,
gnu.java.zrtp.packets,
gnu.java.zrtp.utils,
gnu.java.zrtp.zidfile,
javax.imageio,
javax.sound.sampled,
javax.swing,
javax.swing.border,
javax.swing.event,
javax.swing.filechooser,
javax.swing.table,
javax.swing.text,
javax.xml.parsers,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.stream,
org.bouncycastle.asn1,
org.bouncycastle.asn1.bsi,
org.bouncycastle.asn1.cryptopro,
org.bouncycastle.asn1.eac,
org.bouncycastle.asn1.nist,
org.bouncycastle.asn1.oiw,
org.bouncycastle.asn1.pkcs,
org.bouncycastle.asn1.teletrust,
org.bouncycastle.asn1.x500,
org.bouncycastle.asn1.x500.style,
org.bouncycastle.asn1.x509,
org.bouncycastle.asn1.x9,
org.bouncycastle.crypto,
org.bouncycastle.crypto.digests,
org.bouncycastle.crypto.engines,
org.bouncycastle.crypto.generators,
org.bouncycastle.crypto.macs,
org.bouncycastle.crypto.params,
org.bouncycastle.crypto.prng,
org.bouncycastle.crypto.signers,
org.bouncycastle.crypto.tls,
org.bouncycastle.crypto.util,
org.bouncycastle.util,
org.jitsi.bccontrib.digests,
org.jitsi.bccontrib.engines,
org.jitsi.bccontrib.macs,
org.jitsi.bccontrib.params,
org.jitsi.bccontrib.prng,
org.ice4j.socket,
org.json.simple,
org.osgi.framework,
org.w3c.dom,
org.xml.sax,
sun.lwawt,
sun.lwawt.macosx,
quicktime,
quicktime.qd,
quicktime.std.image,
quicktime.std.sg,
quicktime.util
Loading…
Cancel
Save