projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jackrabbit
[lgpl/argeo-commons.git]
/
server
/
runtime
/
org.argeo.server.jackrabbit
/
src
/
main
/
java
/
org
/
argeo
/
server
/
jcr
/
JcrResourceAdapter.java
diff --git
a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
index aa6f11b25e95d67b6a0e18e8cea1046ead063dea..44e6ecc15bb7a18712f15fd9f2ed13a24d214d06 100644
(file)
--- a/
server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
+++ b/
server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/JcrResourceAdapter.java
@@
-7,6
+7,7
@@
import java.util.Calendar;
import java.util.List;
import java.util.StringTokenizer;
import java.util.List;
import java.util.StringTokenizer;
+import javax.activation.MimetypesFileTypeMap;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
@@
-19,6
+20,7
@@
import javax.jcr.version.Version;
import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;
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.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
@@
-81,6
+83,8
@@
public class JcrResourceAdapter implements InitializingBean, DisposableBean {
int index = path.lastIndexOf('/');
String parentPath = path.substring(0, index);
int index = path.lastIndexOf('/');
String parentPath = path.substring(0, index);
+ if (parentPath.equals(""))
+ parentPath = "/";
String fileName = path.substring(index + 1);
if (!session().itemExists(parentPath))
throw new ArgeoException("Parent folder of node " + path
String fileName = path.substring(index + 1);
if (!session().itemExists(parentPath))
throw new ArgeoException("Parent folder of node " + path
@@
-127,7
+131,9
@@
public class JcrResourceAdapter implements InitializingBean, DisposableBean {
try {
if (!session().itemExists(path)) {
try {
if (!session().itemExists(path)) {
- create(path, in, null);
+ String type = new MimetypesFileTypeMap()
+ .getContentType(FilenameUtils.getName(path));
+ create(path, in, type);
return;
}
return;
}