Minor updates to content expiration

- I18N title for change request workflow
 - change request workflow title now includes the web project name the content came from
 - Added admin user name and workflow name as configurable properties for quartz job

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

config/alfresco/web-client-config-properties.xml

@@ -425,7 +425,6 @@
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" />
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
-         <show-property name="wcmwf:label" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -438,7 +437,6 @@
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" />
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
-         <show-property name="wcmwf:label" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -450,7 +448,7 @@
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" />
-         <show-property name="bpm:description" read-only="true"/>
+         <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
          <show-property name="bpm:status" />
       </property-sheet>
    </config>

source/java/org/alfresco/web/bean/wcm/AVMUtil.java

@@ -982,7 +982,6 @@ public final class AVMUtil
    public final static String DIR_ROOT = "ROOT";
    
    public final static String SPACE_ICON_WEBSITE       = "space-icon-website";
-   public final static QName PROP_WEB_PROJECT_NODE_REF = QName.createQName(null, ".web_project.noderef");
    
    // web user role permissions
    public final static String ROLE_CONTENT_MANAGER    = "ContentManager";

source/java/org/alfresco/web/bean/wcm/SandboxFactory.java

@@ -41,7 +41,6 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.DNSNameMangler;
 import org.alfresco.util.GUID;
-import org.alfresco.util.DNSNameMangler;
 import org.alfresco.web.bean.repository.Repository;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -104,7 +103,7 @@ public final class SandboxFactory
                                   SandboxConstants.PROP_SANDBOX_STAGING_MAIN,
                                   new PropertyValue(DataTypeDefinition.TEXT, null));
       avmService.setStoreProperty(stagingStoreName,
-                                  AVMUtil.PROP_WEB_PROJECT_NODE_REF,
+                                  SandboxConstants.PROP_WEB_PROJECT_NODE_REF,
                                   new PropertyValue(DataTypeDefinition.NODE_REF, webProjectNodeRef));
       
       // tag the store with the DNS name property
@@ -325,7 +324,6 @@ public final class SandboxFactory
    {
       final ServiceRegistry services = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
       final AVMService avmService = services.getAVMService();
-      final PermissionService permissionService = services.getPermissionService();
       
       final String stagingStoreName = AVMUtil.buildStagingStoreName(storeId);
 

source/java/org/alfresco/web/bean/wcm/WebProject.java

@@ -35,6 +35,7 @@ import javax.faces.context.FacesContext;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.WCMAppModel;
+import org.alfresco.sandbox.SandboxConstants;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -175,9 +176,8 @@ public class WebProject
    {
       String stagingStore = AVMUtil.buildStagingStoreName(AVMUtil.getStoreId(AVMUtil.getStoreName(avmPath)));
       final AVMService avmService = this.getServiceRegistry().getAVMService();
-      this.nodeRef = (NodeRef)
+      this.nodeRef = (NodeRef)avmService.getStoreProperty(stagingStore, 
-         avmService.getStoreProperty(stagingStore, 
+               SandboxConstants.PROP_WEB_PROJECT_NODE_REF).getValue(DataTypeDefinition.NODE_REF);
-                                     AVMUtil.PROP_WEB_PROJECT_NODE_REF).getValue(DataTypeDefinition.NODE_REF);
    }
 
    /**