Disable OSGi configuration admin and LDIF-based deploy config.

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

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
index 0536fb6455bb06704868833151c3658bc12781fa..a1cba1a62bfa4a866a762a9367f84d41ee5d6d2e 100644 (file)
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
@@ -22,30 +22,31 @@ import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 
 /** JCR specific init utilities. */
+@Deprecated
 public class JcrInitUtils {
        private final static CmsLog log = CmsLog.getLog(JcrInitUtils.class);
        private final static BundleContext bundleContext = FrameworkUtil.getBundle(JcrInitUtils.class).getBundleContext();
 
-       public static void addToDeployment(CmsDeployment nodeDeployment) {
-               // node repository
-//             Dictionary<String, Object> provided = null;
-               Dictionary<String, Object> provided = nodeDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID,
-                               CmsConstants.NODE);
-               Dictionary<String, Object> nodeConfig = JcrInitUtils.getNodeRepositoryConfig(provided);
-               // node repository is mandatory
-               nodeDeployment.addFactoryDeployConfig(CmsConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
-
-               // additional repositories
-//             dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
-//                     if (NodeConstants.NODE_REPOSITORY.equals(dataModel.getName()))
-//                             continue dataModels;
-//                     Dictionary<String, Object> config = JcrInitUtils.getRepositoryConfig(dataModel.getName(),
-//                                     getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName()));
-//                     if (config.size() != 0)
-//                             putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, config);
-//             }
-
-       }
+//     public static void addToDeployment(CmsDeployment nodeDeployment) {
+//             // node repository
+////           Dictionary<String, Object> provided = null;
+//             Dictionary<String, Object> provided = nodeDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID,
+//                             CmsConstants.NODE);
+//             Dictionary<String, Object> nodeConfig = JcrInitUtils.getNodeRepositoryConfig(provided);
+//             // node repository is mandatory
+//             nodeDeployment.addFactoryDeployConfig(CmsConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
+//
+//             // additional repositories
+////           dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
+////                   if (NodeConstants.NODE_REPOSITORY.equals(dataModel.getName()))
+////                           continue dataModels;
+////                   Dictionary<String, Object> config = JcrInitUtils.getRepositoryConfig(dataModel.getName(),
+////                                   getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName()));
+////                   if (config.size() != 0)
+////                           putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, config);
+////           }
+//
+//     }
 
        /** Override the provided config with the framework properties */
        public static Dictionary<String, Object> getNodeRepositoryConfig(Dictionary<String, Object> provided) {
@@ -62,24 +63,24 @@ public class JcrInitUtils {
                return props;
        }
 
-       public static Dictionary<String, Object> getRepositoryConfig(String dataModelName,
-                       Dictionary<String, Object> provided) {
-               if (dataModelName.equals(CmsConstants.NODE_REPOSITORY) || dataModelName.equals(CmsConstants.EGO_REPOSITORY))
-                       throw new IllegalArgumentException("Data model '" + dataModelName + "' is reserved.");
-               Dictionary<String, Object> props = provided != null ? provided : new Hashtable<String, Object>();
-               for (RepoConf repoConf : RepoConf.values()) {
-                       Object value = getFrameworkProp(
-                                       CmsConstants.NODE_REPOS_PROP_PREFIX + dataModelName + '.' + repoConf.name());
-                       if (value != null) {
-                               props.put(repoConf.name(), value);
-                               if (log.isDebugEnabled())
-                                       log.debug("Set " + dataModelName + " repo configuration " + repoConf.name() + " to " + value);
-                       }
-               }
-               if (props.size() != 0)
-                       props.put(CmsConstants.CN, dataModelName);
-               return props;
-       }
+//     public static Dictionary<String, Object> getRepositoryConfig(String dataModelName,
+//                     Dictionary<String, Object> provided) {
+//             if (dataModelName.equals(CmsConstants.NODE_REPOSITORY) || dataModelName.equals(CmsConstants.EGO_REPOSITORY))
+//                     throw new IllegalArgumentException("Data model '" + dataModelName + "' is reserved.");
+//             Dictionary<String, Object> props = provided != null ? provided : new Hashtable<String, Object>();
+//             for (RepoConf repoConf : RepoConf.values()) {
+//                     Object value = getFrameworkProp(
+//                                     CmsConstants.NODE_REPOS_PROP_PREFIX + dataModelName + '.' + repoConf.name());
+//                     if (value != null) {
+//                             props.put(repoConf.name(), value);
+//                             if (log.isDebugEnabled())
+//                                     log.debug("Set " + dataModelName + " repo configuration " + repoConf.name() + " to " + value);
+//                     }
+//             }
+//             if (props.size() != 0)
+//                     props.put(CmsConstants.CN, dataModelName);
+//             return props;
+//     }
 
        private static void registerRemoteInit(String uri) {
                try {