Merge from SEAMIST3

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

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

@@ -34,6 +34,20 @@ import org.alfresco.util.VersionNumber;
  */
 public interface Descriptor
 {
+    /**
+     * Gets the id of the item being described
+     * 
+     * @return  identifier
+     */
+    public String getId();
+    
+    /**
+     * Gets the name of the item being described
+     * 
+     * @return  name
+     */
+    public String getName();
+    
     /**
      * Gets the major version number, e.g. <u>1</u>.2.3
      * 

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

@@ -46,13 +46,22 @@ public interface DescriptorService
     public Descriptor getServerDescriptor();
     
     /**
-     * Get descriptor for the repository as it was when first installed.  The current
-     * repository descriptor will always be the same as the
+     * Get descriptor for the repository as it is currently installed.
+     * 
+     * The current repository descriptor will always be the same as the
      * {@link #getServerDescriptor() server descriptor}.
      * 
      * @return  repository descriptor
      */
     @NotAuditable
+    public Descriptor getCurrentRepositoryDescriptor();
+    
+    /**
+     * Get descriptor for the repository as it was when first installed.
+     * 
+     * @return  repository descriptor
+     */
+    @NotAuditable
     public Descriptor getInstalledRepositoryDescriptor();
     
     /**