projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce Makefile for Java build
[lgpl/argeo-commons.git]
/
org.argeo.cms.jcr
/
src
/
org
/
argeo
/
cms
/
jcr
/
internal
/
servlet
/
CmsSessionProvider.java
diff --git
a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java
b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java
index 8ec2f45b3156043e0e098462e33bd0047b532cb2..0f27fd005dca58aa2f17eea8d95ed59f40702159 100644
(file)
--- a/
org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java
+++ b/
org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java
@@
-16,11
+16,10
@@
import javax.security.auth.Subject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.server.SessionProvider;
import org.apache.jackrabbit.server.SessionProvider;
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.jcr.JcrUtils;
/**
import org.argeo.jcr.JcrUtils;
/**
@@
-30,7
+29,7
@@
import org.argeo.jcr.JcrUtils;
public class CmsSessionProvider implements SessionProvider, Serializable {
private static final long serialVersionUID = -1358136599534938466L;
public class CmsSessionProvider implements SessionProvider, Serializable {
private static final long serialVersionUID = -1358136599534938466L;
- private final static
Log log = LogFactory
.getLog(CmsSessionProvider.class);
+ private final static
CmsLog log = CmsLog
.getLog(CmsSessionProvider.class);
private final String alias;
private final String alias;
@@
-92,7
+91,7
@@
public class CmsSessionProvider implements SessionProvider, Serializable {
checkValid();
// FIXME make it more robust
if (workspace == null)
checkValid();
// FIXME make it more robust
if (workspace == null)
- workspace =
Node
Constants.SYS_WORKSPACE;
+ workspace =
Cms
Constants.SYS_WORKSPACE;
String path = cn + '/' + workspace;
if (dataSessionsInUse.contains(path)) {
try {
String path = cn + '/' + workspace;
if (dataSessionsInUse.contains(path)) {
try {