deployConfig = new DeployConfig(configurationAdmin, cleanState);
httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null;
try {
+ // Configuration[] configs = configurationAdmin
+ // .listConfigurations("(service.factoryPid=" +
+ // NodeConstants.NODE_REPOS_FACTORY_PID + ")");
+ // for (Configuration config : configs) {
+ // Object cn = config.getProperties().get(NodeConstants.CN);
+ // if (log.isDebugEnabled())
+ // log.debug("Standalone repo cn: " + cn);
+ // }
Configuration[] configs = configurationAdmin
- .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_REPOS_FACTORY_PID + ")");
- for (Configuration config : configs) {
- Object cn = config.getProperties().get(NodeConstants.CN);
- log.debug("Standalone repo cn: " + cn);
- }
- configs = configurationAdmin
.listConfigurations("(service.factoryPid=" + NodeConstants.NODE_USER_ADMIN_PID + ")");
boolean hasDomain = false;
for (Configuration config : configs) {
Object realm = config.getProperties().get(UserAdminConf.realm.name());
if (realm != null) {
- log.debug("Realm: " + realm);
+ log.debug("Found realm: " + realm);
hasDomain = true;
}
}
- if (!hasDomain) {
- loadNoIpaJaasConfiguration();
+ if (hasDomain) {
+ loadIpaJaasConfiguration();
}
} catch (Exception e) {
throw new CmsException("Cannot initialize config", e);
}.open();
}
- private void loadNoIpaJaasConfiguration() {
+ private void loadIpaJaasConfiguration() {
if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
- String jaasConfig = KernelConstants.JAAS_CONFIG_NOIPA;
+ String jaasConfig = KernelConstants.JAAS_CONFIG_IPA;
URL url = getClass().getClassLoader().getResource(jaasConfig);
KernelUtils.setJaasConfiguration(url);
- if (log.isDebugEnabled())
- log.debug("Set no-IPA JAAS configuration.");
+ log.debug("Set IPA JAAS configuration.");
}
}
private void checkReadiness() {
if (nodeAvailable && userAdminAvailable && (httpExpected ? httpAvailable : true)) {
+ String data = KernelUtils.getFrameworkProp(KernelUtils.OSGI_INSTANCE_AREA);
+ String state = KernelUtils.getFrameworkProp(KernelUtils.OSGI_CONFIGURATION_AREA);
availableSince = System.currentTimeMillis();
long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
- log.info("## ARGEO CMS AVAILABLE in " + (jvmUptime / 1000) + "." + (jvmUptime % 1000) + "s ##");
+ String jvmUptimeStr = " in " + (jvmUptime / 1000) + "." + (jvmUptime % 1000) + "s";
+ log.info("## ARGEO NODE AVAILABLE" + (log.isDebugEnabled() ? jvmUptimeStr : "") + " ##");
+ if (log.isDebugEnabled()) {
+ log.debug("## state: " + state);
+ if (data != null)
+ log.debug("## data: " + data);
+ }
long begin = bc.getService(bc.getServiceReference(NodeState.class)).getAvailableSince();
long initDuration = System.currentTimeMillis() - begin;
if (log.isTraceEnabled())
}
List<BundleCapability> capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);
for (BundleCapability capability : capabilities) {
- registerCnd(adminSession, capability, processed);
+ registerDataModelCapability(adminSession, capability, processed);
}
}
- private void registerCnd(Session adminSession, BundleCapability capability, Set<String> processed) {
+ private void registerDataModelCapability(Session adminSession, BundleCapability capability, Set<String> processed) {
Map<String, Object> attrs = capability.getAttributes();
String name = (String) attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE);
if (processed.contains(name)) {
log.trace("Data model " + name + " has already been processed");
return;
}
+
+ // CND
String path = (String) attrs.get(DataModelNamespace.CAPABILITY_CND_ATTRIBUTE);
- URL url = capability.getRevision().getBundle().getResource(path);
- try (Reader reader = new InputStreamReader(url.openStream())) {
- CndImporter.registerNodeTypes(reader, adminSession, true);
- processed.add(name);
- if (log.isDebugEnabled())
- log.debug("Registered CND " + url);
- } catch (Exception e) {
- throw new CmsException("Cannot import CND " + url, e);
+ if (path != null) {
+ URL url = capability.getRevision().getBundle().getResource(path);
+ if (url == null)
+ throw new CmsException("No data model '" + name + "' found under path " + path);
+ try (Reader reader = new InputStreamReader(url.openStream())) {
+ CndImporter.registerNodeTypes(reader, adminSession, true);
+ processed.add(name);
+ if (log.isDebugEnabled())
+ log.debug("Registered CND " + url);
+ } catch (Exception e) {
+ throw new CmsException("Cannot import CND " + url, e);
+ }
}
if (!asBoolean((String) attrs.get(DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE))) {