Merged HEAD (5.2) to 5.2.N (5.2.1)

127534 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125537 jvonka: RA-779 / RA-780: Sites API - additional tests, also add skipConfiguration (pending open question)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127644 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/impl/SitesImpl.java

@@ -871,7 +871,7 @@ public class SitesImpl implements Sites
 
 
     /**
-     * Create default/preset (Share) site - with DocLib container/component
+     * Create default/fixed preset (Share) site - with DocLib container/component
      *
      * @param site
      * @return
@@ -900,8 +900,13 @@ public class SitesImpl implements Sites
 
         String siteId = siteInfo.getShortName();
 
-        // import default surf config
-        importSite(siteId);
+        // default false (if not provided)
+        boolean skipShareSurfConfig = Boolean.valueOf(parameters.getParameter(PARAM_SKIP_SURF_CONFIGURATION));
+        if (skipShareSurfConfig == false)
+        {
+            // import default/fixed preset Share surf config
+            importSite(siteId);
+        }
 
         // pre-create doclib
         siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);