Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2006-08-27 01:01:30 +00:00
parent 465ae145be
commit b0d02fa6be
241 changed files with 12379 additions and 1061 deletions
--- a/source/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java
@@ -26,7 +26,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class ApproveDocEvaluator implements ActionEvaluator
+public class ApproveDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class ApproveDocEvaluator implements ActionEvaluator
              node.isLocked() == false);
   }
 }
-/*
-<a:booleanEvaluator value='#{r["app:approveStep"] != null && r.workingCopy == false && r.locked == false}'>
-*/
--- a/source/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java
@@ -25,7 +25,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class ApproveNonDraftDocEvaluator implements ActionEvaluator
+public class ApproveNonDraftDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class ApproveNonDraftDocEvaluator implements ActionEvaluator
              node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false);
   }
 }
-/*
-<a:booleanEvaluator value='#{r["app:approveStep"] != null && r.workingCopy == false && r.locked == false}'>
-*/
--- a/source/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java
@@ -26,7 +26,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class CancelCheckoutDocEvaluator implements ActionEvaluator
+public class CancelCheckoutDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class CancelCheckoutDocEvaluator implements ActionEvaluator
              node.hasAspect(ContentModel.ASPECT_WORKING_COPY));
   }
 }
-/*
-<a:booleanEvaluator value="#{r.cancelCheckOut == true}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java
@@ -26,7 +26,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class CheckinDocEvaluator implements ActionEvaluator
+public class CheckinDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class CheckinDocEvaluator implements ActionEvaluator
              node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == true);
   }
 }
-/*
-<a:booleanEvaluator value="#{r.checkIn == true}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class CheckoutDocEvaluator implements ActionEvaluator
+public class CheckoutDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -46,6 +46,3 @@ public final class CheckoutDocEvaluator implements ActionEvaluator
               node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false)));
   }
 }
-/*
-<a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java
@@ -25,7 +25,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class CreateForumNodeEvaluator implements ActionEvaluator
+public class CreateForumNodeEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -36,6 +36,3 @@ public final class CreateForumNodeEvaluator implements ActionEvaluator
              node.isLocked() == false);
   }
 }
-/*
-<a:booleanEvaluator value="#{r.beingDiscussed == false && r.locked == false}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java
@@ -25,7 +25,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class DeleteDocEvaluator implements ActionEvaluator
+public class DeleteDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -36,6 +36,3 @@ public final class DeleteDocEvaluator implements ActionEvaluator
              node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false);
   }
 }
-/*
-<a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java
@@ -33,7 +33,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class DiscussNodeEvaluator implements ActionEvaluator
+public class DiscussNodeEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -60,6 +60,3 @@ public final class DiscussNodeEvaluator implements ActionEvaluator
      return result;
   }
 }
-/*
-<a:booleanEvaluator value="#{r.beingDiscussed == true}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class EditDocCIFSEvaluator implements ActionEvaluator
+public class EditDocCIFSEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -59,7 +59,3 @@ public final class EditDocCIFSEvaluator implements ActionEvaluator
      return result;
   }
 }
-/*
-<a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
-   <a:booleanEvaluator value="#{r.editLinkType == 'webdav'}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class EditDocHttpEvaluator implements ActionEvaluator
+public class EditDocHttpEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -60,7 +60,3 @@ public final class EditDocHttpEvaluator implements ActionEvaluator
      return result;
   }
 }
-/*
-<a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
-   <a:booleanEvaluator value="#{r.editLinkType == 'http'}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class EditDocWebDavEvaluator implements ActionEvaluator
+public class EditDocWebDavEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -59,7 +59,3 @@ public final class EditDocWebDavEvaluator implements ActionEvaluator
      return result;
   }
 }
-/*
-<a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
-   <a:booleanEvaluator value="#{r.editLinkType == 'cifs'}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java
@@ -32,7 +32,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class ForumsCheckinDocEvaluator implements ActionEvaluator
+public class ForumsCheckinDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -67,6 +67,3 @@ public final class ForumsCheckinDocEvaluator implements ActionEvaluator
      return allow;
   }
 }
-/*
-<a:booleanEvaluator value="#{r.checkIn == true}">
-*/
--- a/source/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java
@@ -26,7 +26,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class RejectDocEvaluator implements ActionEvaluator
+public class RejectDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class RejectDocEvaluator implements ActionEvaluator
              node.isLocked() == false);
   }
 }
-/*
-<a:booleanEvaluator value='#{r["app:rejectStep"] != null && r.workingCopy == false && r.locked == false}'>
-*/
--- a/source/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java
@@ -25,7 +25,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class RejectNonDraftDocEvaluator implements ActionEvaluator
+public class RejectNonDraftDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -37,6 +37,3 @@ public final class RejectNonDraftDocEvaluator implements ActionEvaluator
              node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false);
   }
 }
-/*
-<a:booleanEvaluator value='#{r["app:rejectStep"] != null && r.workingCopy == false && r.locked == false}'>
-*/
--- a/source/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java
@@ -28,7 +28,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class ShortcutNodeEvaluator implements ActionEvaluator
+public class ShortcutNodeEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -40,6 +40,3 @@ public final class ShortcutNodeEvaluator implements ActionEvaluator
      return (nav.getIsGuest() == false);
   }
 }
-/*
-rendered="#{NavigationBean.isGuest == false}"
-*/
--- a/source/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java
@@ -24,7 +24,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class TakeOwnershipDocEvaluator implements ActionEvaluator
+public class TakeOwnershipDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
--- a/source/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
@@ -24,7 +24,7 @@ import org.alfresco.web.bean.repository.Node;
 * 
 * @author Kevin Roast
 */
-public final class UnlockDocEvaluator implements ActionEvaluator
+public class UnlockDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
--- a/source/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java
@@ -29,7 +29,7 @@ import org.alfresco.web.bean.repository.Repository;
 * 
 * @author Kevin Roast
 */
-public final class UpdateDocEvaluator implements ActionEvaluator
+public class UpdateDocEvaluator implements ActionEvaluator
 {
   /**
    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
@@ -45,6 +45,3 @@ public final class UpdateDocEvaluator implements ActionEvaluator
               node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false)));
   }
 }
-/*
-<a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
-*/