Adapt to changes in Commons and SLC.

diff --git a/cms/org.argeo.slc.agent.jcr/bnd.bnd b/cms/org.argeo.slc.agent.jcr/bnd.bnd
index 519cb03417c5e9c619c636d8580fe3ad0d6c7c23..00566cc50c70b27f88f0b0bbd51ec5117129d922 100644 (file)
--- 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 4e404a8426d92ea7d1e2277a56add907775c2b7e..8ae8e8b8cf77dc5991e3fe3245f1509f9d430974 100644 (file)
--- 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 4931ae65833c626b921badd2f6b533c7aed1f625..45f2f02f0aae3adeea8da9a442e27a3a42b645ec 100644 (file)
--- 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 bc4d0cd86a260fdf0de71c93378e8ef33d7a567e..682a5ea24c4df4faaf27c9a28d1d6de73fd4732b 100644 (file)
--- 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 31cf671676dbfc9561f51bd785e613c2efeb8673..28fba40c9da520b3161fc2bb9301f11bc1c5fba8 100644 (file)
--- 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 (file)
index 0000000..f619744
--- /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 (file)
index 0000000..3a65d49
--- /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 c68414a9be4fd48bbe872aadb4a385e9895b20da..cc121f2503497323bff11ad91d9fe8c6adf45f66 100644 (file)
--- 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>\r
                                <entry key="testData1" value-ref="basic.001.testData" />\r
                                <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">\r
+                                       <bean class="org.argeo.slc.runtime.test.BasicTestData" scope="execution">\r
                                                <aop:scoped-proxy />\r
                                                <property name="expected" value="tata101" />\r
                                                <property name="reached" value="tata@{testedComponentId}" />\r
@@ -22,7 +22,7 @@
                </constructor-arg>\r
        </bean>\r
 \r
-       <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r
+       <bean id="basic.001.testData" class="org.argeo.slc.runtime.test.BasicTestData"\r
                scope="execution">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata100" />\r

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 5720d9693db176d21b2df6778fc6ef56ff24e237..4baf291692bb56b2a6cff344eb0f346853cc8602 100644 (file)
--- 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>\r
                        <map>\r
                                <entry key="testData1">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                       <bean class="org.argeo.slc.runtime.test.BasicTestData">\r
                                                <property name="expected" value="toto" />\r
                                                <property name="reached" value="toto" />\r
                                        </bean>\r
                                </entry>\r
                                <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                       <bean class="org.argeo.slc.runtime.test.BasicTestData">\r
                                                <property name="expected" value="tata" />\r
                                                <property name="reached" value="toto" />\r
                                        </bean>\r

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 1f0afd9cd1b2488932b8e4fc4156d94ed1305d18..a2e34c15efceaf476f28d315fb2627d0d98bc7dc 100644 (file)
--- 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" />\r
                                </entry>\r
                                <entry key="testData1">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                                                p:isParameter="true" p:isFrozen="true" />\r
                                </entry>\r
                                <entry key="testData2">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                                                p:isParameter="true" p:isFrozen="true" />\r
                                </entry>\r
                        </map>\r
@@ -95,13 +95,13 @@
                <constructor-arg value="testData2" />\r
        </bean>\r
 \r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
+       <bean id="basic.testData" class="org.argeo.slc.runtime.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="tata" />\r
        </bean>\r
 \r
-       <bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
+       <bean id="basic.testDef" class="org.argeo.slc.runtime.test.BasicTestDefinition"\r
                scope="prototype" />\r
 \r
        <bean id="basic.testResult" class="org.argeo.slc.jcr.JcrTestResult"\r
@@ -127,7 +127,7 @@
        <!-- <aop:scoped-proxy /> -->\r
        <!-- </bean> -->\r
 \r
-       <bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
+       <bean id="basic.testRun" class="org.argeo.slc.runtime.test.SimpleTestRun"\r
                abstract="true">\r
                <property name="testResult" ref="basic.testResult" />\r
        </bean>\r

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 29f9f44db550dc308fe8f213178091de9a167ed2..8fe234b2b075dd0fa56c09e3c9fd7d4161cf65d8 100644 (file)
--- 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" />\r
                <flow:primitive name="hide" value="300" isParameter="true"\r
                        type="integer" isHidden="true" />\r
-               <flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"\r
+               <flow:ref name="refWithValue" targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                        isParameter="true" ref="testDataNok" />\r
-               <flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-               <flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"\r
+               <flow:ref name="refWithoutValue" targetClass="org.argeo.slc.runtime.test.BasicTestData" />\r
+               <flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                        isParameter="true" isFrozen="true">\r
                        <flow:value>\r
-                               <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                               <bean class="org.argeo.slc.runtime.test.BasicTestData">\r
                                        <aop:scoped-proxy />\r
                                        <property name="expected" value="tata" />\r
                                        <property name="reached" value="tata" />\r
@@ -41,13 +41,13 @@
                </bean>\r
        </flow:flow>\r
 \r
-       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
+       <bean id="testDataOk" class="org.argeo.slc.runtime.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="tata" />\r
        </bean>\r
 \r
-       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
+       <bean id="testDataNok" class="org.argeo.slc.runtime.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="toto" />\r

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 4172e93764a5947f1685d567fbda502ab29c4498..f45b1ae75bdcbf4643091c9a400a0d6f02bc64d4 100644 (file)
--- 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" />\r
                                </entry>\r
                                <entry key="refWithValue">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                                                p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />\r
                                </entry>\r
                                <entry key="refWithoutValue">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                                                p:isParameter="false" p:isFrozen="false" />\r
                                </entry>\r
                                <entry key="refWithoutValueFrozen">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.runtime.test.BasicTestData"\r
                                                p:isParameter="true" p:isFrozen="true">\r
                                                <property name="value">\r
-                                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                                       <bean class="org.argeo.slc.runtime.test.BasicTestData">\r
                                                                <aop:scoped-proxy />\r
                                                                <property name="expected" value="tata" />\r
                                                                <property name="reached" value="tata" />\r
@@ -64,13 +64,13 @@
                </property>\r
        </bean>\r
 \r
-       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
+       <bean id="testDataOk" class="org.argeo.slc.runtime.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="tata" />\r
        </bean>\r
 \r
-       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
+       <bean id="testDataNok" class="org.argeo.slc.runtime.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="toto" />\r

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 0130d2df66c66195ba3dcd8f135bdfe97eb6452e..6f61494310bc15478f946bd511a4005efe223cf1 100644 (file)
--- 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>\r
                                                <entry key="testKey">\r
                                                        <bean p:value="777"\r
-                                                               class="org.argeo.slc.core.execution.PrimitiveSpecAttribute" />\r
+                                                               class="org.argeo.slc.primitive.PrimitiveSpecAttribute" />\r
                                                </entry>\r
                                        </map>\r
                                </property>\r

diff --git a/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd b/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..758b56dbbb38c4c3130de461de0992e256c60e40 100644 (file)
--- 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 493f27e77b97b9c450b1b2c19553a8ab6e4d374f..44b0ce13f18e96dde376884efdc965d9e8ba4cf9 100644 (file)
--- 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,