Merge V1.2.0 BRANCH to HEAD

svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


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

source/java/org/alfresco/service/descriptor/DescriptorService.java

@@ -16,6 +16,8 @@
  */
 package org.alfresco.service.descriptor;
 
+import org.alfresco.service.license.LicenseDescriptor;
+
 
 /**
  * Service for retrieving meta-data about Alfresco stack.
@@ -40,4 +42,12 @@ public interface DescriptorService
      * @return  repository descriptor
      */
     public Descriptor getInstalledRepositoryDescriptor();
+    
+    /**
+     * Gets the License Service
+     * 
+     * @return  the license service
+     */
+    public LicenseDescriptor getLicenseDescriptor();
+    
 }