X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2FDataModels.java;h=f2196bd41acb05915ba5496b68d968b1ad13d9e6;hb=6862cee138ca8ed2bbf6427b20b389a56b5df32f;hp=3d0f3a1670bfec4542b6586c9fa27d1216e70bc5;hpb=b7683883512d924a039a43c2e1102290aa49f64d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/DataModels.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/DataModels.java index 3d0f3a167..f2196bd41 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/DataModels.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/DataModels.java @@ -8,9 +8,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsException; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.osgi.DataModelNamespace; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -21,7 +19,7 @@ import org.osgi.framework.wiring.BundleWire; import org.osgi.framework.wiring.BundleWiring; class DataModels implements BundleListener { - private final static Log log = LogFactory.getLog(DataModels.class); + private final static CmsLog log = CmsLog.getLog(DataModels.class); private Map dataModels = new TreeMap<>(); @@ -130,7 +128,7 @@ class DataModels implements BundleListener { assert requiredDataModelName != null; DataModel requiredDataModel = dataModels.get(requiredDataModelName); if (requiredDataModel == null) - throw new CmsException("No required data model " + requiredDataModelName); + throw new IllegalStateException("No required data model " + requiredDataModelName); req.add(requiredDataModel); } required = Collections.unmodifiableList(req);