X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=44a2866f8df50613cbeede05262e66c660272428;hb=c615307d7b87bcb260d8a9f402c6e0a880862f38;hp=4ffa03a63fffe2ff37d4f18db8494b849275c97a;hpb=da848d7b6bcf3e509890bdd42c3c59fba1adbe14;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
index 4ffa03a63..44a2866f8 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
@@ -13,116 +13,19 @@ import org.osgi.service.http.HttpService;
 /** Implementation of a CMS deployment. */
 public class CmsDeploymentImpl implements CmsDeployment {
 	private final CmsLog log = CmsLog.getLog(getClass());
-//	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
-
-//	private Long availableSince;
 
 	// Readiness
-//	private boolean nodeAvailable = false;
-//	private boolean userAdminAvailable = false;
 	private boolean httpExpected = false;
-//	private boolean httpAvailable = false;
 	private HttpService httpService;
 
 	private CmsState cmsState;
 	private DeployConfig deployConfig;
 
-	public CmsDeploymentImpl() {
-//		ServiceReference<NodeState> nodeStateSr = bc.getServiceReference(NodeState.class);
-//		if (nodeStateSr == null)
-//			throw new CmsException("No node state available");
-
-//		NodeState nodeState = bc.getService(nodeStateSr);
-//		cleanState = nodeState.isClean();
-
-//		nodeHttp = new NodeHttp();
-		initTrackers();
-	}
-
-	private void initTrackers() {
-//		ServiceTracker<?, ?> httpSt = new ServiceTracker<HttpService, HttpService>(bc, HttpService.class, null) {
-//
-//			@Override
-//			public HttpService addingService(ServiceReference<HttpService> sr) {
-//				httpAvailable = true;
-//				Object httpPort = sr.getProperty("http.port");
-//				Object httpsPort = sr.getProperty("https.port");
-//				log.info(httpPortsMsg(httpPort, httpsPort));
-//				checkReadiness();
-//				return super.addingService(sr);
-//			}
-//		};
-//		// httpSt.open();
-//		KernelUtils.asyncOpen(httpSt);
-
-//		ServiceTracker<?, ?> userAdminSt = new ServiceTracker<UserAdmin, UserAdmin>(bc, UserAdmin.class, null) {
-//			@Override
-//			public UserAdmin addingService(ServiceReference<UserAdmin> reference) {
-//				UserAdmin userAdmin = super.addingService(reference);
-//				addStandardSystemRoles(userAdmin);
-//				userAdminAvailable = true;
-//				checkReadiness();
-//				return userAdmin;
-//			}
-//		};
-//		// userAdminSt.open();
-//		KernelUtils.asyncOpen(userAdminSt);
-
-//		ServiceTracker<?, ?> confAdminSt = new ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>(bc,
-//				ConfigurationAdmin.class, null) {
-//			@Override
-//			public ConfigurationAdmin addingService(ServiceReference<ConfigurationAdmin> reference) {
-//				ConfigurationAdmin configurationAdmin = bc.getService(reference);
-////				boolean isClean;
-////				try {
-////					Configuration[] confs = configurationAdmin
-////							.listConfigurations("(service.factoryPid=" + CmsConstants.NODE_USER_ADMIN_PID + ")");
-////					isClean = confs == null || confs.length == 0;
-////				} catch (Exception e) {
-////					throw new IllegalStateException("Cannot analyse clean state", e);
-////				}
-//				deployConfig = new DeployConfig(configurationAdmin, isClean);
-//				Activator.registerService(CmsDeployment.class, CmsDeploymentImpl.this, null);
-////				JcrInitUtils.addToDeployment(CmsDeployment.this);
-//				httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null;
-//				try {
-//					Configuration[] configs = configurationAdmin
-//							.listConfigurations("(service.factoryPid=" + CmsConstants.NODE_USER_ADMIN_PID + ")");
-//
-//					boolean hasDomain = false;
-//					for (Configuration config : configs) {
-//						Object realm = config.getProperties().get(UserAdminConf.realm.name());
-//						if (realm != null) {
-//							log.debug("Found realm: " + realm);
-//							hasDomain = true;
-//						}
-//					}
-//					if (hasDomain) {
-//						loadIpaJaasConfiguration();
-//					}
-//				} catch (Exception e) {
-//					throw new IllegalStateException("Cannot initialize config", e);
-//				}
-//				return super.addingService(reference);
-//			}
-//		};
-//		// confAdminSt.open();
-//		KernelUtils.asyncOpen(confAdminSt);
-	}
-
 	public void start() {
 		httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null;
 		if (deployConfig.hasDomain()) {
 			loadIpaJaasConfiguration();
 		}
-
-//		while (!isHttpAvailableOrNotExpected()) {
-//			try {
-//				Thread.sleep(100);
-//			} catch (InterruptedException e) {
-//				log.error("Interrupted while waiting for http");
-//			}
-//		}
 	}
 
 	public void addFactoryDeployConfig(String factoryPid, Dictionary<String, Object> props) {
@@ -139,30 +42,6 @@ public class CmsDeploymentImpl implements CmsDeployment {
 		return deployConfig.getProps(factoryPid, cn);
 	}
 
-//	private void addStandardSystemRoles(UserAdmin userAdmin) {
-//		// we assume UserTransaction is already available (TODO make it more robust)
-//		WorkTransaction userTransaction = bc.getService(bc.getServiceReference(WorkTransaction.class));
-//		try {
-//			userTransaction.begin();
-//			Role adminRole = userAdmin.getRole(CmsConstants.ROLE_ADMIN);
-//			if (adminRole == null) {
-//				adminRole = userAdmin.createRole(CmsConstants.ROLE_ADMIN, Role.GROUP);
-//			}
-//			if (userAdmin.getRole(CmsConstants.ROLE_USER_ADMIN) == null) {
-//				Group userAdminRole = (Group) userAdmin.createRole(CmsConstants.ROLE_USER_ADMIN, Role.GROUP);
-//				userAdminRole.addMember(adminRole);
-//			}
-//			userTransaction.commit();
-//		} catch (Exception e) {
-//			try {
-//				userTransaction.rollback();
-//			} catch (Exception e1) {
-//				// silent
-//			}
-//			throw new IllegalStateException("Cannot add standard system roles", e);
-//		}
-//	}
-
 	public boolean isHttpAvailableOrNotExpected() {
 		return (httpExpected ? httpService != null : true);
 	}
@@ -177,18 +56,8 @@ public class CmsDeploymentImpl implements CmsDeployment {
 	}
 
 	public void stop() {
-//		if (nodeHttp != null)
-//			nodeHttp.destroy();
-
-//		try {
-//			JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER);
-//		} catch (Exception e) {
-//			log.error("Cannot stop default Jetty server.", e);
-//		}
-
 		if (deployConfig != null) {
 			deployConfig.save();
-			// new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start();
 		}
 	}