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/BRANCHES/DEV/5.2.N/root@128780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-07-14 08:33:19 +00:00
parent 56619be13c
commit 3cfd117f52

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;