svn commit: [jahia] r17339 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/listeners/IMGSlideContentListener.java

[tdraier]

Author: tdraier
Date: Tue May 22 12:31:25 2007
New Revision: 17339

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17339&repname=
=3Djahia
Log:
fixed thumbnails view ( DOC-71 , DOC-143 )

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/li=
steners/IMGSlideContentListener.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/web=
dav/listeners/IMGSlideContentListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/webdav/listeners/IMGSlideContentLi=
stener.java&rev=3D17339&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/li=
steners/IMGSlideContentListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/li=
steners/IMGSlideContentListener.java Tue May 22 12:31:25 2007
@@ -21,10 +21,13 @@
 import org.apache.commons.jexl.JexlContext;
 import org.apache.commons.jexl.JexlHelper;
 import org.apache.slide.common.SlideToken;
+import org.apache.slide.common.SlideTokenWrapper;
+import org.apache.slide.common.SlideTokenImpl;
 import org.apache.slide.event.*;
 import org.apache.slide.webdav.event.WebdavEvent;
 import org.apache.slide.webdav.event.WebdavListener;
 import org.apache.slide.webdav.method.AbstractWebdavMethod;
+import org.apache.slide.authenticate.CredentialsToken;
 import org.jahia.bin.Jahia;
 import org.jahia.data.containers.JahiaContainer;
 import org.jahia.data.containers.JahiaContainerList;
@@ -61,6 +64,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
+import java.security.Principal;
 =

 /**
  * A WebDAV listener that creates pages and containers for folder and files
@@ -668,6 +672,13 @@
 =

         try {
 =

+            slideToken =3D new SlideTokenWrapper(new SlideTokenImpl(new Cr=
edentialsToken(new Principal() {
+                public String getName() {
+                    return "";
+                }
+            })));
+            slideToken.setForceSecurity(false);
+            slideToken.setForceLock(false);
             // Prevent dirty reads
             slideToken.setForceStoreEnlistment(true);
 =

@@ -679,11 +690,11 @@
             }
 =

             DAVFileAccess parentDir =3D new DAVFileAccess(site, slideToken=
, path);
-            if (!parentDir.isWriteable() || !parentDir.hasPermission(DAVFi=
leAccess.WRITE)) {
+            if (!parentDir.isWriteable()) {
                 logger.debug("Cannot create thumbnail, no write access");
                 return;
             }
-
+            parentDir.beginTransaction();
             DAVFileAccess source =3D getSource(parentDir, basename);
             if (source =3D=3D null || !source.isValid()) {
                 return;
@@ -717,7 +728,8 @@
             File f =3D File.createTempFile(basename, "."+ext, Ftemp);
 =

             imgpro.createThumb(source.downloadFile(), ext, f, size, fQual);
-            parentDir.uploadFile(thumbName, new FileInputStream(f),f.lengt=
h() , "image/pjpeg");
+            parentDir.uploadFile(thumbName, new FileInputStream(f),f.lengt=
h() , source.getContentType());
+            parentDir.commitTransaction();
             f.delete();
         } catch (IOException ioe) {
             logger.error("Error while creating new thumb", ioe);

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list