tdraier 2005/10/04 15:48:07 CEST
Modified files:
core/src/webapp/WEB-INF/etc/slide defs.xml
Added files:
core/src/java/org/jahia/services/webdav/stores
JahiaBindingStore.java
Log:
fixed binding issue with new users / ldap users
Revision Changes Path
1.1 +64 -0
jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java?rev=1.1&content-type=text/plain
1.7 +1 -1 jahia/core/src/webapp/WEB-INF/etc/slide/defs.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/slide/defs.xml.diff?r1=1.6&r2=1.7&f=h
Index: JahiaBindingStore.java
====================================================================
package org.jahia.services.webdav.stores;
import org.apache.slide.store.BindingStore;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.common.Uri;
import org.apache.slide.common.ServiceAccessException;
/**
* Created by IntelliJ IDEA.
* Date: 4 oct. 2005 - 14:58:07
*
* @author toto
* @version $Id: JahiaBindingStore.java,v 1.1 2005/10/04 13:48:06 tdraier Exp
$
*/
public class JahiaBindingStore extends BindingStore {
public ObjectNode retrieveObject(Uri uri) throws ServiceAccessException,
ObjectNotFoundException {
if (uri instanceof Uri && uri.toString().startsWith("/users/")) {
ObjectNode objectNode = null;
if (isForceStoreEnlistment(uri)) {
enlist(nodeStore);
try {
objectNode = nodeStore.retrieveObject(uri);
} catch (ServiceAccessException e) {
delist(nodeStore, false);
throw e;
} catch (ObjectNotFoundException e) {
// Note : Failed reads aren't considered fatal (ie, the
// transaction won't be always rolledback when committed)
delist(nodeStore);
throw e;
} catch (Error e) {
delist(nodeStore, false);
throw e;
} catch (Throwable t) {
delist(nodeStore, false);
// Wrap everything else in a ServiceAccessException
throw new ServiceAccessException(nodeStore, t);
}
delist(nodeStore);
} else {
try {
objectNode = nodeStore.retrieveObject(uri);
} catch (ServiceAccessException e) {
throw e;
} catch (ObjectNotFoundException e) {
throw e;
} catch (Error e) {
throw e;
} catch (Throwable t) {
// Wrap everything else in a ServiceAccessException
throw new ServiceAccessException(nodeStore, t);
}
}
objectNode.validate(uri.toString());
return objectNode;
} else {
return super.retrieveObject(uri);
}
}
}
/**
*$Log $
*/
Index: defs.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/slide/defs.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- defs.xml 30 Sep 2005 15:34:08 -0000 1.6
+++ defs.xml 4 Oct 2005 13:48:06 -0000 1.7
@@ -9,7 +9,7 @@
-->
<definition>
- <store name="jahia" classname="org.apache.slide.store.BindingStore" >
+ <store name="jahia"
classname="org.jahia.services.webdav.stores.JahiaBindingStore" >
<nodestore
classname="org.jahia.services.webdav.stores.JahiaDescriptorsStore">
<!-- Comment this line to store your slide file inside your
database -->
<parameter
name="contentStore">org.jahia.services.webdav.stores.FileContentStore</parameter>
