Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


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

source/java/org/alfresco/service/license/LicenseDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -73,6 +73,13 @@ public interface LicenseDescriptor
      */
     public Principal getHolder();
 
+    /**
+     * Gets the Organisation that the license was granted to.
+     *
+     * @return the holder
+     */
+    public String getHolderOrganisation();
+
     /**
      * Gets the issuer of the license
      * 
@@ -118,4 +125,11 @@ public interface LicenseDescriptor
      * @return the cloud sync key
      */
     public String getCloudSyncKey();
+    
+    /**
+     * Does this license allow clustering?
+     * 
+     * @return <code>true</code> if the license allows clustering
+     */
+    public boolean isClusterEnabled();
 }