Merge 'svn/trunk' into release

hamsterdog6 · Jan 29, 2014 · fbe9d43 · fbe9d43
2 parents ab7c296 + 096bbe7
commit fbe9d43
Show file tree

Hide file tree

Showing 214 changed files with 15,298 additions and 1,000 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>4.9.beta3</version>
+    <version>4.9</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>4.9.beta3</version>
+        <version>4.9</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>4.9.beta3</version>
+        <version>4.9</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
@@ -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,8 +66,8 @@ 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_BETA_VERSION = "4.9.beta3";
+    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;
 

diff --git a/...ain/java/net/sourceforge/subsonic/backend/controller/RedirectionManagementController.java b/...ain/java/net/sourceforge/subsonic/backend/controller/RedirectionManagementController.java
@@ -18,19 +18,8 @@
  */
 package net.sourceforge.subsonic.backend.controller;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import net.sourceforge.subsonic.backend.dao.RedirectionDao;
+import net.sourceforge.subsonic.backend.domain.Redirection;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
@@ -44,8 +33,17 @@
 import org.springframework.web.bind.ServletRequestUtils;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 
-import net.sourceforge.subsonic.backend.dao.RedirectionDao;
-import net.sourceforge.subsonic.backend.domain.Redirection;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Sindre Mehus
@@ -207,7 +205,7 @@ public void test(HttpServletRequest request, HttpServletResponse response) throw
         if (!url.endsWith("/")) {
             url += "/";
         }
-        url += "icons/favicon.ico";
+        url += "index.html";
 
         HttpClient client = new DefaultHttpClient();
         HttpConnectionParams.setConnectionTimeout(client.getParams(), 15000);

diff --git a/...ackend/src/main/java/net/sourceforge/subsonic/backend/service/EmailReminderGenerator.java b/...ackend/src/main/java/net/sourceforge/subsonic/backend/service/EmailReminderGenerator.java
@@ -159,7 +159,7 @@ public void sendReminder(Date licenseExpires, String firstName, String to, Email
                 null,
                 Arrays.asList("[email protected]", "[email protected]"),
                 Arrays.asList("[email protected]"),
-                "Your Subsonic Premium license is about to expire",
+                "Your Subsonic Premium subscription is about to expire",
                 createEmailContent(licenseExpires, firstName));
         LOG.info("Sent email reminder to " + to);
     }
@@ -171,13 +171,13 @@ private String createEmailContent(Date licenseExpires, String firstName) {
         }
         return "Dear " + firstName + ",\n" +
                 "\n" +
-                "This is a friendly reminder that your Subsonic Premium license expires on " + DATE_FORMAT.format(licenseExpires) + ".\n" +
+                "This is a friendly reminder that your Subsonic Premium subscription expires on " + DATE_FORMAT.format(licenseExpires) + ".\n" +
                 "\n" +
-                "We hope that you enjoy the service and that you want to renew your license.\n" +
+                "We hope that you enjoy the service and that you choose to renew your subscription.\n" +
                 "\n" +
-                "Please visit http://premium.subsonic.org to stay in business!\n" +
+                "Please visit http://premium.subsonic.org for more details and purchase options!\n" +
                 "\n" +
-                "If you previously selected the automatic renewal option you will be charged automatically, and no action is required on your part.\n" +
+                "Note: If you previously selected the automatic renewal option you will be charged automatically, and no action is required on your part.\n" +
                 "\n" +
                 "Best regards,\n" +
                 "The Subsonic team\n" +

diff --git a/subsonic-backend/src/main/webapp/WEB-INF/jsp/backend/db.jsp b/subsonic-backend/src/main/webapp/WEB-INF/jsp/backend/db.jsp
@@ -6,12 +6,14 @@
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/fonts/fonts.css">
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/grid/grid.css">
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/base/base.css">
-</head><body>
+</head>
+
+<body onload="document.getElementById('query').focus()">
 
 <h1>Database query</h1>
 
 <form method="post" action="db.view">
-    <textarea rows="10" cols="80" name="query" style="margin-top:1em">${model.query}</textarea>
+    <textarea rows="10" cols="80" id="query" name="query" style="margin-top:1em">${model.query}</textarea>
     <input type="submit" value="OK">
     <input type="hidden" name="p" value="${model.p}">
 </form>

diff --git a/subsonic-backend/src/main/webapp/WEB-INF/jsp/backend/requestLicense.jsp b/subsonic-backend/src/main/webapp/WEB-INF/jsp/backend/requestLicense.jsp
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/grid/grid.css">
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/base/base.css">
 </head>
-<body>
+<body onload="document.getElementById('email').focus()">
 
 <h1>Resend Subsonic license key</h1>
 
@@ -31,7 +31,7 @@
     <c:otherwise>
         <form method="post" action="requestLicense.view">
             <label>Email address
-                <input type="text" size="30" name="email">
+                <input type="text" size="30" id="email" name="email">
             </label>
             <input type="submit" value="Send license key">
         </form>

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>4.9.beta3</version>
+        <version>4.9</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>4.9.beta3</version>
+        <version>4.9</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>4.9.beta3</version>
+        <version>4.9</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>4.9.beta3</version>
+        <version>4.9</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>4.9.beta3</version>
+        <version>4.9</version>
     </parent>
 
     <properties>