Start working on static CMS.

diff --git a/org.argeo.cms/OSGI-INF/nodeDeployment.xml b/org.argeo.cms/OSGI-INF/nodeDeployment.xml
new file mode 100644 (file)
index 0000000..065f09a
--- /dev/null
+++ b/org.argeo.cms/OSGI-INF/nodeDeployment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="CMS Deployment">
+   <implementation class="org.argeo.cms.internal.kernel.CmsDeployment"/>
+   <service>
+      <provide interface="org.argeo.api.NodeDeployment"/>
+   </service>
+</scr:component>

diff --git a/org.argeo.cms/OSGI-INF/nodeInstance.xml b/org.argeo.cms/OSGI-INF/nodeInstance.xml
new file mode 100644 (file)
index 0000000..cb70231
--- /dev/null
+++ b/org.argeo.cms/OSGI-INF/nodeInstance.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="CMS Instance">
+   <implementation class="org.argeo.cms.internal.kernel.CmsInstance"/>
+   <service>
+      <provide interface="org.argeo.api.NodeInstance"/>
+   </service>
+</scr:component>

diff --git a/org.argeo.cms/OSGI-INF/nodeState.xml b/org.argeo.cms/OSGI-INF/nodeState.xml
new file mode 100644 (file)
index 0000000..565c442
--- /dev/null
+++ b/org.argeo.cms/OSGI-INF/nodeState.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="initServices" name="CMS State">
+   <implementation class="org.argeo.cms.internal.kernel.CmsState"/>
+   <service>
+      <provide interface="org.argeo.api.NodeState"/>
+   </service>
+</scr:component>

diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index f01254da2c135a832e8f8052ad2fb439296e545b..695dd65fe7cc880ead18697eec69448c77679b01 100644 (file)
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -12,7 +12,8 @@ org.osgi.*;version=0.0.0,\
 org.osgi.service.http.whiteboard,\
 *
 
-Service-Component: OSGI-INF/cmsUserManager.xml,\
+Service-Component:\
+OSGI-INF/cmsUserManager.xml,\
 OSGI-INF/jcrServletContext.xml,\
 OSGI-INF/dataServletContext.xml,\
 OSGI-INF/filesServletContext.xml,\

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index ae482d792e5703d7a935abed11c4d9e8638e92be..8086c8636440f9700ecb8e58f894d1a13731730c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -162,17 +162,7 @@ public class Activator implements BundleActivator {
 
        private void initNode() throws IOException {
                // Node state
-//             Path stateUuidPath = bc.getDataFile("stateUuid").toPath();
-//             String stateUuid;
-//             if (Files.exists(stateUuidPath)) {
-//                     stateUuid = Files.readAllLines(stateUuidPath).get(0);
-//             } else {
-//                     stateUuid = bc.getProperty(Constants.FRAMEWORK_UUID);
-//                     Files.write(stateUuidPath, stateUuid.getBytes());
-//             }
                nodeState = new CmsState();
-//             Dictionary<String, Object> regProps = LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID);
-//             regProps.put(NodeConstants.CN, stateUuid);
                registerService(NodeState.class, nodeState, null);
 
                // Node deployment