Adapt after Argeo Suite refactoring.

[lgpl/argeo-commons.git] / org.argeo.cms.jcr / src / org / argeo / cms / jcr / internal / DataModels.java

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 a1b5008161dfe41f221d6735b2ef26fcebb52d63..f2196bd41acb05915ba5496b68d968b1ad13d9e6 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 package org.argeo.cms.jcr.internal;
 
-import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
+import static org.argeo.cms.osgi.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,10 +8,8 @@ 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.api.DataModelNamespace;
-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;
 import org.osgi.framework.BundleEvent;
@@ -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<String, DataModel> 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);