- Fixed WCM-497, WCM-525 & WCM-539

- Added target to continuous build to distribute AMPs
- Web service client project now generates javadocs for files generatated from WSDL

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

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

@@ -218,6 +218,7 @@ public class AVMNode extends Node implements Map<String, Object>
          this.properties.put("modified", this.avmRef.getModDate());
          this.properties.put("creator", this.avmRef.getCreator());
          this.properties.put("modifier", this.avmRef.getLastModifier());
+         this.properties.put("deleted", this.deleted);
          
          this.propsRetrieved = true;
       }

source/web/jsp/wcm/manage-review-task-dialog.jsp

@@ -66,10 +66,15 @@
             <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
          <f:facet name="small-icon">
-               <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
+            <h:panelGroup>
-                             showLink="false" styleClass="inlineAction" />
+               <a:actionLink id="col1-icon1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
+                             showLink="false" styleClass="inlineAction" rendered="#{!r.deleted}" />
+               <h:graphicImage id="col1-icon2" title="#{r.name}" url="#{r.fileType16}" styleClass="inlineAction" 
+                               rendered="#{r.deleted}" />
+            </h:panelGroup>
          </f:facet>
-         <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
+         <a:actionLink id="col1-name1" value="#{r.name}" href="#{r.url}" target="new" rendered="#{!r.deleted}" />
+         <h:outputText id="col1-name2" value="#{r.name} [#{msg.avm_node_deleted}]" rendered="#{r.deleted}" />
          <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
       </a:column>
       

source/web/jsp/wcm/submit-dialog.jsp

@@ -40,6 +40,7 @@
    {
       document.getElementById("dialog:dialog-body:comment").focus();
       noItems = document.getElementById("dialog:finish-button").disabled;
+      document.getElementById("dialog:finish-button").onclick = showProgress;
       checkButtonState();
    }
    
@@ -59,7 +60,15 @@
       }
    }
    
+   function showProgress()
+   {
+      document.getElementById('progress').style.display = 'block';
+   }
 </script>
+
+<div id="progress" style="margin-left: 90px; margin-top: 4px; margin-bottom: 4px; display: none">
+   <img src="<%=request.getContextPath()%>/images/icons/process_animation.gif" width=174 height=14>
+</div>
 </f:verbatim>
 
 <h:panelGrid columns="1" cellpadding="2" style="padding-top:4px;padding-bottom:4px;"
@@ -277,7 +286,7 @@
                <h:outputText id="col15-txt" value="#{msg.actions}"/>
             </f:facet>
             <a:actionLink value="#{msg.file_preview}" image="/images/icons/preview_website.gif" showLink="false"
-                          href="#{r.previewUrl}" target="new" />
+                          href="#{r.previewUrl}" target="new" rendered="#{!r.deleted}" />
             <a:actionLink value="#{msg.change_expiration_date_title}" image="/images/icons/change_expire_date.gif" 
                           showLink="false" style="padding-left: 4px;" rendered="#{r.expirable}"
                           action="dialog:changeExpirationDate" actionListener="#{DialogManager.setupParameters}">