Merge BRANCHES/DEV/BRIAN/FSTR to HEAD:

28906: File Transfer Receiver SPRINT1
 29365: Initial check in
 29378: Configuration properties can now be located in "filetransferreceiver.properties" separated from spring configuration files.
 29417: Delete, first check in
 29450: Now multiple distinct contents can be send over in one transfer.
 29516: 
 29517: 
 29531: Manage cases like /F1/F2/F3 ... becoming /F3/F2/F1
 29550: FTR:
    - Tidied project classpath
    - Removed incorrect reference to OpenOffice RuntimeException in JobLockServiceImpl
    - Removed references to StringOutputStream



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/transfer/TransferVersionImpl.java

@@ -27,9 +27,9 @@ public class TransferVersionImpl implements TransferVersion
     private String versionMinor;
     private String versionRevision;
     private String edition;
-    
+
     /**
-     * 
+     *
      * @param versionMajor
      * @param versionMinor
      * @param versionRevision
@@ -42,7 +42,7 @@ public class TransferVersionImpl implements TransferVersion
         this.versionRevision = versionRevision;
         this.edition = edition;
     }
- 
+
     /**
      * Construct a transferVersion from a system descriptor
      * @param d the system descriptor
@@ -54,7 +54,7 @@ public class TransferVersionImpl implements TransferVersion
         this.versionRevision = d.getVersionRevision();
         this.edition = d.getEdition();
     }
-    
+
     @Override
     public String getVersionMajor()
     {
@@ -78,7 +78,7 @@ public class TransferVersionImpl implements TransferVersion
     {
         return edition;
     }
-    
+
     public String toString()
     {
         StringBuilder version = new StringBuilder();
@@ -89,10 +89,10 @@ public class TransferVersionImpl implements TransferVersion
         version.append(getVersionMinor());
         version.append(".");
         version.append(getVersionRevision());
-        
+
         return version.toString();
     }
-    
+
     public int hashCode()
     {
         if(edition != null && versionMinor != null)
@@ -104,18 +104,18 @@ public class TransferVersionImpl implements TransferVersion
             return 1;
         }
     }
-    
+
     public boolean equals(Object other)
     {
         if(other == null)
         {
             return false;
         }
-        
+
         if (other instanceof TransferVersion)
         {
             TransferVersion v = (TransferVersion)other;
-            
+
             if(!edition.equalsIgnoreCase(v.getEdition()))
             {
                 return false;