Merge pull request BroadleafCommerce#1432 from BroadleafCommerce/qa-649-asset-versioning

qa 649 asset versioning

Author: jefffischer

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/file/service/StaticAssetServiceImpl.java

@@ -161,6 +161,11 @@ protected String buildAssetURL(Map<String, String> assetProperties, String origi
             fileName = originalFilename;
         }
 
+        String[] splitBits = fileName.replace(".", "/").split("/");
+        String imageName = splitBits[splitBits.length - 2];
+        String imageTypeExt = splitBits[splitBits.length - 1];
+        fileName = imageName + '-' + 1 + '.' + imageTypeExt;
+
         return path.append(fileName).toString();
     }
 
@@ -186,7 +191,11 @@ public StaticAsset createStaticAsset(InputStream inputStream, String fileName, l
         int count = 0;
         while (newAsset != null) {
             count++;
-            
+            //removing the default count 1, from fullUrl for count logic
+            if (fullUrl.contains("-1")) {
+                fullUrl = fullUrl.replace("-1", "");
+                count++;
+            }
             //try the new format first, then the old
             newAsset = staticAssetDao.readStaticAssetByFullUrl(getCountUrl(fullUrl, count, false));
             if (newAsset == null) {

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/StaticAssetPersistenceEventHandler.java

@@ -40,7 +40,6 @@
         <property name="sourceList">
             <list>
                 <ref bean="blArchiveStatusPersistenceEventHandler" />
-                <ref bean="blStaticAssetPersistenceEventHandler"  />
             </list>
         </property>
     </bean>