Upgraded to 4.9

git-svn-id: https://svn.code.sf.net/p/subsonic/code/trunk@3816 104adb81-38d2-4886-885e-82898e39ce25

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.subsonic</groupId>
     <artifactId>subsonic</artifactId>
-    <version>4.9.beta4</version>
+    <version>4.9</version>
     <name>Subsonic</name>
     <packaging>pom</packaging>
     <organization>

subsonic-assembly/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <dependencies>

subsonic-backend/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <dependencies>

subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java

@@ -18,28 +18,6 @@
  */
 package net.sourceforge.subsonic.backend.controller;
 
-import net.sourceforge.subsonic.backend.Util;
-import net.sourceforge.subsonic.backend.dao.DaoHelper;
-import net.sourceforge.subsonic.backend.dao.PaymentDao;
-import net.sourceforge.subsonic.backend.dao.SubscriptionDao;
-import net.sourceforge.subsonic.backend.domain.Payment;
-import net.sourceforge.subsonic.backend.domain.Subscription;
-import net.sourceforge.subsonic.backend.service.EmailSession;
-import net.sourceforge.subsonic.backend.service.LicenseGenerator;
-import net.sourceforge.subsonic.backend.service.WhitelistGenerator;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.log4j.Logger;
-import org.joda.money.CurrencyUnit;
-import org.joda.money.Money;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.ColumnMapRowMapper;
-import org.springframework.web.bind.ServletRequestBindingException;
-import org.springframework.web.bind.ServletRequestUtils;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
@@ -55,6 +33,30 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.log4j.Logger;
+import org.joda.money.CurrencyUnit;
+import org.joda.money.Money;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ColumnMapRowMapper;
+import org.springframework.web.bind.ServletRequestBindingException;
+import org.springframework.web.bind.ServletRequestUtils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
+
+import net.sourceforge.subsonic.backend.Util;
+import net.sourceforge.subsonic.backend.dao.DaoHelper;
+import net.sourceforge.subsonic.backend.dao.PaymentDao;
+import net.sourceforge.subsonic.backend.dao.SubscriptionDao;
+import net.sourceforge.subsonic.backend.domain.Payment;
+import net.sourceforge.subsonic.backend.domain.Subscription;
+import net.sourceforge.subsonic.backend.service.EmailSession;
+import net.sourceforge.subsonic.backend.service.LicenseGenerator;
+import net.sourceforge.subsonic.backend.service.WhitelistGenerator;
+
 /**
  * Multi-controller used for simple pages.
  *
@@ -64,7 +66,7 @@ public class MultiController extends MultiActionController {
 
     private static final Logger LOG = Logger.getLogger(RedirectionController.class);
 
-    private static final String SUBSONIC_VERSION = "4.8";
+    private static final String SUBSONIC_VERSION = "4.9";
     private static final String SUBSONIC_BETA_VERSION = "4.9.beta4";
 
     private static final Date LICENSE_DATE_THRESHOLD;

subsonic-booter/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <dependencies>

subsonic-installer-debian/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <profiles>

subsonic-installer-mac/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <dependencies>

subsonic-installer-rpm/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <profiles>

subsonic-installer-windows/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <properties>

subsonic-main/TODO.TXT

@@ -1,8 +1,5 @@
 DONE IN 4.9
 -----------
-Rename "Download" to "Download all"
-Rename "More actions..." to "Selected songs..."
-When playing a song, queue only later songs (not earlier).
 
 TODO IN 4.9
 --------------
@@ -816,8 +813,8 @@ Vis "lignende" album.
 
 HOW TO RELEASE
 ===============================
-Update version number in pom.xml, version.html, MultiController.java.
-Update changelog.jsp, download.jsp
+Update version number in pom.xml, version.html, MultiController.java, download.jsp
+Update changelog.jsp
 Commit
 svn up
 mvn clean -P full
@@ -826,21 +823,21 @@ cd subsonic-assembly; mvn assembly:assembly; cd ..
 Deploy
 Check that correct local version is displayed.
 Upload files to SourceForge (in separate shell, REMEMBER TO CHANGE VERSION BELOW).
-  rsync -avP -e ssh subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9.beta4/
-  rsync -avP -e ssh subsonic-assembly/target/subsonic* sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9.beta4/
+  rsync -avP -e ssh subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9/
+  rsync -avP -e ssh subsonic-assembly/target/subsonic* sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9/
 
 On Mac OS:
-  rsync -avP -e ssh subsonic-installer-mac/target/subsonic*.pkg sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9.beta4/
+  rsync -avP -e ssh subsonic-installer-mac/target/subsonic*.pkg sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9/
 
 On VirtualBox Ubuntu
   svn update
   mvn clean install -Pfull
-  rsync -avP -e ssh subsonic-installer-debian/target/subsonic*.deb sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9.beta4/
+  rsync -avP -e ssh subsonic-installer-debian/target/subsonic*.deb sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9/
 
 On VirtualBox Fedora
   svn update
   mvn clean install -Pfull
-  rsync -avP -e ssh subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9.beta4/
+  rsync -avP -e ssh subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,[email protected]:/home/frs/project/s/su/subsonic/subsonic/4.9/
 
 Modify FRS properties
   https://sourceforge.net/projects/subsonic/files/subsonic/
@@ -851,7 +848,7 @@ Upload site (OLD):
 Upload site (NEW):
   rsync -avP -e ssh --exclude ".*" subsonic-site/src/main/webapp/  [email protected]:/usr/local/jakarta/tomcat/webapps/pages/
 
-svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/p/subsonic/code/tags/release-4.9.beta4 -m "Tagging 4.9.beta4"
+svn copy svn+ssh://[email protected]/p/subsonic/code/trunk svn+ssh://[email protected]/p/subsonic/code/tags/release-4.9 -m "Tagging 4.9"
 Register at freshmeat.
 Post message on forum.
 Update version number in pom.xml etc.
@@ -862,27 +859,29 @@ Upgrade Subsonic backend: CHANGE DATE BELOW
   Backup backend database.
     Checkpoint database (db.view)
     cd /var/subsonic-backend
-    tar cvf db-backup-2013-12-15.tar db
+    tar cvf db-backup-2014-01-04.tar db
   cd subsonic-backend
   mvn clean install
 
-  mkdir /usr/local/jakarta/tomcat/webapps-2013-12-15/
+  mkdir /usr/local/jakarta/tomcat/webapps-2014-01-04/
 
-  scp subsonic-backend/target/subsonic-backend-*.war [email protected]:/usr/local/jakarta/tomcat/webapps-2013-12-15/ROOT.war
-  scp subsonic-main/target/subsonic.war              [email protected]:/usr/local/jakarta/tomcat/webapps-2013-12-15/demo.war
-  rsync -rlptDvP -e ssh --exclude .svn subsonic-site/src/main/webapp/  [email protected]:/usr/local/jakarta/tomcat/webapps-2013-12-15/pages
+  scp subsonic-backend/target/subsonic-backend-*.war [email protected]:/usr/local/jakarta/tomcat/webapps-2014-01-04/ROOT.war
+  scp subsonic-main/target/subsonic.war              [email protected]:/usr/local/jakarta/tomcat/webapps-2014-01-04/demo.war
+  rsync -rlptDvP -e ssh --exclude .svn subsonic-site/src/main/webapp/  [email protected]:/usr/local/jakarta/tomcat/webapps-2014-01-04/pages
 
 
   Checkpoint database (db.view)
   ssh [email protected]
   cd /usr/local/jakarta/tomcat
   ps -elf | grep jsvc
   /usr/sbin/stoptomcat
+  ps -elf | grep jsvc
   rm webapps
-  ln -s webapps-2013-12-15 webapps
-
+  ln -s webapps-2014-01-04 webapps
+  ll webapps/
   rm -rf work logs/*
   /usr/sbin/starttomcat
+  ps -elf | grep jsvc
 
 Update backup server
 

subsonic-main/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
     <dependencies>

subsonic-site/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>4.9.beta4</version>
+        <version>4.9</version>
     </parent>
 
 </project>

subsonic-site/src/main/webapp/changelog.jsp

@@ -17,6 +17,13 @@
         <div id="main-col">
             <h1 class="bottomspace">Subsonic Change Log</h1>
 
+            <a name="4.9"><h2 class="div">Subsonic 4.9 - Jan 09, 2014</h2></a>
+            <ul>
+                <li><span class="bugid">New: </span>Rename "Download" to "Download all"</li>
+                <li><span class="bugid">New: </span>Rename "More actions..." to "Selected songs..."</li>
+                <li><span class="bugid">New: </span>When playing a song, queue only later songs (not earlier).</li>
+            </ul>
+
             <a name="4.9.beta4"><h2 class="div">Subsonic 4.9.beta4 - Jan 04, 2014</h2></a>
             <ul>
                 <li><span class="bugid">New: </span>Support playlist sharing on Facebook etc.</li>
@@ -138,6 +145,7 @@
             <div class="sidebox">
                 <h2>Releases</h2>
                 <ul class="list">
+                    <li><a href="#4.9">Subsonic 4.9</a></li>
                     <li><a href="#4.9.beta4">Subsonic 4.9.beta4</a></li>
                     <li><a href="#4.9.beta3">Subsonic 4.9.beta3</a></li>
                     <li><a href="#4.9.beta2">Subsonic 4.9.beta2</a></li>

subsonic-site/src/main/webapp/download.jsp

@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <%!
-    String stable = "4.8";
-    String beta = "4.9.beta4"; // Set to null if no beta is available.
+    String stable = "4.9";
+    String beta = null; // Set to null if no beta is available.
 %>
 <%@ include file="header.jsp" %>
 

subsonic-web/version.html

@@ -3,7 +3,7 @@
 <html>
 <body>
 
-<p>SUBSONIC_FULL_VERSION_BEGIN4.8SUBSONIC_FULL_VERSION_END</p>
+<p>SUBSONIC_FULL_VERSION_BEGIN4.9SUBSONIC_FULL_VERSION_END</p>
 
 <p>SUBSONIC_BETA_VERSION_BEGIN4.9.beta4SUBSONIC_BETA_VERSION_END</p>