Changeset 76

Show
Ignore:
Timestamp:
12/14/05 19:12:13 (3 years ago)
Author:
alban
Message:

* fixed Java 1.4 compilation errors (URL.toURI method doesn't exist)
* rebuilt tritonus jar files with Java 1.4
* remove RMITracker implementation and test

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/org/kolaka/freecast/transport/receiver/FilePlaylist.java

    r75 r76  
    2626import java.io.InputStream; 
    2727import java.net.URI; 
    28 import java.net.URISyntaxException; 
    2928import java.net.URL; 
    3029import java.util.Iterator; 
    …… 
    3433import org.kolaka.freecast.io.URLTextFile; 
    3534import org.kolaka.freecast.net.URLUtils; 
     35import org.kolaka.freecast.resource.URIs; 
    3636 
    3737/** 
    …… 
    4949 
    5050        public FilePlaylist(URL playlist) throws IOException { 
    51                 try { 
    52                         definitionURI = playlist.toURI(); 
    53                 } catch (URISyntaxException e) { 
    54                         IOException exception = new IOException("Can't determinate the URI of " + playlist); 
    55                         exception.initCause(e); 
    56                         throw exception; 
    57                 } 
     51                definitionURI = URIs.toURI(playlist); 
    5852                 
    5953                URLTextFile textFile = new URLTextFile(playlist); 

  • trunk/source/org/kolaka/freecast/transport/receiver/PlaylistEncoderReceiverConfiguration.java

    r75 r76  
    3030import org.apache.commons.lang.UnhandledException; 
    3131import org.apache.commons.lang.Validate; 
     32import org.kolaka.freecast.resource.URIs; 
    3233 
    3334public class PlaylistEncoderReceiverConfiguration extends ReceiverConfiguration { 
    …… 
    5253 
    5354        public static PlaylistEncoderReceiverConfiguration getInstance(URL url) { 
    54                 URI uri; 
    55                 try { 
    56                         uri = url.toURI(); 
    57                 } catch (URISyntaxException e) { 
    58                         throw new UnhandledException("Can't convert URL to URI", e); 
    59                 } 
     55                URI uri = URIs.toURI(url); 
    6056                return new PlaylistEncoderReceiverConfiguration(uri); 
    6157        } 

  • trunk/source/org/kolaka/freecast/transport/receiver/PlaylistReceiverConfiguration.java

    r75 r76  
    3030import org.apache.commons.lang.UnhandledException; 
    3131import org.apache.commons.lang.Validate; 
     32import org.kolaka.freecast.resource.URIs; 
    3233 
    3334public class PlaylistReceiverConfiguration extends ReceiverConfiguration { 
    …… 
    6263 
    6364        public static PlaylistReceiverConfiguration getInstance(URL url) { 
    64                 URI uri; 
    65                 try { 
    66                         uri = url.toURI(); 
    67                 } catch (URISyntaxException e) { 
    68                         throw new UnhandledException("Can't convert URL to URI", e); 
    69                 } 
     65                URI uri = URIs.toURI(url); 
    7066                return new PlaylistReceiverConfiguration(uri); 
    7167        } 

  • trunk/source/org/kolaka/freecast/transport/receiver/test/PlaylistEncoderOggSourceFactoryTest.java

    r71 r76  
    3333import org.kolaka.freecast.ogg.test.OggTestResources; 
    3434import org.kolaka.freecast.resource.ResourceLocators; 
     35import org.kolaka.freecast.resource.URIs; 
    3536import org.kolaka.freecast.transport.receiver.EncoderFormat; 
    3637import org.kolaka.freecast.transport.receiver.PlaylistEncoderOggSourceFactory; 
    …… 
    4243        public void testPlay() throws Exception { 
    4344                // experienced many problems with javazoom and sample.ogg ?! 
    44                 URI resource = OggTestResources.getResource("sample.wav").toURI(); 
     45                URI resource = URIs.toURI(OggTestResources.getResource("sample.wav")); 
    4546 
    4647                ResourcePlaylist playlist = new ResourcePlaylist(ResourceLocators 

  • trunk/source/org/kolaka/freecast/transport/receiver/test/PlaylistEncoderReceiverTest.java

    r75 r76  
    2828import junit.framework.TestCase; 
    2929 
     30import org.kolaka.freecast.resource.URIs; 
    3031import org.kolaka.freecast.transport.receiver.PlaylistEncoderReceiver; 
    3132import org.kolaka.freecast.transport.receiver.PlaylistEncoderReceiverConfiguration; 
    …… 
    4041                URL playlist = getClass().getResource("resources/playlist.m3u"); 
    4142 
    42                 configuration.setUri(playlist.toURI()); 
     43                configuration.setUri(URIs.toURI(playlist)); 
    4344                configuration.validate(); 
    4445