X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=rap%2Forg.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fscript%2FCmsScriptApp.java;h=a2b9440647b691f1ec745b3ab2d856fc7110695c;hb=df60fd8de17590b8f4ab32fd0278e57aaaedbfa2;hp=9dd1509be96c465d59f6092276b0cfaa82140120;hpb=f9efbe5228615951dd8482a4582aa24e00c10ce5;p=lgpl%2Fargeo-commons.git diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java index 9dd1509be..a2b944064 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java @@ -20,11 +20,10 @@ import javax.script.ScriptEngine; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsTheme; import org.argeo.cms.CmsException; -import org.argeo.cms.ui.CmsConstants; +import org.argeo.cms.ui.CmsUiConstants; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.web.BundleResourceLoader; @@ -50,7 +49,7 @@ public class CmsScriptApp implements Branding { private ScriptEngine scriptEngine; - private final static Log log = LogFactory.getLog(CmsScriptApp.class); + private final static CmsLog log = CmsLog.getLog(CmsScriptApp.class); private String webPath; private String repo = "(cn=node)"; @@ -90,9 +89,9 @@ public class CmsScriptApp implements Branding { application.setExceptionHandler(new CmsExceptionHandler()); // loading animated gif - application.addResource(CmsConstants.LOADING_IMAGE, createResourceLoader(CmsConstants.LOADING_IMAGE)); + application.addResource(CmsUiConstants.LOADING_IMAGE, createResourceLoader(CmsUiConstants.LOADING_IMAGE)); // empty image - application.addResource(CmsConstants.NO_IMAGE, createResourceLoader(CmsConstants.NO_IMAGE)); + application.addResource(CmsUiConstants.NO_IMAGE, createResourceLoader(CmsUiConstants.NO_IMAGE)); for (String resource : resources) { application.addResource(resource, bundleRL);