From 1c8985440325af05b3f23f585f0c0ad9d92f4237 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Mon, 20 May 2013 10:38:05 +0300 Subject: [PATCH] Separates some services to be reused in android. --- build.xml | 26 ++++++++++++++++--- lib/felix.client.run.properties | 2 ++ .../googlecontacts/googlecontacts.manifest.mf | 2 +- .../nimbuzzavatars/nimbuzzavatars.manifest.mf | 4 +-- .../googlecontacts/googlecontacts.manifest.mf | 6 +++++ .../communicator/service/hid/hid.manifest.mf | 6 +++++ .../protocol/protocol.provider.manifest.mf | 1 + 7 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf create mode 100644 src/net/java/sip/communicator/service/hid/hid.manifest.mf diff --git a/build.xml b/build.xml index fec3a1b27..e16f9a695 100644 --- a/build.xml +++ b/build.xml @@ -910,7 +910,9 @@ bundle-callhistory, bundle-callhistory-slick, bundle-popupmessagehandler-slick, bundle-netaddr,bundle-netaddr-slick,bundle-slickless, bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, - bundle-fileaccess-slick,bundle-neomedia,bundle-hid,bundle-ldap,bundle-googlecontacts, + bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, + bundle-googlecontacts-service,bundle-googlecontacts, + bundle-hid-service,bundle-hid, bundle-resource-manager,bundle-resources-defaultpack, bundle-protocol,bundle-protocol-media,bundle-icq, bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib, @@ -1189,7 +1191,6 @@ - + + + + + + + + + + + + + @@ -1323,6 +1341,8 @@ javax.swing.event, javax.swing.border"/> + manifest="${src}/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf"> - diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index 42cd65434..aaab0e1c2 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -85,6 +85,7 @@ felix.auto.start.45= \ reference:file:sc-bundles/branding.jar \ reference:file:sc-bundles/provdisc-dhcp.jar \ reference:file:sc-bundles/provdisc-mdns.jar \ + reference:file:sc-bundles/googlecontacts-service.jar \ reference:file:sc-bundles/googlecontacts.jar \ reference:file:sc-bundles/certificate.jar @@ -94,6 +95,7 @@ felix.auto.start.49= \ 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 \ reference:file:sc-bundles/hid.jar \ reference:file:sc-bundles/globalproxyconfig.jar diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf index 9e2845b07..9940d116a 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf +++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf @@ -8,6 +8,7 @@ Import-Package: org.osgi.framework, org.jitsi.service.configuration, net.java.sip.communicator.service.credentialsstorage, net.java.sip.communicator.service.contactsource, + net.java.sip.communicator.service.googlecontacts, net.java.sip.communicator.service.gui, org.jitsi.service.resources, net.java.sip.communicator.service.resources, net.java.sip.communicator.service.protocol, @@ -23,4 +24,3 @@ Import-Package: org.osgi.framework, javax.swing.table, javax.swing.tree, javax.swing.text -Export-Package: net.java.sip.communicator.service.googlecontacts diff --git a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf index 6c84be4cf..da86327ef 100644 --- a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf +++ b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf @@ -4,5 +4,5 @@ Bundle-Description: Custom Nimbuzz Avatars plugin Bundle-Vendor: jitsi.org Bundle-Version: 0.0.1 System-Bundle: yes -Export-Package: net.java.sip.communicator.service.customavatar -Import-Package: org.osgi.framework +Import-Package: org.osgi.framework, + net.java.sip.communicator.service.customavatar diff --git a/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf new file mode 100644 index 000000000..74dde8d61 --- /dev/null +++ b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf @@ -0,0 +1,6 @@ +Bundle-Name: Google Contacts Service +Bundle-Description: A service accessing Google Contacts +Bundle-Vendor: jitsi.org +Bundle-Version: 0.0.1 +System-Bundle: yes +Export-Package: net.java.sip.communicator.service.googlecontacts diff --git a/src/net/java/sip/communicator/service/hid/hid.manifest.mf b/src/net/java/sip/communicator/service/hid/hid.manifest.mf new file mode 100644 index 000000000..98ed346d3 --- /dev/null +++ b/src/net/java/sip/communicator/service/hid/hid.manifest.mf @@ -0,0 +1,6 @@ +Bundle-Name: HID Service +Bundle-Description: A bundle that offers Human Interaction service features. +Bundle-Vendor: jitsi.org +Bundle-Version: 0.0.1 +System-Bundle: yes +Export-Package: net.java.sip.communicator.service.hid diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf index ba437d8c3..42b53ebef 100644 --- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf @@ -16,6 +16,7 @@ Import-Package: net.java.sip.communicator.service.credentialsstorage, org.osgi.framework Export-Package: net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.aimconstants, + net.java.sip.communicator.service.customavatar, net.java.sip.communicator.service.protocol.event, net.java.sip.communicator.service.protocol.globalstatus, net.java.sip.communicator.service.protocol.icqconstants,