aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties17
-rw-r--r--lib/installer-exclude/commons-codec-1.4.jarbin58160 -> 0 bytes
-rw-r--r--lib/installer-exclude/commons-codec-1.6.jarbin0 -> 232771 bytes
-rw-r--r--lib/installer-exclude/fmj-1.0-SNAPSHOT.jarbin0 -> 1139897 bytes
-rw-r--r--lib/installer-exclude/fmj.jarbin1080592 -> 0 bytes
-rw-r--r--lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jarbin0 -> 7902494 bytes
-rw-r--r--lib/installer-exclude/json-simple-1.1.1.jarbin17766 -> 17871 bytes
-rw-r--r--lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jarbin0 -> 7387551 bytes
-rw-r--r--lib/installer-exclude/libjitsi.jarbin1857883 -> 0 bytes
-rw-r--r--lib/installer-exclude/sdes4j-1.1.3.jarbin0 -> 20232 bytes
-rw-r--r--lib/installer-exclude/sdes4j.jarbin17425 -> 0 bytes
11 files changed, 12 insertions, 5 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 4b3b741..f8bcd73 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -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 \
diff --git a/lib/installer-exclude/commons-codec-1.4.jar b/lib/installer-exclude/commons-codec-1.4.jar
deleted file mode 100644
index 458d432..0000000
--- a/lib/installer-exclude/commons-codec-1.4.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/commons-codec-1.6.jar b/lib/installer-exclude/commons-codec-1.6.jar
new file mode 100644
index 0000000..ee1bc49
--- /dev/null
+++ b/lib/installer-exclude/commons-codec-1.6.jar
Binary files differ
diff --git a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..b31e9d1
--- /dev/null
+++ b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/lib/installer-exclude/fmj.jar b/lib/installer-exclude/fmj.jar
deleted file mode 100644
index 5f0506d..0000000
--- a/lib/installer-exclude/fmj.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..f9c890c
--- /dev/null
+++ b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/lib/installer-exclude/json-simple-1.1.1.jar b/lib/installer-exclude/json-simple-1.1.1.jar
index cc5cff1..31b6bbf 100644
--- a/lib/installer-exclude/json-simple-1.1.1.jar
+++ b/lib/installer-exclude/json-simple-1.1.1.jar
Binary files differ
diff --git a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar b/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..eb28ef9
--- /dev/null
+++ b/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
deleted file mode 100644
index ac97fab..0000000
--- a/lib/installer-exclude/libjitsi.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/sdes4j-1.1.3.jar b/lib/installer-exclude/sdes4j-1.1.3.jar
new file mode 100644
index 0000000..280bd54
--- /dev/null
+++ b/lib/installer-exclude/sdes4j-1.1.3.jar
Binary files differ
diff --git a/lib/installer-exclude/sdes4j.jar b/lib/installer-exclude/sdes4j.jar
deleted file mode 100644
index aeda2af..0000000
--- a/lib/installer-exclude/sdes4j.jar
+++ /dev/null
Binary files differ