X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrResourceAdapter.java;fp=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrResourceAdapter.java;h=d391a69e0f4f6765c6ecd5789f609942ae2d89ca;hb=becc04bd8ec12d2c2b7144e1605ae3eb37021164;hp=ddff59c4caa38024706d3fa8e2682c109fc53f66;hpb=7c7eb5c4ada2e19a839cdc12a77fc39bd35056ef;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
index ddff59c4c..d391a69e0 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-import javax.activation.MimetypesFileTypeMap;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
@@ -31,12 +30,15 @@ import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.springframework.core.io.Resource;
 
+/**
+ * Bridge Spring resources and JCR folder / files semantics (nt:folder / nt:file),
+ * supporting versioning as well.
+ */
 public class JcrResourceAdapter {
 	private final static Log log = LogFactory.getLog(JcrResourceAdapter.class);
 
@@ -122,8 +124,11 @@ public class JcrResourceAdapter {
 		try {
 
 			if (!session().itemExists(path)) {
-				String type = new MimetypesFileTypeMap()
-						.getContentType(FilenameUtils.getName(path));
+				String type = null;
+				// FIXME: using javax.activation leads to conflict between Java
+				// 1.5 and 1.6 (since javax.activation was included in Java 1.6)
+				// String type = new MimetypesFileTypeMap()
+				// .getContentType(FilenameUtils.getName(path));
 				create(path, in, type);
 				return;
 			}
@@ -212,8 +217,8 @@ public class JcrResourceAdapter {
 	protected InputStream fromVersion(Version version)
 			throws RepositoryException {
 		Node frozenNode = version.getNode("jcr:frozenNode");
-		InputStream in = frozenNode.getNode("jcr:content").getProperty(
-				"jcr:data").getStream();
+		InputStream in = frozenNode.getNode("jcr:content")
+				.getProperty("jcr:data").getStream();
 		return in;
 	}