import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
import org.argeo.api.security.PBEKeySpecCallback;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
import org.argeo.cms.security.AbstractKeyring;
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
// return true;
session = session();
session.refresh(true);
- Node userHome = NodeUtils.getUserHome(session);
+ Node userHome = CmsJcrUtils.getUserHome(session);
return userHome.hasNode(ARGEO_KEYRING);
} catch (RepositoryException e) {
throw new JcrException("Cannot check whether keyring is setup", e);
// InputStream in = null;
try {
session().refresh(true);
- Node userHome = NodeUtils.getUserHome(session());
+ Node userHome = CmsJcrUtils.getUserHome(session());
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING)) {
throw new IllegalArgumentException("Keyring already set up");
try {
session = session();
session.refresh(true);
- Node userHome = NodeUtils.getUserHome(session);
+ Node userHome = CmsJcrUtils.getUserHome(session);
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING))
keyring = userHome.getNode(ARGEO_KEYRING);
protected Cipher createCipher() {
try {
- Node userHome = NodeUtils.getUserHome(session());
+ Node userHome = CmsJcrUtils.getUserHome(session());
if (!userHome.hasNode(ARGEO_KEYRING))
throw new IllegalArgumentException("Keyring not setup");
Node keyring = userHome.getNode(ARGEO_KEYRING);