From 4730c12cdc3d8f276bb75fa92386b81d42c6bc86 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 26 May 2021 12:58:29 +0200
Subject: [PATCH] Adapt to changes in Commons and SLC.

---
 cms/org.argeo.slc.agent.jcr/bnd.bnd           |  1 +
 .../slc/client/ui/dist/model/RepoElem.java    |  5 +++--
 cms/org.argeo.slc.server.repo/bnd.bnd         |  1 +
 cms/org.argeo.slc.spring/bnd.bnd              |  3 +++
 .../src/org/argeo/slc/core/test/spring.xml    |  4 ++--
 demo/init/node/.gitignore                     |  4 ++++
 demo/init/node/ou=roles,ou=node.ldif          | 19 +++++++++++++++++++
 .../META-INF/spring/basic-001.xml             |  4 ++--
 .../META-INF/spring/basic-002.xml             |  4 ++--
 .../META-INF/spring/basic.xml                 | 10 +++++-----
 .../META-INF/spring/canonic-ns.xml            | 12 ++++++------
 .../META-INF/spring/canonic.xml               | 12 ++++++------
 .../META-INF/spring/helloworld-raw.xml        |  2 +-
 .../org.argeo.slc.demo.minimal/bnd.bnd        |  2 ++
 demo/modules/pom.xml                          |  5 +++++
 15 files changed, 62 insertions(+), 26 deletions(-)
 create mode 100644 demo/init/node/.gitignore
 create mode 100644 demo/init/node/ou=roles,ou=node.ldif

diff --git a/cms/org.argeo.slc.agent.jcr/bnd.bnd b/cms/org.argeo.slc.agent.jcr/bnd.bnd
index 519cb0341..00566cc50 100644
--- a/cms/org.argeo.slc.agent.jcr/bnd.bnd
+++ b/cms/org.argeo.slc.agent.jcr/bnd.bnd
@@ -1,4 +1,5 @@
 Import-Package: org.argeo.slc.jcr,\
+org.argeo.security.jackrabbit,\
 org.apache.commons.vfs2.provider.bzip2,\
 org.apache.commons.vfs2.provider.compressed,\
 org.apache.commons.vfs2.provider.ftp,\
diff --git a/cms/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/cms/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
index 4e404a842..8ae8e8b8c 100644
--- a/cms/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/cms/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
@@ -9,6 +9,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
+import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
@@ -92,7 +93,7 @@ public class RepoElem extends DistParentElem {
 
 		try {
 			// FIXME make it more generic
-			String defaultWorkspace = "main";
+			String defaultWorkspace = NodeConstants.SYS_WORKSPACE;
 			defaultSession = repository.login(credentials, defaultWorkspace);
 			refreshChildren();
 		} catch (RepositoryException e) {
@@ -173,7 +174,7 @@ public class RepoElem extends DistParentElem {
 	protected Session repositoryLogin(String workspaceName) {
 		try {
 			if (workspaceName == null)
-				workspaceName = "main";// FIXME make it more generic
+				workspaceName = NodeConstants.SYS_WORKSPACE;// FIXME make it more generic
 			return repository.login(credentials, workspaceName);
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot login repository " + label + " with credential " + credentials, e);
diff --git a/cms/org.argeo.slc.server.repo/bnd.bnd b/cms/org.argeo.slc.server.repo/bnd.bnd
index 4931ae658..45f2f02f0 100644
--- a/cms/org.argeo.slc.server.repo/bnd.bnd
+++ b/cms/org.argeo.slc.server.repo/bnd.bnd
@@ -1,4 +1,5 @@
 Import-Package: org.argeo.jcr,\
+org.argeo.security.jackrabbit,\
 org.argeo.slc.jcr,\
 org.argeo.slc.repo,\
 org.h2;resolution:=optional,\
diff --git a/cms/org.argeo.slc.spring/bnd.bnd b/cms/org.argeo.slc.spring/bnd.bnd
index bc4d0cd86..682a5ea24 100644
--- a/cms/org.argeo.slc.spring/bnd.bnd
+++ b/cms/org.argeo.slc.spring/bnd.bnd
@@ -6,3 +6,6 @@ org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 org.osgi.*;version=0.0.0,\
 *
+
+Export-Package: org.argeo.slc.core.test,\
+*
\ No newline at end of file
diff --git a/cms/org.argeo.slc.spring/src/org/argeo/slc/core/test/spring.xml b/cms/org.argeo.slc.spring/src/org/argeo/slc/core/test/spring.xml
index 31cf67167..28fba40c9 100644
--- a/cms/org.argeo.slc.spring/src/org/argeo/slc/core/test/spring.xml
+++ b/cms/org.argeo.slc.spring/src/org/argeo/slc/core/test/spring.xml
@@ -22,7 +22,7 @@
     default-lazy-init="true">
 
     <bean name="slcDefault.test.testRun"
-        class="org.argeo.slc.core.test.SimpleTestRun"
+        class="org.argeo.slc.runtime.test.SimpleTestRun"
         scope="prototype">
     </bean>
 
@@ -31,7 +31,7 @@
     </bean>
 
     <bean id="slcDefault.test.basicSimpleTestResult"
-        class="org.argeo.slc.core.test.SimpleTestResult"
+        class="org.argeo.slc.runtime.test.SimpleTestResult"
         abstract="true">
         <property name="uuid">
             <bean factory-bean="slcDefault.test.uuid"
diff --git a/demo/init/node/.gitignore b/demo/init/node/.gitignore
new file mode 100644
index 000000000..f61974476
--- /dev/null
+++ b/demo/init/node/.gitignore
@@ -0,0 +1,4 @@
+/krb5.keytab
+/krb5.keytab.old
+/*.p12
+/*.jks
\ No newline at end of file
diff --git a/demo/init/node/ou=roles,ou=node.ldif b/demo/init/node/ou=roles,ou=node.ldif
new file mode 100644
index 000000000..3a65d495f
--- /dev/null
+++ b/demo/init/node/ou=roles,ou=node.ldif
@@ -0,0 +1,19 @@
+dn: cn=admin,ou=roles,ou=node
+objectClass: groupOfNames
+objectClass: top
+cn: admin
+member: uid=root,ou=People,dc=example,dc=com
+
+dn: cn=org.argeo.slc.user,ou=roles,ou=node
+objectClass: groupOfNames
+objectClass: top
+cn: org.argeo.slc.user
+member: uid=root,ou=People,dc=example,dc=com
+member: uid=demo,ou=People,dc=example,dc=com
+
+dn: cn=userAdmin,ou=roles,ou=node
+objectClass: groupOfNames
+objectClass: top
+member: cn=admin,ou=roles,ou=node
+cn: userAdmin
+
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml
index c68414a9b..cc121f250 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml
@@ -12,7 +12,7 @@
 			<map>
 				<entry key="testData1" value-ref="basic.001.testData" />
 				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">
+					<bean class="org.argeo.slc.runtime.test.BasicTestData" scope="execution">
 						<aop:scoped-proxy />
 						<property name="expected" value="tata101" />
 						<property name="reached" value="tata@{testedComponentId}" />
@@ -22,7 +22,7 @@
 		</constructor-arg>
 	</bean>
 
-	<bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"
+	<bean id="basic.001.testData" class="org.argeo.slc.runtime.test.BasicTestData"
 		scope="execution">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata100" />
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml
index 5720d9693..4baf29169 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml
@@ -8,13 +8,13 @@
 		<constructor-arg>
 			<map>
 				<entry key="testData1">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
+					<bean class="org.argeo.slc.runtime.test.BasicTestData">
 						<property name="expected" value="toto" />
 						<property name="reached" value="toto" />
 					</bean>
 				</entry>
 				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
+					<bean class="org.argeo.slc.runtime.test.BasicTestData">
 						<property name="expected" value="tata" />
 						<property name="reached" value="toto" />
 					</bean>
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
index 1f0afd9cd..a2e34c15e 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
@@ -16,11 +16,11 @@
 						p:type="integer" />
 				</entry>
 				<entry key="testData1">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"
 						p:isParameter="true" p:isFrozen="true" />
 				</entry>
 				<entry key="testData2">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"
 						p:isParameter="true" p:isFrozen="true" />
 				</entry>
 			</map>
@@ -95,13 +95,13 @@
 		<constructor-arg value="testData2" />
 	</bean>
 
-	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">
+	<bean id="basic.testData" class="org.argeo.slc.runtime.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="tata" />
 	</bean>
 
-	<bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
+	<bean id="basic.testDef" class="org.argeo.slc.runtime.test.BasicTestDefinition"
 		scope="prototype" />
 
 	<bean id="basic.testResult" class="org.argeo.slc.jcr.JcrTestResult"
@@ -127,7 +127,7 @@
 	<!-- <aop:scoped-proxy /> -->
 	<!-- </bean> -->
 
-	<bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"
+	<bean id="basic.testRun" class="org.argeo.slc.runtime.test.SimpleTestRun"
 		abstract="true">
 		<property name="testResult" ref="basic.testResult" />
 	</bean>
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
index 29f9f44db..8fe234b2b 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
@@ -17,13 +17,13 @@
 			isParameter="true" type="integer" />
 		<flow:primitive name="hide" value="300" isParameter="true"
 			type="integer" isHidden="true" />
-		<flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"
+		<flow:ref name="refWithValue" targetClass="org.argeo.slc.runtime.test.BasicTestData"
 			isParameter="true" ref="testDataNok" />
-		<flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />
-		<flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"
+		<flow:ref name="refWithoutValue" targetClass="org.argeo.slc.runtime.test.BasicTestData" />
+		<flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.runtime.test.BasicTestData"
 			isParameter="true" isFrozen="true">
 			<flow:value>
-				<bean class="org.argeo.slc.core.test.BasicTestData">
+				<bean class="org.argeo.slc.runtime.test.BasicTestData">
 					<aop:scoped-proxy />
 					<property name="expected" value="tata" />
 					<property name="reached" value="tata" />
@@ -41,13 +41,13 @@
 		</bean>
 	</flow:flow>
 
-	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
+	<bean id="testDataOk" class="org.argeo.slc.runtime.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="tata" />
 	</bean>
 
-	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
+	<bean id="testDataNok" class="org.argeo.slc.runtime.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="toto" />
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
index 4172e9376..f45b1ae75 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
@@ -27,18 +27,18 @@
 						p:isFrozen="false" p:isHidden="true" p:type="integer" />
 				</entry>
 				<entry key="refWithValue">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"
 						p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />
 				</entry>
 				<entry key="refWithoutValue">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"
 						p:isParameter="false" p:isFrozen="false" />
 				</entry>
 				<entry key="refWithoutValueFrozen">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"
 						p:isParameter="true" p:isFrozen="true">
 						<property name="value">
-							<bean class="org.argeo.slc.core.test.BasicTestData">
+							<bean class="org.argeo.slc.runtime.test.BasicTestData">
 								<aop:scoped-proxy />
 								<property name="expected" value="tata" />
 								<property name="reached" value="tata" />
@@ -64,13 +64,13 @@
 		</property>
 	</bean>
 
-	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
+	<bean id="testDataOk" class="org.argeo.slc.runtime.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="tata" />
 	</bean>
 
-	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
+	<bean id="testDataNok" class="org.argeo.slc.runtime.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="toto" />
diff --git a/demo/modules/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml b/demo/modules/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
index 0130d2df6..6f6149431 100644
--- a/demo/modules/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
+++ b/demo/modules/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
@@ -25,7 +25,7 @@
 					<map>
 						<entry key="testKey">
 							<bean p:value="777"
-								class="org.argeo.slc.core.execution.PrimitiveSpecAttribute" />
+								class="org.argeo.slc.primitive.PrimitiveSpecAttribute" />
 						</entry>
 					</map>
 				</property>
diff --git a/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd b/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
index e69de29bb..758b56dbb 100644
--- a/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
+++ b/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
@@ -0,0 +1,2 @@
+#Import-Package: org.argeo.slc.runtime,\
+#*
\ No newline at end of file
diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index 493f27e77..44b0ce13f 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -38,8 +38,13 @@
 							org.springframework.cglib.core,
 							org.springframework.cglib.reflect,
 							org.aopalliance.aop,
+							org.argeo.slc.primitive,
+							org.argeo.slc.attachment,
+							org.argeo.slc.runtime,
+							org.argeo.slc.runtime.test,
 							org.argeo.slc.core.execution,
 							org.argeo.slc.core.execution.tasks,
+							org.argeo.slc.core.test,
 							org.argeo.slc.execution,
 							org.argeo.slc.osgi,
 							org.argeo.slc.test,
-- 
2.39.2