Merged 5.2.N (5.2.1) to HEAD (5.2)

128780 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128778 jvonka: Merged 5.1.0 (5.1.0.10) to 5.1.N (5.1.2)
         128763 jvonka: Fix missed import in merge (MNT-16538, MNT-16446).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-07-14 10:22:01 +00:00
parent 4d4bef068a
commit d5cf631d22

View File

@@ -74,6 +74,7 @@ import org.alfresco.util.registry.NamedObjectRegistry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.simple.JSONObject;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;