Merged DEV/TEMPORARY to HEAD

17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-12-14 13:41:05 +00:00
parent 9decf60e5d
commit 0c88b471ee
117 changed files with 246 additions and 246 deletions

View File

@@ -26,7 +26,7 @@ package org.alfresco.web.config;
import java.util.Set;
import org.alfresco.config.evaluator.Evaluator;
import org.springframework.extensions.config.evaluator.Evaluator;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
@@ -41,7 +41,7 @@ public final class AspectEvaluator implements Evaluator
/**
* Determines whether the given aspect is applied to the given object
*
* @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
* @see org.springframework.extensions.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
*/
public boolean applies(Object obj, String condition)
{