Merge remote-tracking branch 'origin/unstable' into merge-to-testing

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / SingleUserContentRepository.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
index cac407495a70be147447e9c27986ccecf448cbe4..b9b940f051ac56fbeeb9166cd03f6a851cc0f4b8 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
@@ -10,9 +10,11 @@ import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
 import org.argeo.api.acr.ContentSession;
+import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.spi.ProvidedRepository;
+import org.argeo.api.uuid.MacAddressUuidFactory;
+import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.acr.fs.FsContentProvider;
-import org.argeo.util.naming.LdapAttrs;
 
 /**
  * A standalone {@link ProvidedRepository} with a single {@link Subject} (which
@@ -24,6 +26,8 @@ public class SingleUserContentRepository extends AbstractContentRepository {
 
        private UUID uuid;
 
+       private UuidFactory uuidFactory = new MacAddressUuidFactory();
+
        // the single session
        private CmsContentSession contentSession;
 
@@ -51,7 +55,7 @@ public class SingleUserContentRepository extends AbstractContentRepository {
                initRootContentProvider(null);
                if (contentSession != null)
                        throw new IllegalStateException("Repository is already started, stop it first.");
-               contentSession = new CmsContentSession(this, uuid, subject, locale);
+               contentSession = new CmsContentSession(this, uuid, subject, locale, uuidFactory);
        }
 
        @Override
@@ -76,13 +80,13 @@ public class SingleUserContentRepository extends AbstractContentRepository {
 
        @Override
        protected CmsContentSession newSystemSession() {
-               return new CmsContentSession(this, uuid, subject, Locale.getDefault());
+               return new CmsContentSession(this, uuid, subject, Locale.getDefault(), uuidFactory);
        }
 
        public static void main(String... args) {
                Path homePath = Paths.get(System.getProperty("user.home"));
                String username = System.getProperty("user.name");
-               X500Principal principal = new X500Principal(LdapAttrs.uid + "=" + username + ",dc=localhost");
+               X500Principal principal = new X500Principal(LdapAttr.uid + "=" + username + ",dc=localhost");
                Subject subject = new Subject();
                subject.getPrincipals().add(principal);