RangeOutputstream is missing 1 byte

.gitignore

@@ -4,4 +4,8 @@ target/
 # Package Files #
 *.jar
 *.war
-*.ear
+*.ear
+*.swp
+.project
+.settings
+.classpath

.travis.yml

@@ -1,8 +1,9 @@
 language: java
 
+script: mvn install --quiet -DskipTests=true -P static-resource-optimization
+
 notifications:
-  email:
-    - supersonic-dev@googlegroups.com
+  email: false
 
 # blacklist upstream build since they will not have a TravisCI config
 branches:

INSTALL

@@ -8,9 +8,8 @@ Linux
 First install the packages needed to build Supersonic. It depends on Java and
 the Maven build environment:
 
-
 Debian/Ubuntu/Mint
-sudo apt-get install maven2 openjdk-6-jdk
+sudo apt-get install maven2 openjdk-6-jdk lintian
 
 RedHat/Fedora
 su -c "yum install java-1.6.0-openjdk-devel maven2"
@@ -27,8 +26,22 @@ Change directory into the folder which holds the Supersonic source code and run
 Maven to install a binary package for your distribution:
 
 cd <supersonic source folder>
+
+If you would like to install a specific project only use the following syntax and replace <project> accordingly.
+Each project name is specified by its POM file and happens to match the directory name in Supersonic. For instance,
+to build the Debian project replace <project> with subsonic-installer-debian.
+
+mvn -P full -pl <project> -am install
+
+To build for every available platform do
+
 mvn clean -P full; mvn install -P full
 
+In case of dependency issues, try
+
+mvn install -P full -U 
+
+
 
 Then install the now built binary package for your distribution:
 

pom.xml

@@ -4,19 +4,19 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.mach5.supersonic</groupId>
     <artifactId>supersonic</artifactId>
-    <version>4.7.beta1</version>
+    <version>4.7</version>
     <name>Supersonic</name>
     <packaging>pom</packaging>
     <organization>
-        <name>Mach5</name>
-        <url>https://github.com/mach5/supersonic</url>
+        <name>Der-Jan</name>
+        <url>https://github.com/Der-Jan/supersonic</url>
     </organization>
     <inceptionYear>2011</inceptionYear>
 
     <scm>
-        <url>https://github.com/mach5/supersonic</url>
-        <connection>scm:git:git://github.com/mach5/supersonic.git</connection>
-        <developerConnection>scm:git:git@github.com:mach5/supersonic.git</developerConnection>
+        <url>https://github.com/Der-Jan/supersonic</url>
+        <connection>scm:git:git://github.com/Der-Jan/supersonic.git</connection>
+        <developerConnection>scm:git:git@github.com:Der-Jan/supersonic.git</developerConnection>
     </scm>
 
     <properties>
@@ -57,11 +57,14 @@
             <id>oss.sonatype.org</id>
             <url>http://oss.sonatype.org/content/groups/public</url>
         </pluginRepository>
+        <pluginRepository>
+            <id>ooo-maven-repo</id>
+            <url>http://ooo-maven.googlecode.com/hg/repository</url>
+        </pluginRepository>
     </pluginRepositories>
 
     <modules>
         <module>subsonic-main</module>
-        <!-- <module>subsonic-android</module> -->
     </modules>
 
     <profiles>
@@ -73,10 +76,87 @@
                 <module>subsonic-installer-mac</module>
                 <module>subsonic-installer-debian</module>
                 <module>subsonic-installer-rpm</module>
+                <module>subsonic-backend</module>
+                <module>subsonic-site</module>
                 <module>subsonic-assembly</module>
             </modules>
         </profile>
-
+        <profile>
+            <id>static-resource-optimization</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>net.alchim31.maven</groupId>
+                            <artifactId>yuicompressor-maven-plugin</artifactId>
+                            <version>1.1</version>
+                        </plugin>
+                        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                        <plugin>
+                            <groupId>org.eclipse.m2e</groupId>
+                            <artifactId>lifecycle-mapping</artifactId>
+                            <version>1.0.0</version>
+                            <configuration>
+                                <lifecycleMappingMetadata>
+                                    <pluginExecutions>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>net.alchim31.maven</groupId>
+                                                <artifactId>yuicompressor-maven-plugin</artifactId>
+                                                <versionRange>[1.1,)</versionRange>
+                                                <goals>
+                                                    <goal>compress</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <execute >
+                                                    <runOnIncremental>false</runOnIncremental>
+                                                </execute >
+                                            </action>
+                                        </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>net.alchim31.maven</groupId>
+                                                <artifactId>yuicompressor-maven-plugin</artifactId>
+                                                <versionRange>[1.1,)</versionRange>
+                                                <goals>
+                                                    <goal>jslint</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <execute >
+                                                    <runOnIncremental>false</runOnIncremental>
+                                                </execute >
+                                            </action>
+                                        </pluginExecution>
+                                    </pluginExecutions>
+                                </lifecycleMappingMetadata>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>yuicompressor-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jslint</goal>
+                                    <goal>compress</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <nosuffix>true</nosuffix>
+                            <force>true</force>
+                            <nomunge>true</nomunge>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencyManagement>
@@ -167,11 +247,6 @@
                     <artifactId>buildnumber-maven-plugin</artifactId>
                     <version>1.0</version>
                 </plugin>
-                <plugin>
-                    <groupId>net.alchim31.maven</groupId>
-                    <artifactId>yuicompressor-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
                 <plugin>
                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                     <artifactId>android-maven-plugin</artifactId>
@@ -200,45 +275,15 @@
                                         </execute >
                                     </action>
                                 </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>net.alchim31.maven</groupId>
-                                        <artifactId>yuicompressor-maven-plugin</artifactId>
-                                        <versionRange>[1.1,)</versionRange>
-                                        <goals>
-                                            <goal>compress</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute >
-                                            <runOnIncremental>false</runOnIncremental>
-                                        </execute >
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>net.alchim31.maven</groupId>
-                                        <artifactId>yuicompressor-maven-plugin</artifactId>
-                                        <versionRange>[1.1,)</versionRange>
-                                        <goals>
-                                            <goal>jslint</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute >
-                                            <runOnIncremental>false</runOnIncremental>
-                                        </execute >
-                                    </action>
-                                </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
             </plugins>
     </pluginManagement>
 
-        <plugins>
 
+        <plugins>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -269,24 +314,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jslint</goal>
-                            <goal>compress</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <nosuffix>true</nosuffix>
-                    <force>true</force>
-                    <nomunge>true</nomunge>
-                </configuration>
-            </plugin>
 
         </plugins>
     </build>

subsonic-assembly/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.github.mach5.supersonic</groupId>
         <artifactId>supersonic</artifactId>
-        <version>4.7.beta1</version>
+        <version>4.7</version>
     </parent>
 
     <dependencies>

subsonic-booter/pom.xml

@@ -5,11 +5,10 @@
     <groupId>com.github.mach5.supersonic</groupId>
     <artifactId>supersonic-booter</artifactId>
     <name>Supersonic Booter</name>
-
     <parent>
         <groupId>com.github.mach5.supersonic</groupId>
         <artifactId>supersonic</artifactId>
-        <version>4.7.beta1</version>
+        <version>4.7</version>
     </parent>
 
     <dependencies>

subsonic-booter/src/main/java/net/sourceforge/subsonic/booter/agent/SettingsPanel.java

@@ -61,7 +61,7 @@ public void readValues() {
         contextPathComboBox.setSelectedItem(getContextPathFromOptionsFile());
         int httpsPort = getHttpsPortFromOptionsFile();
         boolean httpsEnabled = httpsPort != 0;
-        httpsPortTextField.setValue(httpsEnabled ? httpsPort : 443);
+        httpsPortTextField.setValue(httpsEnabled ? httpsPort : 4443);
         httpsPortTextField.setEnabled(httpsEnabled);
         httpsPortCheckBox.setSelected(httpsEnabled);
     }
@@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent e) {
         defaultButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 portTextField.setValue(SubsonicDeployer.DEFAULT_PORT);
-                httpsPortTextField.setValue(443);
+                httpsPortTextField.setValue(4443);
                 httpsPortTextField.setEnabled(false);
                 httpsPortCheckBox.setSelected(false);
                 memoryTextField.setValue(SubsonicDeployer.DEFAULT_MEMORY_LIMIT);
@@ -273,7 +273,7 @@ public void saveSettings(int memoryLimit, int port, int httpsPort, String contex
     }
 
     private File getOptionsFile() throws SettingsException {
-        File file = new File("subsonic-service.exe.vmoptions");
+        File file = new File("supersonic-service.exe.vmoptions");
         if (!file.isFile() || !file.exists()) {
             throw new SettingsException("File " + file.getAbsolutePath() + " not found.");
         }

subsonic-booter/src/main/java/net/sourceforge/subsonic/booter/deployer/SubsonicDeployer.java

@@ -26,7 +26,7 @@
  * The following system properties may be used to customize the behaviour:
  * <ul>
  * <li><code>subsonic.contextPath</code> - The context path at which Subsonic is deployed.  Default "/".</li>
- * <li><code>subsonic.port</code> - The port Subsonic will listen to.  Default 80.</li>
+ * <li><code>subsonic.port</code> - The port Subsonic will listen to.  Default 4040.</li>
  * <li><code>subsonic.httpsPort</code> - The port Subsonic will listen to for HTTPS.  Default 0, which disables HTTPS.</li>
  * <li><code>subsonic.war</code> - Subsonic WAR file, or exploded directory.  Default "subsonic.war".</li>
  * <li><code>subsonic.createLinkFile</code> - If set to "true", a Subsonic.url file is created in the working directory.</li>
@@ -39,9 +39,9 @@
 public class SubsonicDeployer implements SubsonicDeployerService {
 
     public static final String DEFAULT_HOST = "0.0.0.0";
-    public static final int DEFAULT_PORT = 80;
+    public static final int DEFAULT_PORT = 4040;
     public static final int DEFAULT_HTTPS_PORT = 0;
-    public static final int DEFAULT_MEMORY_LIMIT = 100;
+    public static final int DEFAULT_MEMORY_LIMIT = 150;
     public static final String DEFAULT_CONTEXT_PATH = "/";
     public static final String DEFAULT_WAR = "supersonic.war";
     private static final int MAX_IDLE_TIME_MILLIS = 7 * 24 * 60 * 60 * 1000; // One week.