projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Massive Argeo APIs refactoring
[lgpl/argeo-commons.git]
/
org.argeo.cms.jcr
/
src
/
org
/
argeo
/
cms
/
jcr
/
internal
/
JcrKeyring.java
diff --git
a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java
b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java
index ce658b8f82a2de19bbd26d08e16983bc2f5360ec..17625f5d2d1026ee6c330b2d3ff00a8bd838bb4a 100644
(file)
--- a/
org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java
+++ b/
org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java
@@
-26,20
+26,19
@@
import javax.jcr.Session;
import javax.jcr.query.Query;
import org.apache.commons.io.IOUtils;
import javax.jcr.query.Query;
import org.apache.commons.io.IOUtils;
-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.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
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.cms.security.AbstractKeyring;
+import org.argeo.cms.security.PBEKeySpecCallback;
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
/** JCR based implementation of a keyring */
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
/** JCR based implementation of a keyring */
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
- private final static
Log log = LogFactory
.getLog(JcrKeyring.class);
+ private final static
CmsLog log = CmsLog
.getLog(JcrKeyring.class);
/**
* Stronger with 256, but causes problem with Oracle JVM, force 128 in this case
*/
/**
* Stronger with 256, but causes problem with Oracle JVM, force 128 in this case
*/
@@
-96,7
+95,7
@@
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
private Session login() {
try {
private Session login() {
try {
- return repository.login(
Node
Constants.HOME_WORKSPACE);
+ return repository.login(
Cms
Constants.HOME_WORKSPACE);
} catch (RepositoryException e) {
throw new JcrException("Cannot login key ring session", e);
}
} catch (RepositoryException e) {
throw new JcrException("Cannot login key ring session", e);
}
@@
-110,7
+109,7
@@
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
// return true;
session = session();
session.refresh(true);
// return true;
session = session();
session.refresh(true);
- Node userHome =
Node
Utils.getUserHome(session);
+ Node userHome =
CmsJcr
Utils.getUserHome(session);
return userHome.hasNode(ARGEO_KEYRING);
} catch (RepositoryException e) {
throw new JcrException("Cannot check whether keyring is setup", e);
return userHome.hasNode(ARGEO_KEYRING);
} catch (RepositoryException e) {
throw new JcrException("Cannot check whether keyring is setup", e);
@@
-125,7
+124,7
@@
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
// InputStream in = null;
try {
session().refresh(true);
// InputStream in = null;
try {
session().refresh(true);
- Node userHome =
Node
Utils.getUserHome(session());
+ Node userHome =
CmsJcr
Utils.getUserHome(session());
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING)) {
throw new IllegalArgumentException("Keyring already set up");
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING)) {
throw new IllegalArgumentException("Keyring already set up");
@@
-187,7
+186,7
@@
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
try {
session = session();
session.refresh(true);
try {
session = session();
session.refresh(true);
- Node userHome =
Node
Utils.getUserHome(session);
+ Node userHome =
CmsJcr
Utils.getUserHome(session);
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING))
keyring = userHome.getNode(ARGEO_KEYRING);
Node keyring;
if (userHome.hasNode(ARGEO_KEYRING))
keyring = userHome.getNode(ARGEO_KEYRING);
@@
-326,7
+325,7
@@
public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
protected Cipher createCipher() {
try {
protected Cipher createCipher() {
try {
- Node userHome =
Node
Utils.getUserHome(session());
+ Node userHome =
CmsJcr
Utils.getUserHome(session());
if (!userHome.hasNode(ARGEO_KEYRING))
throw new IllegalArgumentException("Keyring not setup");
Node keyring = userHome.getNode(ARGEO_KEYRING);
if (!userHome.hasNode(ARGEO_KEYRING))
throw new IllegalArgumentException("Keyring not setup");
Node keyring = userHome.getNode(ARGEO_KEYRING);