From becc04bd8ec12d2c2b7144e1605ae3eb37021164 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 23 Jan 2011 11:15:56 +0000
Subject: [PATCH] Remove dependencies to javax.activation in JCR related
 modules

git-svn-id: https://svn.argeo.org/commons/trunk@4069 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../runtime/org.argeo.server.jackrabbit/pom.xml |  5 -----
 server/runtime/org.argeo.server.jcr/pom.xml     |  5 -----
 .../java/org/argeo/jcr/JcrResourceAdapter.java  | 17 +++++++++++------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index b7fe39676..7df23abcb 100644
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -74,11 +74,6 @@
 			<artifactId>com.springsource.org.apache.commons.io</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-		</dependency>
-
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 823b050f2..e685303bd 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -94,11 +94,6 @@
 			<artifactId>org.springframework.xml</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-		</dependency>
-
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
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;
 	}
 
-- 
2.30.2