Merge from HEAD into WCM-DEV2. Also fixes build breakage in

jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/config/AspectEvaluator.java

@@ -28,7 +28,7 @@ import org.alfresco.web.bean.repository.Repository;
  * 
  * @author gavinc
  */
-public class AspectEvaluator implements Evaluator
+public final class AspectEvaluator implements Evaluator
 {
    /**
     * Determines whether the given aspect is applied to the given object
@@ -51,5 +51,4 @@ public class AspectEvaluator implements Evaluator
       
       return result;
    }
-
 }