projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve CMS session.
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
internal
/
kernel
/
EgoRepository.java
diff --git
a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
index e23f8d1ac4e970376eacad5c5306cbc2afb0be1a..c866eaaa2fe0168e44ebca8d95984fba7b455648 100644
(file)
--- a/
org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
+++ b/
org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
@@
-20,6
+20,7
@@
import javax.security.auth.login.LoginContext;
import org.argeo.api.NodeConstants;
import org.argeo.api.NodeUtils;
import org.argeo.cms.CmsException;
import org.argeo.api.NodeConstants;
import org.argeo.api.NodeUtils;
import org.argeo.cms.CmsException;
+import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrRepositoryWrapper;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.JcrRepositoryWrapper;
import org.argeo.jcr.JcrUtils;
@@
-52,7
+53,7
@@
class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
lc.login();
} catch (javax.security.auth.login.LoginException e1) {
lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
lc.login();
} catch (javax.security.auth.login.LoginException e1) {
- throw new
CmsException("Cannot login as systr
em", e1);
+ throw new
IllegalStateException("Cannot login as syst
em", e1);
}
Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
}
Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
@@
-75,7
+76,7
@@
class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
// initJcr(adminSession);
} catch (RepositoryException e) {
// initJcr(adminSession);
} catch (RepositoryException e) {
- throw new
Cms
Exception("Cannot init JCR home", e);
+ throw new
Jcr
Exception("Cannot init JCR home", e);
} finally {
JcrUtils.logoutQuietly(adminSession);
}
} finally {
JcrUtils.logoutQuietly(adminSession);
}
@@
-185,7
+186,7
@@
class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
adminSession.save();
} catch (RepositoryException e) {
JcrUtils.discardQuietly(adminSession);
adminSession.save();
} catch (RepositoryException e) {
JcrUtils.discardQuietly(adminSession);
- throw new
Cms
Exception("Cannot sync node security model for " + username, e);
+ throw new
Jcr
Exception("Cannot sync node security model for " + username, e);
}
}
}
}