X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.server.jcr%2Fsrc%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitWrapper.java;h=7288cdf4bbea30908e1f813210fe443442f4ff36;hb=79566a2b46229093562948d6f5146f579bf5220b;hp=53a9ff1e2b4e802a6fddeeb3bc2e9f714daf7cae;hpb=0a63088e055dcd5ff397ce4e98d008c62c84dc98;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java b/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java
index 53a9ff1e2..7288cdf4b 100644
--- a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java
+++ b/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java
@@ -26,9 +26,11 @@ import java.util.List;
 import java.util.Map;
 
 import javax.jcr.Credentials;
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
-import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
@@ -36,6 +38,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.commons.NamespaceHelper;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.argeo.ArgeoException;
@@ -58,8 +61,9 @@ import org.springframework.core.io.ResourceLoader;
  * Wrapper around a Jackrabbit repository which allows to simplify configuration
  * and intercept some actions. It exposes itself as a {@link Repository}.
  */
+@SuppressWarnings("deprecation")
 public class JackrabbitWrapper extends JcrRepositoryWrapper implements
-		ResourceLoaderAware {
+		JackrabbitRepository, ResourceLoaderAware {
 	private final static Log log = LogFactory.getLog(JackrabbitWrapper.class);
 	private final static String DIGEST_ALGORITHM = "MD5";
 
@@ -170,8 +174,8 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 					String oldDigest = JcrUtils.checksumFile(dataModel,
 							DIGEST_ALGORITHM);
 					if (oldDigest.equals(newDigest)) {
-						if (log.isDebugEnabled())
-							log.debug("Data model " + resUrl
+						if (log.isTraceEnabled())
+							log.trace("Data model " + resUrl
 									+ " hasn't changed, keeping version "
 									+ currentVersion);
 						return;
@@ -298,8 +302,21 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 	}
 
 	/*
-	 * REPOSITORY INTERCEPTOR
+	 * JACKRABBIT REPOSITORY IMPLEMENTATION
 	 */
+	@Override
+	public Session login(Credentials credentials, String workspaceName,
+			Map<String, Object> attributes) throws LoginException,
+			NoSuchWorkspaceException, RepositoryException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void shutdown() {
+		// TODO Auto-generated method stub
+
+	}
 
 	/*
 	 * UTILITIES
@@ -313,8 +330,8 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 			resUrl = resUrl.substring(1);
 		String pkg = resUrl.substring(0, resUrl.lastIndexOf('/')).replace('/',
 				'.');
-		ServiceReference paSr = bundleContext
-				.getServiceReference(PackageAdmin.class.getName());
+		ServiceReference<PackageAdmin> paSr = bundleContext
+				.getServiceReference(PackageAdmin.class);
 		PackageAdmin packageAdmin = (PackageAdmin) bundleContext
 				.getService(paSr);