Changeset 696

Timestamp:

03/09/10 13:10:11 (6 months ago)

Author:

fabman

Message:

tkt #185 done
Refactoring of resource classes
KNOWN_ISSUES updated

Location:

trunk

Files:

• KNOWN_ISSUES (modified) (1 diff)
• src/com/calenco/resource/system/AbstractSystemResource.java (modified) (3 diffs)
• src/com/calenco/resource/system/AddOnResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/AdminPasswordResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/ControlResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/LanguagesResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/RepositoryResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/ToolchainResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/ToolchainsResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/UserResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/UserRightsResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/UsersResource.java (modified) (2 diffs)
• src/com/calenco/resource/system/WorkspaceResource.java (modified) (1 diff)
• src/com/calenco/resource/system/WorkspacesResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/AbstractContentResource.java (added)
• src/com/calenco/resource/workspace/AbstractWorkspaceResource.java (modified) (6 diffs)
• src/com/calenco/resource/workspace/AssociationResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/AssociationsResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/ClassificationResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/ClassificationsResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/ContentPropertiesResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/ContentResource.java (modified) (14 diffs)
• src/com/calenco/resource/workspace/ContentRevhistoryResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/ContentStylesheetsResource.java (modified) (3 diffs)
• src/com/calenco/resource/workspace/ContentToolchainsResource.java (modified) (3 diffs)
• src/com/calenco/resource/workspace/DepsTreeResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/LanguageResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/LanguagesResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/PublicationOutputResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/PublicationQueueResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/PublicationResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/PublicationsResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/ReleaseFileResource.java (modified) (2 diffs)
• src/com/calenco/resource/workspace/ReleaseResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/ReleasesResource.java (modified) (1 diff)
• src/com/calenco/resource/workspace/StylesheetsResource.java (modified) (2 diffs)

trunk/KNOWN_ISSUES

@@ -8 +8 @@
 - There's some problems with the UI on Internet Explorer 7/8, we're working hard
  to fix them all.
+
+- Dependencies are not tracked taking into account revisions. For example, I
+ upload file F with deps A and B; I then upload file F again, but this time
+ only with dep A: dep B is still recorded for file F and the deps tree view
+ still shows B as a dep of F, while it's not a dep anymore.

trunk/src/com/calenco/resource/system/AbstractSystemResource.java

@@ -26 +26 @@
 import com.calenco.repository.PooledRepoManager;
 import com.calenco.repository.dao.UserDAO;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import org.restlet.data.Form;
@@ -66 +65 @@
             init();
             setExisting(true);
-        } catch (RepositoryException re) {
-            String msg = String.format("Cannot initialize system resource %s: %s", getClass().getName(), re.getMessage());
-            throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg);
+        } catch (Exception e) {
+            if (e instanceof ResourceException) { // Rethrow
+                ResourceException re = (ResourceException) e;
+                throw re;
+            } else { // Other exception -> HTTP 500
+                String msg = String.format("Cannot initialize system resource %s: %s", getClass().getName(), e.getMessage());
+                throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg);
+            }
         } finally {
             repoMgr.releaseSessionRO(session);
@@ -97 +101 @@
     }
 
-    abstract void init() throws RepositoryException;
+    abstract void init() throws Exception;
 
     abstract boolean canRequest(Method method);

trunk/src/com/calenco/resource/system/AddOnResource.java

@@ -26 +26 @@
 import com.calenco.addon.AddOnsManager;
 import java.io.File;
-import javax.jcr.RepositoryException;
 import org.apache.commons.io.FilenameUtils;
 import org.restlet.data.MediaType;
@@ -53 +52 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         kind = Reference.decode((String) getRequest().getAttributes().get("kind")); // NOI18N
         addonName = Reference.decode((String) getRequest().getAttributes().get("addon")); // NOI18N

trunk/src/com/calenco/resource/system/AdminPasswordResource.java

@@ -23 +23 @@
 package com.calenco.resource.system;
 
-import com.calenco.CalencoV2;
 import com.calenco.security.SUSecurityManager;
-import javax.jcr.RepositoryException;
 import org.restlet.data.Form;
 import org.restlet.data.Method;
@@ -41 +39 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
     }
 

trunk/src/com/calenco/resource/system/ControlResource.java

@@ -24 +24 @@
 
 import com.calenco.CalencoV2App;
-import javax.jcr.RepositoryException;
 import org.restlet.data.Method;
 import org.restlet.data.Status;
@@ -41 +40 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         String host = getRequest().getClientInfo().getAddress();
         if (!(("127.0.0.1").equals(host) || ("0:0:0:0:0:0:0:1").equals(host))) { // NOI18N

trunk/src/com/calenco/resource/system/LanguagesResource.java

@@ -26 +26 @@
 import com.calenco.repository.dao.LanguageDAO;
 import java.util.Set;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -48 +47 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         LanguageDAO dao = new LanguageDAO(session);
         languages = dao.findAll();

trunk/src/com/calenco/resource/system/RepositoryResource.java

@@ -27 +27 @@
 import java.util.HashMap;
 import java.util.Map;
-import javax.jcr.RepositoryException;
 import org.restlet.data.CharacterSet;
 import org.restlet.data.MediaType;
@@ -49 +48 @@
 
     @Override
-    void init() throws RepositoryException {
-        /* Do nothing */
+    void init() throws Exception {
     }
 

trunk/src/com/calenco/resource/system/ToolchainResource.java

@@ -27 +27 @@
 import com.calenco.utils.XhtmlHelper;
 import java.io.IOException;
-import javax.jcr.RepositoryException;
 import org.restlet.data.MediaType;
 import org.restlet.data.Method;
@@ -49 +48 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         tcname = Reference.decode((String) getRequest().getAttributes().get("tchain")); // NOI18N
         tchain = AddOnsManager.getInstance().getToolchain(tcname);
         if (tchain == null) {
             String msg = String.format("Toolchain \"%s\" unknown", tcname);
-            throw new ResourceException(Status.CLIENT_ERROR_BAD_REQUEST, msg);
+            throw new ResourceException(Status.CLIENT_ERROR_NOT_FOUND, msg);
         }
     }

trunk/src/com/calenco/resource/system/ToolchainsResource.java

@@ -28 +28 @@
 import java.io.IOException;
 import java.util.List;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -54 +53 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         Form query = getRequest().getResourceRef().getQueryAsForm();
         cco_xmltype = query.getFirstValue("cco_xmltype"); // NOI18N

trunk/src/com/calenco/resource/system/UserResource.java

@@ -29 +29 @@
 import com.calenco.security.JcrVerifier;
 import com.calenco.utils.XhtmlHelper;
-import javax.jcr.RepositoryException;
 import org.restlet.data.Form;
 import org.restlet.data.MediaType;
@@ -53 +52 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         email = (String) getRequest().getAttributes().get("user"); // NOI18N
         String identifier = getRequest().getChallengeResponse().getIdentifier();

trunk/src/com/calenco/resource/system/UserRightsResource.java

@@ -32 +32 @@
 import java.util.List;
 import java.util.Set;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -60 +59 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         email = Reference.decode((String)getRequest().getAttributes().get("user")); // NOI18N
         if (email == null || "".equals(email)) {

trunk/src/com/calenco/resource/system/UsersResource.java

@@ -32 +32 @@
 import com.calenco.utils.XhtmlHelper;
 import java.util.Set;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -57 +56 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         users = new UserDAO(session).findAll();
     }

trunk/src/com/calenco/resource/system/WorkspaceResource.java

@@ -60 +60 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         wksp = Reference.decode((String)getRequest().getAttributes().get("wksp")); // NOI18N
         workspace = new WorkspaceDAO(session).findByName(wksp);

trunk/src/com/calenco/resource/system/WorkspacesResource.java

@@ -37 +37 @@
 import java.util.Set;
 import java.util.TreeSet;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -64 +63 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         WorkspaceDAO dao = new WorkspaceDAO(session);
         if (isSysAdmin) {

trunk/src/com/calenco/resource/workspace/AbstractWorkspaceResource.java

@@ -32 +32 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import org.restlet.Request;
@@ -93 +92 @@
                 throw new ResourceException(Status.CLIENT_ERROR_FORBIDDEN, msg);
             }
+            Method method = req.getMethod();
             if (!user.isSysAdmin) {
                 /* Check user can access (use) workspace */
@@ -101 +101 @@
                     throw new ResourceException(Status.CLIENT_ERROR_FORBIDDEN, msg);
                 }
-                Method method = req.getMethod();
                 if (user.isPubUser() && Method.GET.equals(method) && req.getResourceRef().getPath().indexOf("/content") != -1) {
                     String host = req.getClientInfo().getAddress();
@@ -122 +121 @@
                  * init()
                  */
-                if (!canRequest(req.getMethod())) {
+                if (!canRequest(method)) {
                     String msg = String.format("%s: User %s, identified by %s, cannot issue %s requests on workspace %s", getClass().getName(), user.getName(), identifier, req.getMethod(), wksp);
                     getLogger().warning(msg);
@@ -129 +128 @@
             }
             setExisting(true);
-        } catch (RepositoryException re) {
-            String msg = String.format("Cannot initialize resource for workspace %s: %s", wksp, re.getMessage());
-            throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg);
+        } catch (Exception e) {
+            if (e instanceof ResourceException) { // Rethrow
+                ResourceException re = (ResourceException) e;
+                throw re;
+            } else { // Other exception -> HTTP 500
+                String msg = String.format("Cannot initialize resource for workspace %s: %s", wksp, e.getMessage());
+                throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg);
+            }
         } finally {
             repoMgr.releaseSessionRO(session);
@@ -202 +206 @@
      * Concrete resource classes extending this one must implement this method
      * to perform resource-specific initialization. If there's a problem
-     * initializing the resource the implementation must call setStatus() with
-     * the proper HTTP status code, and throw an Exception with a human-readable
+     * initializing the resource the implementation must throw a
+     * ResourceException with proper HTTP status code and a human-readable
      * error message.
      *
-     * @throws Exception if there are problems initializing the resource
-     */
-    abstract void init() throws RepositoryException;
+     * @throws Exception a catch-all for possible exceptions (XML, repository,
+     * etc.) thrown by init() implementations
+     */
+    abstract void init() throws Exception;
 
     /**

trunk/src/com/calenco/resource/workspace/AssociationResource.java

@@ -26 +26 @@
 import com.calenco.repository.dao.AssociationDAO;
 import java.io.IOException;
-import javax.jcr.RepositoryException;
 import org.restlet.data.MediaType;
 import org.restlet.data.Method;
@@ -46 +45 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         AssociationDAO adao = new AssociationDAO(session, workspace);
         aname = Reference.decode((String)getRequest().getAttributes().get("assoc")); // NOI18N

trunk/src/com/calenco/resource/workspace/AssociationsResource.java

@@ -69 +69 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         /* Get Query Params */
         Form query = getRequest().getResourceRef().getQueryAsForm();

trunk/src/com/calenco/resource/workspace/ClassificationResource.java

@@ -37 +37 @@
 import java.util.Set;
 import java.util.TreeSet;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -70 +69 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         /* Get format parameter from the request */
         Form query = getRequest().getResourceRef().getQueryAsForm();

trunk/src/com/calenco/resource/workspace/ClassificationsResource.java

@@ -60 +60 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         ClassificationDAO dao = new ClassificationDAO(session, workspace);
         classifications = dao.findAll();

trunk/src/com/calenco/resource/workspace/ContentPropertiesResource.java

@@ -59 +59 @@
  * @author fabman
  */
-public class ContentPropertiesResource extends AbstractWorkspaceResource {
-    String langOrFile = null;
-    String lang = null;
-    String file = null;
+public class ContentPropertiesResource extends AbstractContentResource {
     String pname = null;
     String pattern = null;
 
     @Override
-    void init() throws RepositoryException {
+    void initResource() throws Exception {
         /* Get request params */
         Map<String, Object> requestParams = getRequest().getAttributes();
-        langOrFile = Reference.decode((String)requestParams.get("langOrFile")); // NOI18N
-        lang = Reference.decode((String)requestParams.get("lang")); // NOI18N
-        file = Reference.decode((String)requestParams.get("file")); // NOI18N
         pname = Reference.decode((String)requestParams.get("pname")); // NOI18N
         Form query = getRequest().getResourceRef().getQueryAsForm();
@@ -82 +76 @@
 
     @Override
-    boolean canRequest(Method method) {
+    boolean canPerformRequest(Method method) {
         if (pname == null || "".equals(pname)) {
             return Method.GET.equals(method);

trunk/src/com/calenco/resource/workspace/ContentResource.java

@@ -112 +112 @@
  * @author fabman
  */
-public class ContentResource extends AbstractWorkspaceResource {
+public class ContentResource extends AbstractContentResource {
     final static String DAVNS = Constants.DAVNS;
-    String langOrFile = null;
-    String lang = null;
-    String file = null;
     String rev = null; // Means get the HEAD revision (JCR baseVersion)
     // If true, try to provide the means to get a savedlg file (different content disposition, should pop up "Save as" browser dialog)
@@ -122 +119 @@
     MetadataService mds = null;
     int contentPathIndex = -1;
-    String path = null;
-    String fileName = null;
     File tempFile = null;
 
     @Override
-    void init() throws RepositoryException {
+    void initResource() throws Exception {
         contentPathIndex = ContentDAO.getContentPath(workspace).length() + 1;
         /* Get request params */
-        langOrFile = Reference.decode((String)getRequest().getAttributes().get("langOrFile")); // NOI18N
-        lang = Reference.decode((String)getRequest().getAttributes().get("lang")); // NOI18N
-        file = Reference.decode((String)getRequest().getAttributes().get("file")); // NOI18N
         Form query = getRequest().getResourceRef().getQueryAsForm();
         rev = query.getFirstValue("rev"); // NOI18N
@@ -165 +157 @@
         getAllowedMethods().add(Method.DELETE);
         getAllowedMethods().add(Method.HEAD);
-        if (langOrFile == null && lang == null && file == null) { // Intl folder
-            fileName = "";
-        } else if (langOrFile != null && lang == null && file == null) { // Folder or file of intl folder
-            fileName = langOrFile;
-        } else if (langOrFile == null && lang != null && file != null) { // File in given lang
-            fileName = String.format("%s/%s", lang, file);
-        }
-        path = String.format("%s/content%s", workspace.href, "".equals(fileName) ? fileName : "/" + fileName);
+        getAllowedMethods().add(Method.LOCK);
+        getAllowedMethods().add(Method.UNLOCK);
         setOnSent(new CleanupTempFile());
     }
 
     @Override
-    boolean canRequest(Method method) {
+    boolean canPerformRequest(Method method) {
         return
                 Method.OPTIONS.equals(method) ||
@@ -187 +173 @@
                 Method.POST.equals(method) ||
                 Method.PUT.equals(method) ||
-                Method.DELETE.equals(method) && ((langOrFile == null && lang != null && file != null) || (langOrFile != null && lang == null && file == null));
+                (Method.DELETE.equals(method) && isFile);
     }
 
@@ -193 +179 @@
     @Override
     public Representation delete() throws ResourceException {
+        session = null;
+        try {
+            session = repoMgr.getSessionRW();
+            ContentDAO cdao = new ContentDAO(session, workspace);
+            String fpath = null;
+            if (isIntlFileOrLangFolder) {
+                fpath = cdao.delete(Language.INTL, langOrFile);
+            } else {
+                Language l = new LanguageDAO(session, workspace).findByCode(lang);
+                if (!l.isActive) {
+                    String msg = String.format("Ignoring DELETE request for file \"%s\" of inactive language \"%s\" for workspace %s", file, lang, wksp);
+                    getLogger().warning(msg);
+                    setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
+                    return new StringRepresentation(msg);
+                }
+                fpath = cdao.delete(lang, file);
+            }
+            if (fpath != null) {
+                // Wipe all associations having this file as a source/target
+                AssociationDAO adao = new AssociationDAO(session, workspace);
+                Properties props = new Properties();
+                if (isIntlFileOrLangFolder) {
+                    fpath += "*"; // TODO: Why is this only needed for intl files?
+                }
+                props.put("from", fpath);
+                adao.removeAll(adao.findByProperties(props));
+                props.clear();
+                props.put("to", fpath);
+                adao.removeAll(adao.findByProperties(props));
+            } else {
+                getLogger().warning(String.format("Associations (dependencies) cannot be deleted for file %s. This may lead to problems with resources referencing this file!", path));
+            }
+            setStatus(Status.SUCCESS_NO_CONTENT);
+            return new EmptyRepresentation();
+        } catch (Exception e) {
+            String msg = String.format("Cannot delete %s from workspace %s", path, wksp);
+            throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg, e);
+        } finally {
+            repoMgr.releaseSessionRW(session);
+            long lstop = System.currentTimeMillis();
+            getLogger().info(String.format("DELETE request processed in %2.3f sec.", (lstop - rstart) / 1000.0));
+        }
+    }
+
+    @Deprecated
+    public Representation deleteOLD() throws ResourceException {
         session = null;
         try {
@@ -281 +313 @@
             return new StringRepresentation(msg);
         }
-        String lcode = (langOrFile == null ? lang : Language.INTL);
-        String fname = (langOrFile == null ? file : langOrFile);
         session = null;
         try {
@@ -297 +327 @@
             File f = new File(Constants.IO_TMPDIR, fname);
             IOUtils.copy(new AutoCloseInputStream((entity.getStream())), FileUtils.openOutputStream(f));
-            ContentDAO dao = new ContentDAO(session, workspace);
-            String href = dao.store(f, lcode);
+            ContentDAO cdao = new ContentDAO(session, workspace);
+            String href = cdao.store(f, lcode);
             /*
              * From now on, code is very similar to that in the POST handler,
              * make sure you synchronize both as needed!
              */
-            setAuthor(href, getRequest().getChallengeResponse().getIdentifier(), dao);
+            setAuthor(href, getRequest().getChallengeResponse().getIdentifier(), cdao);
             updateHeadRelease(); // TODO: Do we REALLY need this now? Deprecate?
-            addOnProcessing(lcode, f, href, dao);
+            addOnProcessing(lcode, f, href, cdao);
             FileUtils.deleteQuietly(f);
             // Fire r2d2 to update publications depending on the uploaded file
@@ -326 +356 @@
     @Override
     public Representation post(Representation entity) throws ResourceException {
+        session = null;
+        try {
+            session = repoMgr.getSessionRW();
+            if (!Language.INTL.equals(lcode)) {
+                // Bark if requested workspace lang is not active
+                Language l = new LanguageDAO(session, workspace).findByCode(lcode);
+                if (l == null || !l.isActive) {
+                    String msg = String.format("Cannot store file into inactive or non-existing language \"%s\" for workspace \"%s\"", lcode, wksp);
+                    getLogger().warning(msg);
+                    setStatus(Status.CLIENT_ERROR_FORBIDDEN);
+                    return new StringRepresentation(msg);
+                }
+            }
+            List<FileItem> fitems = new RestletFileUpload(new DiskFileItemFactory()).parseRepresentation(entity);
+            JSONObject details = new JSONObject();
+            Map<String, String> fields = new HashMap<String, String>();
+            for (FileItem fitem: fitems) {
+                if (fitem.isFormField()) {
+                    fields.put(fitem.getFieldName(), fitem.getString());
+                }
+            }
+            for (FileItem fitem: fitems) {
+                if (!fitem.isFormField()) { // It's an uploaded FILE, as opposed to a form field that may have come along with the uploaded files
+                    long fsize = fitem.getSize();
+                    if (Constants.MAX_ALLOWED_FSIZE < fsize) {
+                        String msg = String.format("Cannot store %d bytes, maximum upload size is %d bytes", fsize, Constants.MAX_ALLOWED_FSIZE);
+                        getLogger().warning(msg);
+                        setStatus(Status.CLIENT_ERROR_REQUEST_ENTITY_TOO_LARGE); // HTTP 413
+                        return new StringRepresentation(msg);
+                    }
+                    File f = new File(Constants.IO_TMPDIR, fitem.getName()); // NOI18N
+                    IOUtils.copy(new AutoCloseInputStream(fitem.getInputStream()), FileUtils.openOutputStream(f));
+                    ContentDAO cdao = new ContentDAO(session, workspace);
+                    String href = cdao.store(f, lcode);
+                    JSONObject uploadDetails = new JSONObject();
+                    uploadDetails.put("file", href);
+                    uploadDetails.put("name", fitem.getName());
+                    uploadDetails.put("size", fsize);
+                    uploadDetails.put("type", fitem.getContentType());
+                    details.put("status", "success");
+                    details.put("details", uploadDetails);
+                    /*
+                     * For now, the "upload script" (http://trac.calenco.com/ticket/93)
+                     * will be implemented here, if we find the need for
+                     * more operations at upload time, we can think on
+                     * complicating the implementation
+                     */
+                    // Store classif, if any
+                    String cname = fields.get("cname");
+                    Classification classif = new ClassificationDAO(session, workspace).findByName(cname);
+                    if (classif != null && !"Attic".equals(cname)) {
+                        Association isClassifiedOnto = new Association(Association.IS_CLASSIFIED_ONTO);
+                        isClassifiedOnto.setFrom(href);
+                        isClassifiedOnto.setTo(classif.href);
+                        new AssociationDAO(session, workspace).add(isClassifiedOnto);//adao.add(isClassifiedOnto);
+                    } // else ALL_FILES or non-existant classification name, ends up in ALL_FILES
+                    /*
+                     * From now on, code is very similar to that in the PUT
+                     * handler, make sure you synchronize both as needed!
+                     */
+                    setAuthor(href, getRequest().getChallengeResponse().getIdentifier(), cdao);
+                    updateHeadRelease(); // TODO: Do we REALLY need this now? Deprecate?
+                    addOnProcessing(lcode, f, href, cdao);
+                    FileUtils.deleteQuietly(f);
+                    // Fire r2d2 to update publications depending on the uploaded file
+                    new R2D2(workspace, href).start();
+                }
+            }
+            StringRepresentation rep = new StringRepresentation(String.format("<html><body><textarea>%s</textarea></body></html>", details.toString()), MediaType.TEXT_HTML);
+            rep.setIdentifier(String.format("%s%s", getRequest().getResourceRef().getIdentifier(), Language.INTL.equals(lcode) ? fname : lcode + "/" + fname));
+            return rep;
+        } catch (Exception e) {
+            String msg = String.format("Cannot upload file: %s", e);
+            throw new ResourceException(Status.SERVER_ERROR_INTERNAL, msg, e);
+        } finally {
+            repoMgr.releaseSessionRW(session);
+            long lstop = System.currentTimeMillis();
+            getLogger().info(String.format("POST request processed in %2.3f sec.", (lstop - rstart) / 1000.0));
+        }
+    }
+
+    @Deprecated
+    public Representation postOLD(Representation entity) throws ResourceException {
         String lcode = null;
         if (langOrFile != null) {
@@ -351 +464 @@
                 for (FileItem fitem: fitems) {
                     if (fitem.isFormField()) {
-                        String fieldName = fitem.getFieldName();
-                        String fieldValue = fitem.getString();
-                        fields.put(fieldName, fieldValue);
+                        fields.put(fitem.getFieldName(), fitem.getString());
                     }
                 }
@@ -406 +517 @@
                 }
                 StringRepresentation rep = new StringRepresentation(String.format("<html><body><textarea>%s</textarea></body></html>", details.toString()), MediaType.TEXT_HTML);
-                rep.setIdentifier(String.format("%s%s", getRequest().getResourceRef().getIdentifier(), "".equals(fileName) ? fileName : "/" + fileName));
+                rep.setIdentifier(String.format("%s%s", getRequest().getResourceRef().getIdentifier(), Language.INTL.equals(lcode) ? fname : lcode + "/" + fname));
                 return rep;
             } catch (Exception e) {
@@ -825 +936 @@
     @Propfind
     public Representation propfind() throws ResourceException {
-        String depth = getHttpHeader("Depth"); // NOI18N
-        List<DavProperty> requestedProperties = new ArrayList<DavProperty>();
-        try {
-            final DomRepresentation reqXML = new DomRepresentation(getRequestEntity());
-            getLogger().fine("XML Request Document: " + XMLTools.toXMLString(reqXML.getDocument()));
-            Node propNode = reqXML.getNode("/propfind/prop"); // NOI18N
-            if (propNode.getNodeType() == Node.ELEMENT_NODE) {
-                NodeList props = propNode.getChildNodes();
-                for (int i = 0; i < props.getLength(); i++) {
-                    Node n = props.item(i);
-                    if (n.getNodeType() == Node.ELEMENT_NODE) {
-                        Element e = (Element) n;
-                        DavProperty dp = new DavProperty(e.getTagName());
-                        requestedProperties.add(dp);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            if (getLogger().getLevel() == Level.FINE) {
-                e.printStackTrace();
-            }
-            getLogger().severe("Bad or no XML in the request body");
-        }
-        /*
-         * The depth handling deviates from RFC4918 (WebDAV standard spec) on
-         * purpose. The spec basically states that when clients are lazy enough
-         * and don't spec a depth (minimum effort), the server must treat that
-         * as if Infinity was specified (maximum effort). This is far from
-         * optimum and puts an unneeded load burden on the server. Also,
-         * Infinity is 'cut' at a certain reasonable depth level, for the same
-         * reason.
-         */
-        int idepth = 1;
-        if ("0".equals(depth)) { // NOI18N
-            idepth = 0;
-        }
-        if ("1".equals(depth)) { // NOI18N
-            idepth = 1;
-        }
-        if ("Infinity".equals(depth)) { // NOI18N
-            idepth = 32;
-        }
         session = null;
         try {
-            DomRepresentation rep = new DomRepresentation(MediaType.APPLICATION_XML); // text/xml is deprecated in RFC 4918
+            session = repoMgr.getSessionRO();
+            ContentDAO cdao = new ContentDAO(session, workspace);
+            String depth = getHttpHeader("Depth"); // NOI18N
+            List<DavProperty> requestedProperties = new ArrayList<DavProperty>();
+            try {
+                final DomRepresentation reqXML = new DomRepresentation(getRequestEntity());
+                getLogger().fine("XML Request Document: " + XMLTools.toXMLString(reqXML.getDocument()));
+                Node propNode = reqXML.getNode("/propfind/prop"); // NOI18N
+                if (propNode.getNodeType() == Node.ELEMENT_NODE) {
+                    NodeList props = propNode.getChildNodes();
+                    for (int i = 0; i < props.getLength(); i++) {
+                        Node n = props.item(i);
+                        if (n.getNodeType() == Node.ELEMENT_NODE) {
+                            Element e = (Element) n;
+                            DavProperty dp = new DavProperty(e.getTagName());
+                            requestedProperties.add(dp);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                if (getLogger().getLevel() == Level.FINE) {
+                    e.printStackTrace();
+                }
+                getLogger().severe("Bad or no XML in the request body");
+            }
+            /*
+             * Depth handling deviates from RFC4918 (WebDAV spec) on purpose.
+             * The spec basically states that when clients are lazy enough
+             * and don't spec a depth (minimum effort), the server must treat
+             * that as if Infinity was specified (maximum effort). This is far
+             * from optimum and puts an unneded burden on the server. Also,
+             * Infinity is 'cut' at a certain reasonable depth level, for the
+             * same reason.
+             */
+            int idepth = 1;
+            if ("0".equals(depth)) {
+                idepth = 0;
+            }
+            if ("1".equals(depth)) {
+                idepth = 1;
+            }
+            if ("Infinity".equals(depth)) {
+                idepth = 32;
+            }
+            DomRepresentation rep = new DomRepresentation(MediaType.APPLICATION_XML); // text/xml is deprecated in RFC4918
             Document doc = rep.getDocument();
             Element multiStatus = doc.createElementNS(DAVNS, "multistatus"); // NOI18N
             doc.appendChild(multiStatus);
-            session = repoMgr.getSessionRO();
-            ContentDAO dao = new ContentDAO(session, workspace);
-            insertPropfindResponse(path, idepth, requestedProperties, doc, multiStatus, dao);
+            insertPropfindResponse(path, idepth, requestedProperties, doc, multiStatus, cdao);
             doc.normalizeDocument();
             setStatus(Status.SUCCESS_MULTI_STATUS); // HTTP 207
@@ -939 +1050 @@
                 properties.put("resourcetype", resourceType); // NOI18N
 
-                String fname = content.getFname();
+                String cfname = content.getFname();
                 Element name = doc.createElementNS(DAVNS, "name"); // NOI18N
-                name.appendChild(doc.createTextNode(fname.startsWith("/") ? fname.substring(1) : fname));
+                name.appendChild(doc.createTextNode(cfname.startsWith("/") ? cfname.substring(1) : cfname));
                 properties.put("name", name); // NOI18N
 
@@ -952 +1063 @@
 
                 Element displayName = doc.createElementNS(DAVNS, "displayname"); // NOI18N
-                displayName.appendChild(doc.createTextNode(fname.startsWith("/") ? fname.substring(1) : fname));
+                displayName.appendChild(doc.createTextNode(cfname.startsWith("/") ? cfname.substring(1) : cfname));
                 properties.put("displayname", displayName); // NOI18N
 
@@ -1150 +1261 @@
     private void addOnProcessing(String lcode, File f, String href, ContentDAO dao) throws Exception {
         AddOnsManager aom = AddOnsManager.getInstance();
-        String fname = f.getName();
+        //String fname = f.getName();
         try {
             AddOn addOn = aom.getAddOn(f);

trunk/src/com/calenco/resource/workspace/ContentRevhistoryResource.java

@@ -33 +33 @@
 import java.util.List;
 import java.util.Properties;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.restlet.data.Method;
-import org.restlet.data.Reference;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
@@ -49 +47 @@
  * @author fabman
  */
-public class ContentRevhistoryResource extends AbstractWorkspaceResource {
-    String langOrFile = null;
-    String lang = null;
-    String file = null;
+public class ContentRevhistoryResource extends AbstractContentResource {
 
     @Override
-    void init() throws RepositoryException {
-        /* Get request params */
-        langOrFile = Reference.decode((String)getRequest().getAttributes().get("langOrFile")); // NOI18N
-        lang = Reference.decode((String)getRequest().getAttributes().get("lang")); // NOI18N
-        file = Reference.decode((String)getRequest().getAttributes().get("file")); // NOI18N
+    void initResource() throws Exception {
     }
 
     @Override
-    boolean canRequest(Method method) {
+    boolean canPerformRequest(Method method) {
         return Method.GET.equals(method);
     }

trunk/src/com/calenco/resource/workspace/ContentStylesheetsResource.java

@@ -25 +25 @@
 import com.calenco.Association;
 import com.calenco.Content;
-import com.calenco.Language;
 import com.calenco.addon.AddOnsManager;
-import com.calenco.addon.Toolchain;
 import com.calenco.repository.ContentDAO;
 import com.calenco.repository.dao.AssociationDAO;
@@ -33 +31 @@
 import java.util.List;
 import java.util.Set;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -50 +47 @@
  * @author fabman
  */
-public class ContentStylesheetsResource extends AbstractWorkspaceResource {
-    String langOrFile = null;
-    String lang = null;
-    String file = null;
-    String fileName = null;
-    String path = null;
+public class ContentStylesheetsResource extends AbstractContentResource {
     String tchain = null;
 
     @Override
-    void init() throws RepositoryException {
-        langOrFile = Reference.decode((String)getRequestAttributes().get("langOrFile")); // NOI18N
-        lang = Reference.decode((String)getRequestAttributes().get("lang")); // NOI18N
-        file = Reference.decode((String)getRequestAttributes().get("file")); // NOI18N
+    void initResource() throws Exception {
         tchain = Reference.decode((String)getRequestAttributes().get("tchain")); // NOI18N
-        if (langOrFile == null && lang == null && file == null) { // Intl folder
-            fileName = Language.INTL;
-        } else if (langOrFile != null && lang == null && file == null) { // Folder or file of intl folder
-            fileName = langOrFile;
-        } else if (langOrFile == null && lang != null && file != null) { // File in given lang
-            fileName = String.format("%s/%s", lang, file); // NOI18N
-        }
-        path = String.format("%s/content%s", workspace.href, Language.INTL.equals(fileName) ? fileName : "/" + fileName); // NOI18N
     }
 
     @Override
-    boolean canRequest(Method method) {
+    boolean canPerformRequest(Method method) {
         return Method.GET.equals(method);
     }

trunk/src/com/calenco/resource/workspace/ContentToolchainsResource.java

@@ -23 +23 @@
 package com.calenco.resource.workspace;
 
-import com.calenco.Language;
 import com.calenco.addon.AddOnsManager;
 import com.calenco.addon.Toolchain;
 import com.calenco.repository.ContentDAO;
 import java.util.List;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.restlet.data.Method;
-import org.restlet.data.Reference;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
@@ -45 +42 @@
  * @author fabman
  */
-public class ContentToolchainsResource extends AbstractWorkspaceResource {
-    String langOrFile = null;
-    String lang = null;
-    String file = null;
-    String fileName = null;
-    String path = null;
+public class ContentToolchainsResource extends AbstractContentResource {
 
     @Override
-    void init() throws RepositoryException {
-        langOrFile = Reference.decode((String)getRequestAttributes().get("langOrFile")); // NOI18N
-        lang = Reference.decode((String)getRequestAttributes().get("lang")); // NOI18N
-        file = Reference.decode((String)getRequestAttributes().get("file")); // NOI18N
-        if (langOrFile == null && lang == null && file == null) { // Intl folder
-            fileName = Language.INTL;
-        } else if (langOrFile != null && lang == null && file == null) { // Folder or file of intl folder
-            fileName = langOrFile;
-        } else if (langOrFile == null && lang != null && file != null) { // File in given lang
-            fileName = String.format("%s/%s", lang, file); // NOI18N
-        }
-        path = String.format("%s/content%s", workspace.href, Language.INTL.equals(fileName) ? fileName : "/" + fileName); // NOI18N
+    void initResource() throws Exception {
     }
 
     @Override
-    boolean canRequest(Method method) {
+    boolean canPerformRequest(Method method) {
         return Method.GET.equals(method);
     }
@@ -120 +101 @@
         }
     }
+
 }

trunk/src/com/calenco/resource/workspace/DepsTreeResource.java

@@ -56 +56 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         /* Get request params */
         Form query = getRequest().getResourceRef().getQueryAsForm();

trunk/src/com/calenco/resource/workspace/LanguageResource.java

@@ -44 +44 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         lang = (String)getRequest().getAttributes().get("lang"); // NOI18N
         LanguageDAO dao = new LanguageDAO(session, workspace);

trunk/src/com/calenco/resource/workspace/LanguagesResource.java

@@ -53 +53 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         LanguageDAO dao = new LanguageDAO(session, workspace);
         languages = dao.findAll();

trunk/src/com/calenco/resource/workspace/PublicationOutputResource.java

@@ -55 +55 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         oname = Reference.decode((String) getRequest().getAttributes().get("out")); // NOI18N
     }

trunk/src/com/calenco/resource/workspace/PublicationQueueResource.java

@@ -27 +27 @@
 import com.calenco.transform.PublicationManager;
 import java.util.Collection;
-import javax.jcr.RepositoryException;
 import org.restlet.data.Form;
 import org.restlet.data.Method;
@@ -51 +50 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         pubs = new PublicationDAO(session, workspace).findAll();
     }

trunk/src/com/calenco/resource/workspace/PublicationResource.java

@@ -59 +59 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         pname = Reference.decode((String) getRequest().getAttributes().get("pub")); // NOI18N
         pub = new PublicationDAO(session, workspace).findByName(pname);

trunk/src/com/calenco/resource/workspace/PublicationsResource.java

@@ -39 +39 @@
 import java.util.Set;
 import javax.jcr.PropertyIterator;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -71 +70 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         Form query = getRequest().getResourceRef().getQueryAsForm();
         forFile = query.getFirstValue("file"); // NOI18N

trunk/src/com/calenco/resource/workspace/ReleaseFileResource.java

@@ -30 +30 @@
 import java.io.FileOutputStream;
 import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -56 +55 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         rname = Reference.decode((String)getRequest().getAttributes().get("rel")); // NOI18N
         release = new ReleaseDAO(session, workspace).findByName(rname);

trunk/src/com/calenco/resource/workspace/ReleaseResource.java

@@ -42 +42 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         rname = (String) getRequest().getAttributes().get("rel"); // NOI18N
         release = new ReleaseDAO(session, workspace).findByName(rname);

trunk/src/com/calenco/resource/workspace/ReleasesResource.java

@@ -49 +49 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         releases = new ReleaseDAO(session, workspace).findAll();
     }

trunk/src/com/calenco/resource/workspace/StylesheetsResource.java

@@ -26 +26 @@
 import com.calenco.repository.ContentDAO;
 import java.util.List;
-import javax.jcr.RepositoryException;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -45 +44 @@
 
     @Override
-    void init() throws RepositoryException {
+    void init() throws Exception {
         stylesheets = new ContentDAO(session, workspace).findByType(MediaType.APPLICATION_W3C_XSLT.toString());
     }