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

source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java

@@ -105,7 +105,7 @@ public interface MultilingualContentService
     /**
      * Given a <b>cm:mlDocument</b>, this method attempts to find the best translation for the given
      * locale.  If there is not even a
-     * {@link org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set) partial match}, then the
+     * {@link org.springframework.extensions.surf.util.I18NUtil#getNearestLocale(Locale, Set) partial match}, then the
      * {@link #getPivotTranslation(NodeRef) pivot translation} is used.  If that also gives no results
      * then the translation itself is returned.
      *
@@ -114,7 +114,7 @@ public interface MultilingualContentService
      * @return                          Returns the best match for the locale (never <tt>null</tt>)
      *
      * @see #getTranslations(NodeRef)
-     * @see org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set)
+     * @see org.springframework.extensions.surf.util.I18NUtil#getNearestLocale(Locale, Set)
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"translationNodeRef", "locale"})
     NodeRef getTranslationForLocale(NodeRef translationNodeRef, Locale locale);