X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fmaintenance%2FDeploymentEntryPoint.java;h=e713f53e1aac9fed254b1f97e0e7a201b4feca28;hb=f4da6777015da3fc392138f0c01cea2f2add9ed3;hp=505f67d8157b8f787364301ba96ca9abff56c5e9;hpb=b7683883512d924a039a43c2e1102290aa49f64d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java index 505f67d81..e713f53e1 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java @@ -3,9 +3,10 @@ package org.argeo.cms.e4.maintenance; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.argeo.api.NodeConstants; -import org.argeo.api.NodeDeployment; -import org.argeo.api.NodeState; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsContext; +import org.argeo.api.cms.CmsDeployment; +import org.argeo.api.cms.CmsState; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -62,18 +63,18 @@ class DeploymentEntryPoint { composite.setLayoutData(gridData); composite.setLayout(new FillLayout()); - ServiceReference nodeStateRef = bc.getServiceReference(NodeState.class); + ServiceReference nodeStateRef = bc.getServiceReference(CmsState.class); if (nodeStateRef == null) throw new IllegalStateException("No CMS state available"); - NodeState nodeState = bc.getService(nodeStateRef); - ServiceReference nodeDeploymentRef = bc.getServiceReference(NodeDeployment.class); + CmsState nodeState = bc.getService(nodeStateRef); + ServiceReference nodeDeploymentRef = bc.getServiceReference(CmsContext.class); Label label = new Label(composite, SWT.WRAP); CmsSwtUtils.markup(label); if (nodeDeploymentRef == null) { label.setText("Not yet deployed on
" + nodeState.getHostname() + "
, please configure below."); } else { - Object stateUuid = nodeStateRef.getProperty(NodeConstants.CN); - NodeDeployment nodeDeployment = bc.getService(nodeDeploymentRef); + Object stateUuid = nodeStateRef.getProperty(CmsConstants.CN); + CmsContext nodeDeployment = bc.getService(nodeDeploymentRef); GregorianCalendar calendar = new GregorianCalendar(); calendar.setTimeInMillis(nodeDeployment.getAvailableSince()); calendar.setTimeZone(TimeZone.getDefault());