Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/version/common/counter/VersionCounterService.java

@@ -59,4 +59,16 @@ public interface VersionCounterService
      * @param storeRef  the store reference
      */
     public void resetVersionNumber(StoreRef storeRef);
+    
+    /**
+     * Sets the version number for a specified store.
+     * 
+     * WARNING: calling this method will completely reset the current 
+     * version count for the specified store and cannot be undone.  
+     *
+     * @param storeRef  the store reference
+     * @param versionCount  the new version count
+     */
+    public void setVersionNumber(StoreRef storeRef, int versionCount);
+    
 }