Compiles but some of the music only stuff is back and colors needs to…

… be changed
popeen · Feb 6, 2016 · c977b87 · c977b87
1 parent 054ce6c
commit c977b87
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 136 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.subsonic</groupId>
     <artifactId>subsonic</artifactId>
-    <version>6.0.beta1</version>
+    <version>1.1.beta1</version>
     <name>Subsonic</name>
     <packaging>pom</packaging>
     <organization>

diff --git a/subsonic-assembly/pom.xml b/subsonic-assembly/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-backend/pom.xml b/subsonic-backend/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <dependencies>

diff --git a/...ic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java b/...ic-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
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-installer-debian/pom.xml b/subsonic-installer-debian/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <profiles>

diff --git a/subsonic-installer-mac/pom.xml b/subsonic-installer-mac/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-installer-rpm/pom.xml b/subsonic-installer-rpm/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <profiles>

diff --git a/subsonic-installer-windows/pom.xml b/subsonic-installer-windows/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <properties>

diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT
@@ -920,15 +920,15 @@ 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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.0.release/
+  scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* [email protected]:/usr/local/jakarta/tomcat/download/
 
 On Windows
   # Verify that we're on trunk
   svn info
   svn update
   mvn clean install -Pfull
-  scp subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.0.release/
+  scp subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-windows/target/subsonic*-setup.exe  [email protected]:/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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.0.release/
+  scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-debian/target/subsonic*.deb [email protected]:/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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.0.release/
+  scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
 #  scp subsonic-installer-rpm/target/subsonic*.rpm [email protected]:/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,[email protected]:htdocs/
 
-svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/p/subsonic/code/tags/release-1.0.release -m "Tagging 1.0.release"
+svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/p/subsonic/code/tags/release-1.1.beta1 -m "Tagging 1.1.beta1"
 Post message on forum.
 
 Checking for license abuse:
@@ -3272,15 +3272,15 @@ 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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/
+  scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* [email protected]:/var/lib/tomcat/download/
 
 On Windows
   # Verify that we're on trunk
   svn info
   svn update
   mvn clean install -Pfull
-  scp subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/
+  scp subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-windows/target/subsonic*-setup.exe  [email protected]:/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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/
+  scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
   scp subsonic-installer-debian/target/subsonic*.deb [email protected]:/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,[email protected]:/home/frs/project/s/su/subsonic/subsonic/6.0.beta1/
+  scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/1.1.beta1/
 #  scp subsonic-installer-rpm/target/subsonic*.rpm [email protected]:/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,[email protected]:htdocs/
 
-svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/p/subsonic/code/tags/release-6.0.beta1 -m "Tagging 6.0.beta1"
+svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/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
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 <repositories>
 

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
@@ -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/...nic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties b/...nic-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 ([email protected])
-# 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
@@ -1,5 +1,4 @@
 <%@ include file="include.jsp" %>
-´
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <c:set var="styleSheet"><spring:theme code="styleSheet"/></c:set>
 <link rel="icon" type="image/png" href="<c:url value="/icons/favicon.png"/>"/>

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
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
@@ -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
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.0.release</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <build>

diff --git a/subsonic-site/pom.xml b/subsonic-site/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.0.release</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-site/src/main/webapp/api.jsp b/subsonic-site/src/main/webapp/api.jsp
@@ -260,7 +260,7 @@
         <tr>
             <td>6.0</td>
             <td>
-                <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-6.0.beta1/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
+                <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-1.1.beta1/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
             </td>
         </tr>
         <tr>

diff --git a/subsonic-site/src/main/webapp/changelog.jsp b/subsonic-site/src/main/webapp/changelog.jsp
@@ -16,7 +16,7 @@
 
 <section class="box">
 
-    <a name="6.0.beta1"><h3>Subsonic 6.0.beta1 - Feb 05, 2016</h3></a>
+    <a name="1.1.beta1"><h3>Subsonic 1.1.beta1 - Feb 05, 2016</h3></a>
     <ul>
         <li><strong>New:</strong> Completely overhauled user interface.</li>
         <li><strong>New:</strong> HTML5 audio and video playback.</li>

diff --git 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.--%>
-<c:set var="beta" value="6.0.beta1"/>
+<c:set var="beta" value="1.1.beta1"/>
 <c:set var="stable" value="5.3"/>
 
 <body>

diff --git a/subsonic-sonos-api/pom.xml b/subsonic-sonos-api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>6.0.beta1</version>
+        <version>1.1.beta1</version>
     </parent>
 
     <build>

diff --git a/subsonic-web/version.html b/subsonic-web/version.html
@@ -5,7 +5,7 @@
 
 <p>SUBSONIC_FULL_VERSION_BEGIN5.3SUBSONIC_FULL_VERSION_END</p>
 
-<p>SUBSONIC_BETA_VERSION_BEGIN6.0.beta1SUBSONIC_BETA_VERSION_END</p>
+<p>SUBSONIC_BETA_VERSION_BEGIN1.1.beta1SUBSONIC_BETA_VERSION_END</p>
 
 <p>SUBSONIC_ANDROID_VERSION_BEGIN1.7.1SUBSONIC_ANDROID_VERSION_END</p>
 </body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -260,7 +260,7 @@ @@
             <tr>
                 <td>6.0</td>
                 <td>
-                    <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-6.0.beta1/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
+                    <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-1.1.beta1/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
                 </td>
             </tr>
             <tr>
@@ Expand Down @@