From c977b87de3e32436428daf9b10cc8e49be83c28d Mon Sep 17 00:00:00 2001 From: Patrik Date: Sat, 6 Feb 2016 18:55:45 +0100 Subject: [PATCH] Compiles but some of the music only stuff is back and colors needs to be changed --- pom.xml | 2 +- subsonic-assembly/pom.xml | 2 +- subsonic-backend/pom.xml | 2 +- .../backend/controller/MultiController.java | 2 +- subsonic-booter/pom.xml | 2 +- subsonic-installer-debian/pom.xml | 2 +- subsonic-installer-mac/pom.xml | 2 +- subsonic-installer-rpm/pom.xml | 2 +- subsonic-installer-windows/pom.xml | 2 +- subsonic-main/TODO.TXT | 20 ++-- subsonic-main/pom.xml | 2 +- .../subsonic/controller/JAXBWriter.java | 2 +- .../i18n/ResourceBundle_ja_JP.properties | 2 +- .../src/main/webapp/WEB-INF/jsp/head.jsp | 1 - .../io/RangeOutputStreamTestCase.java | 105 ------------------ .../service/SettingsServiceTestCase.java | 2 +- subsonic-rest-api/pom.xml | 2 +- subsonic-site/pom.xml | 2 +- subsonic-site/src/main/webapp/api.jsp | 2 +- subsonic-site/src/main/webapp/changelog.jsp | 2 +- subsonic-site/src/main/webapp/download.jsp | 2 +- subsonic-sonos-api/pom.xml | 2 +- subsonic-web/version.html | 2 +- 23 files changed, 30 insertions(+), 136 deletions(-) delete mode 100644 subsonic-main/src/test/java/net/sourceforge/subsonic/io/RangeOutputStreamTestCase.java diff --git a/pom.xml b/pom.xml index b426915..226e81d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 Subsonic pom diff --git a/subsonic-assembly/pom.xml b/subsonic-assembly/pom.xml index c3f4884..2d1f805 100644 --- a/subsonic-assembly/pom.xml +++ b/subsonic-assembly/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-backend/pom.xml b/subsonic-backend/pom.xml index e8a9242..21231d5 100644 --- a/subsonic-backend/pom.xml +++ b/subsonic-backend/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java b/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java index b2bbae7..7dca707 100644 --- a/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java +++ b/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java @@ -67,7 +67,7 @@ public class MultiController extends MultiActionController { private static final Logger LOG = Logger.getLogger(MultiController.class); private static final String SUBSONIC_VERSION = "5.3"; - private static final String SUBSONIC_BETA_VERSION = "6.0.beta1"; + private static final String SUBSONIC_BETA_VERSION = "1.1.beta1"; private static final Date LICENSE_DATE_THRESHOLD; diff --git a/subsonic-booter/pom.xml b/subsonic-booter/pom.xml index 9e49c80..149df38 100644 --- a/subsonic-booter/pom.xml +++ b/subsonic-booter/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-installer-debian/pom.xml b/subsonic-installer-debian/pom.xml index 83a3624..f0e4863 100644 --- a/subsonic-installer-debian/pom.xml +++ b/subsonic-installer-debian/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-installer-mac/pom.xml b/subsonic-installer-mac/pom.xml index 41cbf97..356afbd 100644 --- a/subsonic-installer-mac/pom.xml +++ b/subsonic-installer-mac/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-installer-rpm/pom.xml b/subsonic-installer-rpm/pom.xml index 37a65ed..10f16fb 100644 --- a/subsonic-installer-rpm/pom.xml +++ b/subsonic-installer-rpm/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-installer-windows/pom.xml b/subsonic-installer-windows/pom.xml index 0e6dd59..eb514e3 100644 --- a/subsonic-installer-windows/pom.xml +++ b/subsonic-installer-windows/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT index 93cb167..0164214 100644 --- a/subsonic-main/TODO.TXT +++ b/subsonic-main/TODO.TXT @@ -920,7 +920,7 @@ Check that correct local version is displayed. Upload files to SourceForge (in separate shell, REMEMBER TO CHANGE VERSION BELOW). On Mac OS: - scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.release/ + scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* root@subsonic.org:/usr/local/jakarta/tomcat/download/ On Windows @@ -928,7 +928,7 @@ On Windows svn info svn update mvn clean install -Pfull - scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.release/ + scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-windows/target/subsonic*-setup.exe root@subsonic.org:/usr/local/jakarta/tomcat/download/ On demo.subsonic.org (Ubuntu) @@ -939,7 +939,7 @@ On demo.subsonic.org (Ubuntu) mvn clean -Pfull,debian svn st mvn install -Pfull,debian - scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.release/ + scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-debian/target/subsonic*.deb root@subsonic.org:/usr/local/jakarta/tomcat/download/ On subsonic.org (Fedora) @@ -950,7 +950,7 @@ On subsonic.org (Fedora) mvn clean -Pfull,rpm svn st mvn install -Pfull,rpm - scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.release/ + scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ # scp subsonic-installer-rpm/target/subsonic*.rpm root@subsonic.org:/usr/local/jakarta/tomcat/download/ cp subsonic-installer-rpm/target/subsonic*.rpm /var/lib/tomcat/download/ @@ -960,7 +960,7 @@ Modify FRS properties Upload site (OLD): rsync -avP -e ssh --exclude ".*" subsonic-web/ sindre_mehus,subsonic@web.sourceforge.net:htdocs/ -svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-1.0.release -m "Tagging 1.0.release" +svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-1.1.beta1 -m "Tagging 1.1.beta1" Post message on forum. Checking for license abuse: @@ -3272,7 +3272,7 @@ Check that correct local version is displayed. Upload files to SourceForge (in separate shell, REMEMBER TO CHANGE VERSION BELOW). On Mac OS: - scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/ + scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* root@subsonic.org:/var/lib/tomcat/download/ On Windows @@ -3280,7 +3280,7 @@ On Windows svn info svn update mvn clean install -Pfull - scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/ + scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-windows/target/subsonic*-setup.exe root@subsonic.org:/var/lib/tomcat/download/ On demo.subsonic.org (Ubuntu) @@ -3291,7 +3291,7 @@ On demo.subsonic.org (Ubuntu) mvn clean -Pfull,debian svn st mvn install -Pfull,debian - scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/ + scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ scp subsonic-installer-debian/target/subsonic*.deb root@subsonic.org:/var/lib/tomcat/download/ On subsonic.org (Fedora) @@ -3302,7 +3302,7 @@ On subsonic.org (Fedora) mvn clean -Pfull,rpm svn st mvn install -Pfull,rpm - scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/ + scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/ # scp subsonic-installer-rpm/target/subsonic*.rpm root@subsonic.org:/usr/local/jakarta/tomcat/download/ cp subsonic-installer-rpm/target/subsonic*.rpm /var/lib/tomcat/download/ @@ -3312,7 +3312,7 @@ Modify FRS properties Upload site (OLD): rsync -avP -e ssh --exclude ".*" subsonic-web/ sindre_mehus,subsonic@web.sourceforge.net:htdocs/ -svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-6.0.beta1 -m "Tagging 6.0.beta1" +svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-1.1.beta1 -m "Tagging 1.1.beta1" Post message on forum. Checking for license abuse: diff --git a/subsonic-main/pom.xml b/subsonic-main/pom.xml index e5b56f8..77f9cf9 100644 --- a/subsonic-main/pom.xml +++ b/subsonic-main/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/JAXBWriter.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/JAXBWriter.java index 96adf20..6166733 100644 --- a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/JAXBWriter.java +++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/JAXBWriter.java @@ -103,7 +103,7 @@ public String getRestProtocolVersion() { } public void updateVersionsFile(){ - String current = "1.0.release"; + String current = "1.1.beta1"; String versionCheck = KakaduaUtil.http_get_contents("http://booksonic.org/versioncheck.php?server&v="+current); KakaduaUtil.file_write("versionCheck", versionCheck); } diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties index 92f5537..07fa041 100644 --- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties +++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties @@ -2,7 +2,7 @@ # Japanese localization. # Author: Takahiro Suzuki (takahiro.suzuki.ja GMAIL) # Author: Kenji Maekawa (chameleon@vega.ocn.ne.jp) -# Author: ChameleonCyber\u0081iFor Version1.0.release\u0081@2015/08/23) +# Author: ChameleonCyber\u0081iFor Version1.1.beta1\u0081@2015/08/23) common.home = \u30DB\u30FC\u30E0 common.back = \u623B\u308B diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp index 0bd8eac..c21202b 100644 --- a/subsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp +++ b/subsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp @@ -1,5 +1,4 @@ <%@ include file="include.jsp" %> -´ "/> diff --git a/subsonic-main/src/test/java/net/sourceforge/subsonic/io/RangeOutputStreamTestCase.java b/subsonic-main/src/test/java/net/sourceforge/subsonic/io/RangeOutputStreamTestCase.java deleted file mode 100644 index 983b8ef..0000000 --- a/subsonic-main/src/test/java/net/sourceforge/subsonic/io/RangeOutputStreamTestCase.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - This file is part of Subsonic. - - Subsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Subsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Subsonic. If not, see . - - Copyright 2014 (C) Sindre Mehus - */ -package net.sourceforge.subsonic.io; - -import junit.framework.TestCase; -import net.sourceforge.subsonic.util.HttpRange; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * @author Sindre Mehus - * @version $Id$ - */ -public class RangeOutputStreamTestCase extends TestCase { - - public void testWrap() throws Exception { - doTestWrap(0, 99, 100, 1); - doTestWrap(0, 99, 100, 10); - doTestWrap(0, 99, 100, 13); - doTestWrap(0, 99, 100, 70); - doTestWrap(0, 99, 100, 100); - - doTestWrap(10, 99, 100, 1); - doTestWrap(10, 99, 100, 10); - doTestWrap(10, 99, 100, 13); - doTestWrap(10, 99, 100, 70); - doTestWrap(10, 99, 100, 100); - - doTestWrap(66, 66, 100, 1); - doTestWrap(66, 66, 100, 2); - - doTestWrap(10, 20, 100, 1); - doTestWrap(10, 20, 100, 10); - doTestWrap(10, 20, 100, 13); - doTestWrap(10, 20, 100, 70); - doTestWrap(10, 20, 100, 100); - - for (int start = 0; start < 10; start++) { - for (int end = start; end < 10; end++) { - for (int bufferSize = 1; bufferSize < 10; bufferSize++) { - doTestWrap(start, end, 10, bufferSize); - doTestWrap(start, null, 10, bufferSize); - } - } - } - } - - private void doTestWrap(int first, Integer last, int sourceSize, int bufferSize) throws Exception { - byte[] source = createSource(sourceSize); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - OutputStream rangeOut = RangeOutputStream.wrap(out, new HttpRange((long) first, last == null ? null : last.longValue())); - copy(source, rangeOut, bufferSize); - verify(out.toByteArray(), first, last, sourceSize); - } - - private void verify(byte[] bytes, int first, Integer last, int sourceSize) { - if (last == null) { - assertEquals(sourceSize - first, bytes.length); - } else { - assertEquals(last - first + 1, bytes.length); - } - for (int i = 0; i < bytes.length; i++) { - assertEquals(first + i, bytes[i]); - } - } - - private void copy(byte[] source, OutputStream out, int bufsz) throws IOException { - InputStream in = new ByteArrayInputStream(source); - byte[] buffer = new byte[bufsz]; - int n; - while (-1 != (n = in.read(buffer))) { - int split = n / 2; - out.write(buffer, 0, split); - out.write(buffer, split, n - split); - } - } - - private byte[] createSource(int size) { - byte[] result = new byte[size]; - for (int i = 0; i < result.length; i++) { - result[i] = (byte) i; - } - return result; - } -} diff --git a/subsonic-main/src/test/java/net/sourceforge/subsonic/service/SettingsServiceTestCase.java b/subsonic-main/src/test/java/net/sourceforge/subsonic/service/SettingsServiceTestCase.java index dd64278..513d4e6 100644 --- a/subsonic-main/src/test/java/net/sourceforge/subsonic/service/SettingsServiceTestCase.java +++ b/subsonic-main/src/test/java/net/sourceforge/subsonic/service/SettingsServiceTestCase.java @@ -38,7 +38,7 @@ public class SettingsServiceTestCase extends TestCase { @Override protected void setUp() throws Exception { - System.setProperty("subsonic.home", SUBSONIC_HOME.getPath()); + System.setProperty("booksonic.home", SUBSONIC_HOME.getPath()); new File(SUBSONIC_HOME, "booksonic.properties").delete(); settingsService = new SettingsService(); } diff --git a/subsonic-rest-api/pom.xml b/subsonic-rest-api/pom.xml index 81128b7..d0c697e 100644 --- a/subsonic-rest-api/pom.xml +++ b/subsonic-rest-api/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.subsonic subsonic - 1.0.release + 1.1.beta1 diff --git a/subsonic-site/pom.xml b/subsonic-site/pom.xml index 36ddba0..d1b8cd2 100644 --- a/subsonic-site/pom.xml +++ b/subsonic-site/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.release + 1.1.beta1 diff --git a/subsonic-site/src/main/webapp/api.jsp b/subsonic-site/src/main/webapp/api.jsp index 5c36048..e1492c2 100644 --- a/subsonic-site/src/main/webapp/api.jsp +++ b/subsonic-site/src/main/webapp/api.jsp @@ -260,7 +260,7 @@ 6.0 - 1.14.0 + 1.14.0 diff --git a/subsonic-site/src/main/webapp/changelog.jsp b/subsonic-site/src/main/webapp/changelog.jsp index 3c3f5e7..7b4aec9 100644 --- a/subsonic-site/src/main/webapp/changelog.jsp +++ b/subsonic-site/src/main/webapp/changelog.jsp @@ -16,7 +16,7 @@
-

Subsonic 6.0.beta1 - Feb 05, 2016

+

Subsonic 1.1.beta1 - Feb 05, 2016

  • New: Completely overhauled user interface.
  • New: HTML5 audio and video playback.
  • diff --git a/subsonic-site/src/main/webapp/download.jsp b/subsonic-site/src/main/webapp/download.jsp index afc65e6..a9b3874 100644 --- a/subsonic-site/src/main/webapp/download.jsp +++ b/subsonic-site/src/main/webapp/download.jsp @@ -23,7 +23,7 @@ <%@ include file="head.jsp" %> <%-- Uncomment if beta is available.--%> - + diff --git a/subsonic-sonos-api/pom.xml b/subsonic-sonos-api/pom.xml index 483ac7e..580f9cb 100644 --- a/subsonic-sonos-api/pom.xml +++ b/subsonic-sonos-api/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.subsonic subsonic - 6.0.beta1 + 1.1.beta1 diff --git a/subsonic-web/version.html b/subsonic-web/version.html index 4a03f55..3d12e8e 100644 --- a/subsonic-web/version.html +++ b/subsonic-web/version.html @@ -5,7 +5,7 @@

    SUBSONIC_FULL_VERSION_BEGIN5.3SUBSONIC_FULL_VERSION_END

    -

    SUBSONIC_BETA_VERSION_BEGIN6.0.beta1SUBSONIC_BETA_VERSION_END

    +

    SUBSONIC_BETA_VERSION_BEGIN1.1.beta1SUBSONIC_BETA_VERSION_END

    SUBSONIC_ANDROID_VERSION_BEGIN1.7.1SUBSONIC_ANDROID_VERSION_END