From 6bcedbf2062eaa60f0b99e69e635e1417a5d1242 Mon Sep 17 00:00:00 2001
From: Martin Andre <martin@mandre.org>
Date: Wed, 8 Feb 2006 23:33:12 +0000
Subject: [PATCH] Included JMF into the Media bundle and removed unecessary JMF
 imports.

---
 build.xml                                                   | 6 +++++-
 lib/oscar.client.run.properties                             | 6 ------
 lib/oscar.unit.test.properties                              | 6 ------
 src/net/java/sip/communicator/impl/media/media.manifest.mf  | 6 ------
 .../java/sip/communicator/slick/media/TestMediaService.java | 3 ++-
 .../sip/communicator/slick/media/media.slick.manifest.mf    | 3 ---
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 00cbfd7af..592788008 100644
--- a/build.xml
+++ b/build.xml
@@ -480,6 +480,7 @@
 
     <!--BUNDLE-MEDIA-->
     <target name="bundle-media" depends="rebuild">
+        <!-- Creates a bundle containing the impl of the media package."-->
         <jar
             compress="false" destfile="${bundles.dest}/media.jar"
             manifest="src/net/java/sip/communicator/impl/media/media.manifest.mf">
@@ -488,15 +489,18 @@
                 prefix="net/java/sip/communicator/service/media"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/media"
                 prefix="net/java/sip/communicator/impl/media"/>
+            <zipfileset src="${jmf.home}/jmf.jar" prefix=""/>
         </jar>
     </target>
 
     <!--BUNDLE-MEDIA-SLICK-->
     <target name="bundle-media-slick" depends="rebuild">
+        <!-- Creates a bundle containing the slick for the media package."-->
         <jar compress="false" destfile="${bundles.dest}/media-slick.jar"
             manifest="test/net/java/sip/communicator/slick/media/media.slick.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/slick/media"
                 prefix="net/java/sip/communicator/slick/media"/>
+            <zipfileset src="${jmf.home}/jmf.jar" prefix=""/>
         </jar>
     </target>
 
@@ -597,7 +601,7 @@ javax.swing.event, javax.swing.border"/>
 
     <!-- BUNDLE-ICQ-SLICK -->
     <target name="bundle-icq-slick" depends="rebuild">
-        <!-- Creates a bundle containing the the slick for the ICQ protocol provider."-->
+        <!-- Creates a bundle containing the slick for the ICQ protocol provider."-->
         <jar compress="false" destfile="${bundles.dest}/protocol-icq-slick.jar"
             manifest="test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/icq"
diff --git a/lib/oscar.client.run.properties b/lib/oscar.client.run.properties
index 895ef4a94..668ea5ae8 100644
--- a/lib/oscar.client.run.properties
+++ b/lib/oscar.client.run.properties
@@ -25,12 +25,6 @@ org.osgi.framework.system.packages= org.osgi.framework; \
  javax.xml.transform; \
  javax.xml.transform.dom; \
  javax.xml.transform.stream; \
- javax.media; \
- javax.media.format; \
- javax.media.protocol; \
- javax.sound.sampled; \
- com.sun.media.protocol.javasound; \
- com.sun.media.protocol.v4l; \
  net.java.stun4j; \
  net.java.stun4j.client; \
  net.java.stun4j.StunAddress; \
diff --git a/lib/oscar.unit.test.properties b/lib/oscar.unit.test.properties
index b97411247..2e54ee883 100644
--- a/lib/oscar.unit.test.properties
+++ b/lib/oscar.unit.test.properties
@@ -17,12 +17,6 @@ org.osgi.framework.system.packages= org.osgi.framework; \
  javax.xml.transform;\
  javax.xml.transform.dom;\
  javax.xml.transform.stream;\
- javax.media;\
- javax.media.format;\
- javax.media.protocol;\
- javax.sound.sampled;\
- com.sun.media.protocol.javasound;\
- com.sun.media.protocol.v4l;\
  net.java.stun4j; \
  net.java.stun4j.StunAddress;\
  net.java.stun4j.StunException;\
diff --git a/src/net/java/sip/communicator/impl/media/media.manifest.mf b/src/net/java/sip/communicator/impl/media/media.manifest.mf
index b71488e25..2b66071f5 100644
--- a/src/net/java/sip/communicator/impl/media/media.manifest.mf
+++ b/src/net/java/sip/communicator/impl/media/media.manifest.mf
@@ -9,13 +9,7 @@ Import-Package: org.ungoverned.gravity.servicebinder,
  net.java.sip.communicator.service.configuration.event,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.util,
- javax.media,
- javax.media.format,
- javax.media.protocol,
- javax.sound.sampled,
  javax.swing,
- com.sun.media.protocol.javasound,
- com.sun.media.protocol.v4l,
 Export-Package: net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,
  net.java.sip.communicator.impl.media,
diff --git a/test/net/java/sip/communicator/slick/media/TestMediaService.java b/test/net/java/sip/communicator/slick/media/TestMediaService.java
index f918b54ba..c8b3a00df 100644
--- a/test/net/java/sip/communicator/slick/media/TestMediaService.java
+++ b/test/net/java/sip/communicator/slick/media/TestMediaService.java
@@ -98,7 +98,8 @@ public void testIsInitialized()
 //        mediaService.initialize();
 //        assertTrue(mediaService.isInitialized());
 
-        // XXX Should also check that Media service is really initialized
+        // May also check that Media service is really initialized, but how?
+        // This means that we don't trust service impl
 
         // Shutdown service
         mediaService.shutdown();
diff --git a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
index 7fa5bc7d4..fa6fc244a 100644
--- a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
@@ -9,7 +9,4 @@ Import-Package: junit.framework,
  net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,
  net.java.sip.communicator.util,
- javax.media,
- javax.media.format,
- javax.media.protocol,
 Export-Package: net.java.sip.communicator.slick.media,