From 0caef26c0b98bcade3d66134fe1f5140486a9cc3 Mon Sep 17 00:00:00 2001 From: kcr Date: Wed, 14 Nov 2018 13:26:16 +0100 Subject: [PATCH] 8213837: FX samples cannot load media from download.java.net over http Reviewed-by: mbilla --- .../ensemble/samples/charts/area/audio/AudioAreaChartApp.java | 4 ++-- .../ensemble/samples/charts/bar/audio/AudioBarChartApp.java | 4 ++-- .../samples/media/advancedmedia/AdvancedMediaApp.java | 4 ++-- .../media/overlaymediaplayer/OverlayMediaPlayerApp.java | 4 ++-- .../media/streamingmediaplayer/StreamingMediaPlayerApp.java | 4 ++-- apps/toys/Hello/src/main/java/hello/HelloMedia.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java index 1cd6888db4..ba98e8a86e 100644 --- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java +++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2018, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -67,7 +67,7 @@ public class AudioAreaChartApp extends Application { private XYChart.Data[] series1Data; private AudioSpectrumListener audioSpectrumListener; private static final String AUDIO_URI = System.getProperty("demo.audio.url", - "http://download.oracle.com/otndocs/javafx/JavaRap_Audio.mp4"); + "https://download.oracle.com/otndocs/javafx/JavaRap_Audio.mp4"); private MediaPlayer audioMediaPlayer; private static final boolean PLAY_AUDIO = Boolean.parseBoolean( System.getProperty("demo.play.audio", "true")); diff --git a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/audio/AudioBarChartApp.java b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/audio/AudioBarChartApp.java index 46906ed133..03ddef11ff 100644 --- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/audio/AudioBarChartApp.java +++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/audio/AudioBarChartApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2018, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -72,7 +72,7 @@ public class AudioBarChartApp extends Application { private AudioSpectrumListener audioSpectrumListener; private static final String AUDIO_URI = System.getProperty("demo.audio.url", - "http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"); + "https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"); private MediaPlayer audioMediaPlayer; private static final boolean PLAY_AUDIO = Boolean.parseBoolean( System.getProperty("demo.play.audio", "true")); diff --git a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/AdvancedMediaApp.java b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/AdvancedMediaApp.java index c985e381b0..1a81109bb2 100644 --- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/AdvancedMediaApp.java +++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/AdvancedMediaApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2018, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -55,7 +55,7 @@ public class AdvancedMediaApp extends Application { private static final String MEDIA_URL = - "http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"; + "https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"; private MediaPlayer mediaPlayer; private MediaControl mediaControl; diff --git a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java index 634c8e230c..2c8caf0b56 100644 --- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java +++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2018, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -60,7 +60,7 @@ public class OverlayMediaPlayerApp extends Application { public Parent createContent() { final String MEDIA_URL = - "http://download.oracle.com/otndocs/javafx/" + + "https://download.oracle.com/otndocs/javafx/" + "JavaRap_ProRes_H264_768kbit_Widescreen.mp4"; final String overlayMediaPlayerCss = getClass().getResource("OverlayMediaPlayer.css").toExternalForm(); diff --git a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java index 46c1b8cd67..e1fbccc7ff 100644 --- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java +++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2018, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -59,7 +59,7 @@ public class StreamingMediaPlayerApp extends Application { public Parent createContent() { final String MEDIA_URL = - "http://download.oracle.com/otndocs/javafx/" + + "https://download.oracle.com/otndocs/javafx/" + "JavaRap_ProRes_H264_768kbit_Widescreen.mp4"; final String streamingMediaPlayerCss = getClass().getResource("StreamingMediaPlayer.css").toExternalForm(); diff --git a/apps/toys/Hello/src/main/java/hello/HelloMedia.java b/apps/toys/Hello/src/main/java/hello/HelloMedia.java index d58e4cf7a9..310178ac9f 100644 --- a/apps/toys/Hello/src/main/java/hello/HelloMedia.java +++ b/apps/toys/Hello/src/main/java/hello/HelloMedia.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,7 +45,7 @@ public class HelloMedia extends Application { private static final String DEFAULT_SOURCE = - "http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"; + "https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4"; private static String argSource = null; @Override