X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=34b4dd927aaeeb4deb29128b74d6e06239b05139;hb=e7dc62c485696931a3e048d9102a7c86f9323b92;hp=7a6ae064667817ff764d0bc3dc37e2da1ea1a45a;hpb=48cae516376b12ea619a359450c62479d3e16584;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
index 7a6ae0646..34b4dd927 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.internal.kernel;
 
-import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
+import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
 
 import java.io.File;
 import java.io.InputStreamReader;
@@ -26,15 +26,15 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryContext;
 import org.apache.jackrabbit.core.RepositoryImpl;
+import org.argeo.api.DataModelNamespace;
+import org.argeo.api.NodeConstants;
+import org.argeo.api.NodeDeployment;
+import org.argeo.api.NodeState;
+import org.argeo.api.security.CryptoKeyring;
+import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.CmsException;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.DataModelNamespace;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.NodeDeployment;
-import org.argeo.node.NodeState;
-import org.argeo.node.security.CryptoKeyring;
-import org.argeo.node.security.Keyring;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.util.LangUtils;
 import org.eclipse.equinox.http.jetty.JettyConfigurator;
@@ -62,7 +62,6 @@ public class CmsDeployment implements NodeDeployment {
 
 	private DataModels dataModels;
 	private DeployConfig deployConfig;
-	private HomeRepository homeRepository;
 
 	private Long availableSince;
 
@@ -268,7 +267,7 @@ public class CmsDeployment implements NodeDeployment {
 		}
 
 		// home
-		prepareDataModel(NodeConstants.NODE, deployedNodeRepository);
+		prepareDataModel(NodeConstants.NODE_REPOSITORY, deployedNodeRepository);
 	}
 
 	private void prepareHomeRepository(RepositoryImpl deployedRepository) {
@@ -286,10 +285,10 @@ public class CmsDeployment implements NodeDeployment {
 
 		// Publish home with the highest service ranking
 		Hashtable<String, Object> regProps = new Hashtable<>();
-		regProps.put(NodeConstants.CN, NodeConstants.HOME);
+		regProps.put(NodeConstants.CN, NodeConstants.EGO_REPOSITORY);
 		regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
-		homeRepository = new HomeRepository(deployedRepository, false);
-		bc.registerService(Repository.class, homeRepository, regProps);
+		Repository egoRepository = new EgoRepository(deployedRepository, false);
+		bc.registerService(Repository.class, egoRepository, regProps);
 
 		// Keyring only if Argeo extensions are available
 		if (argeoDataModelExtensionsAvailable) {
@@ -297,7 +296,7 @@ public class CmsDeployment implements NodeDeployment {
 
 				@Override
 				public CallbackHandler addingService(ServiceReference<CallbackHandler> reference) {
-					NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository);
+					NodeKeyRing nodeKeyring = new NodeKeyRing(egoRepository);
 					CallbackHandler callbackHandler = bc.getService(reference);
 					nodeKeyring.setDefaultCallbackHandler(callbackHandler);
 					bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class),
@@ -318,7 +317,7 @@ public class CmsDeployment implements NodeDeployment {
 				BundleWiring wiring = bundle.adapt(BundleWiring.class);
 				if (wiring == null)
 					continue bundles;
-				if (NodeConstants.NODE.equals(cn))// process all data models
+				if (NodeConstants.NODE_REPOSITORY.equals(cn))// process all data models
 					processWiring(cn, adminSession, wiring, processed, false);
 				else {
 					List<BundleCapability> capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);
@@ -396,7 +395,7 @@ public class CmsDeployment implements NodeDeployment {
 		boolean publishLocalRepo;
 		if (isStandalone && name.equals(cn))// includes the node itself
 			publishLocalRepo = true;
-		else if (!isStandalone && cn.equals(NodeConstants.NODE))
+		else if (!isStandalone && cn.equals(NodeConstants.NODE_REPOSITORY))
 			publishLocalRepo = true;
 		else
 			publishLocalRepo = false;
@@ -442,7 +441,7 @@ public class CmsDeployment implements NodeDeployment {
 			RepositoryContext repoContext = bc.getService(reference);
 			String cn = (String) reference.getProperty(NodeConstants.CN);
 			if (cn != null) {
-				if (cn.equals(NodeConstants.NODE)) {
+				if (cn.equals(NodeConstants.NODE_REPOSITORY)) {
 					prepareNodeRepository(repoContext.getRepository());
 					// TODO separate home repository
 					prepareHomeRepository(repoContext.getRepository());