Changeset 694

Timestamp:

03/05/10 21:56:13 (6 months ago)

Author:

fabman

Message:

tkts #166, #172, #173 done
cleanups and fixes here and there

Location:

trunk/src/com/calenco

Files:

• CalencoV2App.java (modified) (4 diffs)
• addon/db5/DocBook5AddOnBase.java (modified) (3 diffs)
• resource/system/LanguagesResource.java (modified) (3 diffs)
• resource/system/ToolchainsResource.java (modified) (1 diff)
• resource/workspace/ClassificationsResource.java (modified) (1 diff)
• resource/workspace/ContentStylesheetsResource.java (modified) (4 diffs)
• resource/workspace/ContentToolchainsResource.java (added)
• resource/workspace/PublicationsResource.java (modified) (3 diffs)
• staticres/workspace-html.ftl (modified) (5 diffs)
• staticres/workspaces-html.ftl (modified) (1 diff)

trunk/src/com/calenco/CalencoV2App.java

@@ -45 +45 @@
 import com.calenco.resource.workspace.ContentRevhistoryResource;
 import com.calenco.resource.workspace.ContentStylesheetsResource;
+import com.calenco.resource.workspace.ContentToolchainsResource;
 import com.calenco.resource.workspace.DepsTreeResource;
 import com.calenco.resource.workspace.LanguageResource;
@@ -126 +127 @@
         wrouter.attach("/{wksp}/content/{langOrFile}/revhistory", ContentRevhistoryResource.class);
         wrouter.attach("/{wksp}/content/{lang}/{file}/revhistory", ContentRevhistoryResource.class);
-        wrouter.attach("/{wksp}/content/{langOrFile}/stylesheets", ContentStylesheetsResource.class);
-        wrouter.attach("/{wksp}/content/{lang}/{file}/stylesheets", ContentStylesheetsResource.class);
+        wrouter.attach("/{wksp}/content/{langOrFile}/stylesheets/{tchain}", ContentStylesheetsResource.class);
+        wrouter.attach("/{wksp}/content/{lang}/{file}/stylesheets/{tchain}", ContentStylesheetsResource.class);
+        wrouter.attach("/{wksp}/content/{langOrFile}/toolchains", ContentToolchainsResource.class);
+        wrouter.attach("/{wksp}/content/{lang}/{file}/toolchains", ContentToolchainsResource.class);
         wrouter.attach("/{wksp}/content", ContentResource.class);
         wrouter.attach("/{wksp}/content/{langOrFile}", ContentResource.class);
@@ -134 +137 @@
         wrouter.attach("/{wksp}/languages/{lang}", LanguageResource.class);
         wrouter.attach("/{wksp}/publications", PublicationsResource.class);
-        wrouter.attach("/{wksp}/publications{.fmt}", PublicationsResource.class);
         wrouter.attach("/{wksp}/publications/{pub}", PublicationResource.class);
         wrouter.attach("/{wksp}/pubsqueue", PublicationQueueResource.class);
@@ -158 +160 @@
         srouter.setRoutingMode(Router.MODE_BEST_MATCH);
         srouter.attach("/toolchains", ToolchainsResource.class);
-        srouter.attach("/toolchains{.fmt}", ToolchainsResource.class);
         srouter.attach("/toolchains/{tchain}", ToolchainResource.class);
         srouter.attach("/addons/{addon}/{kind}", AddOnResource.class);
         srouter.attach("/languages", com.calenco.resource.system.LanguagesResource.class);
-        srouter.attach("/languages{.fmt}", com.calenco.resource.system.LanguagesResource.class);
         srouter.attach("/users", UsersResource.class);
         srouter.attach("/users/{user}", UserResource.class);

trunk/src/com/calenco/addon/db5/DocBook5AddOnBase.java

@@ -86 +86 @@
 
     public DocBook5AddOnBase() throws XMLProcessingException {
-        canDiff = deltaXMLComparatorPresent();
         try {
             //the toolchains
@@ -95 +94 @@
             toolchains.put(XHTMLSingleToolchain.NAME, new XHTMLSingleToolchain());
             toolchains.put(XHTMLChunkToolchain.NAME, new XHTMLChunkToolchain());
-            toolchains.put(CHMToolchain.NAME, new CHMToolchain());
-            if (canDiff) {
+            try {
+                Class.forName("com.calenco.nonfree.db5.DeltaXMLComparator");
                 toolchains.put(DiffToolchain.NAME, new DiffToolchain());
+            } catch (ClassNotFoundException cannotDiff) {
             }
 
@@ -199 +199 @@
     }
 
-    public boolean deltaXMLComparatorPresent() {
-        try {
-            Class.forName("com.calenco.nonfree.db5.DeltaXMLComparator");
-        } catch (ClassNotFoundException ex) {
-            return false;
-        }
-        return true;
-    }
-
 }

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

@@ -35 +35 @@
 import org.restlet.ext.xml.DomRepresentation;
 import org.restlet.representation.Representation;
-import org.restlet.representation.Variant;
 import org.restlet.resource.Get;
 import org.restlet.resource.ResourceException;
@@ -59 +58 @@
     }
 
-    @Get
-    @Override
-    /**
-     * GET handler with custom content negotiation logic:
-     * <ul>
-     *   <li>if no {.fmt} and no Accept header present, return the preferred
-     *   (working fine on IE) representation</li>
-     *   <li>if Accept header present, return that representation if
-     *   available, the preferred one otherwise</li>
-     *   <li>if {.fmt} is present, return the corresponding representation
-     *   if available, the preferred one otherwise</li>
-     *   <li>if both Accept and {.fmt} are present, {.fmt} (more specific) has
-     *   preference
-     * </ul>
-     *
-     */
-    public Representation get(Variant variant) throws ResourceException {
-        String format = (String) getRequestAttributes().get(".fmt");
-        if (format == null) {
-            String accept = getHttpHeader("Accept");
-            MediaType mt = variant.getMediaType();
-            if (accept != null) {
-                mt = new MediaType(accept);
-            }
-            if (MediaType.APPLICATION_XML.equals(mt) || MediaType.TEXT_XML.equals(mt)) {
-                format = ".xml";
-            }
-        }
-        if (".xml".equals(format)) {
-            return toXML();
-        } else {
-            return toJSON(); // Preferred representation
-        }
-    }
-
-    Representation toJSON() throws ResourceException {
+    @Get("json")
+    public Representation toJSON() throws ResourceException {
         try {
             JSONObject syslangsj = new JSONObject();
@@ -118 +83 @@
     }
 
-    Representation toXML() throws ResourceException {
+    @Get("xml")
+    public Representation toXML() throws ResourceException {
         try {
             DomRepresentation rep = new DomRepresentation(MediaType.TEXT_XML);

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

@@ -83 +83 @@
             MediaType mt = variant.getMediaType();
             if (accept != null) {
-                mt = new MediaType(accept);
+                try {
+                    mt = new MediaType(accept);
+                } catch (Exception ignored) {
+                }
             }
             if (MediaType.TEXT_HTML.equals(mt) || MediaType.APPLICATION_XHTML.equals(mt)) {
                 fmt = ".html"; // NOI18N
-            } else if (MediaType.APPLICATION_JSON.equals(mt)) {
-                fmt = ".json"; // NOI18N
+            } else if (MediaType.TEXT_XML.equals(mt) || MediaType.APPLICATION_XML.equals(mt)) {
+                fmt = ".xml"; // NOI18N
             }
         }
-        if (".json".equals(fmt)) { // NOI18N
-            return toJSON();
+        if (".xml".equals(fmt)) { // NOI18N
+            return toXML();
         } else if (".html".equals(fmt)) { // NOI18N
             return toXHTML();
         } else {
-            return toXML(); // Preferred representation
+            return toJSON(); // Preferred representation
         }
     }

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

@@ -139 +139 @@
             MediaType mt = variant.getMediaType();
             if (accept != null) {
-                mt = new MediaType(accept);
+                try {
+                    mt = new MediaType(accept);
+                } catch (Exception ignored) {
+                }
             }
             if (MediaType.TEXT_HTML.equals(mt) || MediaType.APPLICATION_XHTML.equals(mt)) {
                 fmt = ".html"; // NOI18N
-            } else if (MediaType.APPLICATION_JSON.equals(mt)) {
-                fmt = ".json"; // NOI18N
-            }
-        }
-        if (".json".equals(fmt)) { // NOI18N
-            return toJSON();
+            } else if (MediaType.TEXT_XML.equals(mt) || MediaType.APPLICATION_XML.equals(mt)) {
+                fmt = ".xml"; // NOI18N
+            }
+        }
+        if (".xml".equals(fmt)) { // NOI18N
+            return toXML();
         } else if (".html".equals(fmt)) { // NOI18N
             return toXHTML();
         } else {
-            return toXML(); // Preferred representation
+            return toJSON(); // Preferred representation
         }
     }

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

@@ -56 +56 @@
     String fileName = null;
     String path = null;
+    String tchain = null;
 
     @Override
     void init() throws RepositoryException {
-        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
+        langOrFile = Reference.decode((String)getRequestAttributes().get("langOrFile")); // NOI18N
+        lang = Reference.decode((String)getRequestAttributes().get("lang")); // NOI18N
+        file = Reference.decode((String)getRequestAttributes().get("file")); // NOI18N
+        tchain = Reference.decode((String)getRequestAttributes().get("tchain")); // NOI18N
         if (langOrFile == null && lang == null && file == null) { // Intl folder
             fileName = Language.INTL;
@@ -89 +91 @@
                 AssociationDAO adao = new AssociationDAO(session, workspace);
                 String cco_xmlType = null;
-                List<Toolchain> toolchains = null;
                 try {
                     cco_xmlType = dao.getProperty(path, "cco_xmltype").getString(); // NOI18N
@@ -96 +97 @@
                 if (cco_xmlType != null) {
                     AddOnsManager aom = AddOnsManager.getInstance();
-                    toolchains = aom.getToolchains(cco_xmlType);
-                    for (Toolchain toolchain: toolchains) {
-                        String to = String.format("%s|%s", aom.getAddOn(cco_xmlType).getType(), toolchain.getName());
-                        Set<Association> xslAssocs = adao.findByKindTo(Association.HAS_TOOLCHAIN, to);
-                        for (Association xslAssoc: xslAssocs) {
-                            Content xsl = dao.retrieve(xslAssoc.getFrom(), null);
-                            if (xsl != null) {
-                                stylesheets.add(xsl);
-                            }
+                    String to = String.format("%s|%s", aom.getAddOn(cco_xmlType).getType(), tchain); // NOI18N
+                    Set<Association> xslAssocs = adao.findByKindTo((Association.HAS_TOOLCHAIN), to);
+                    for (Association xslAssoc: xslAssocs) {
+                        Content xsl = dao.retrieve(xslAssoc.getFrom(), null);
+                        if (xsl != null) {
+                            stylesheets.add(xsl);
                         }
                     }
@@ -112 +110 @@
                 xsls.put("label", "name"); // NOI18N
                 JSONArray xsla = new JSONArray();
-                if (cco_xmlType != null && toolchains != null && !toolchains.isEmpty()) {
-                    xsla.put(new JSONObject().put("name", "[ DEFAULT ]").put("href", "DEFAULT")); // NOI18N
-                }
                 for (Content stylesheet: stylesheets) {
                     JSONObject xsl = new JSONObject();

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

@@ -50 +50 @@
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
-import org.restlet.representation.Variant;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;
@@ -248 +247 @@
     }
 
-    @Get
-    @Override
-    public Representation get(Variant variant) throws ResourceException {
-        String fmt = (String) getRequestAttributes().get(".fmt"); // NOI18N
-        if (fmt == null) {
-            String accept = getHttpHeader("Accept"); // NOI18N
-            MediaType mt = variant.getMediaType();
-            if (accept != null) {
-                mt = new MediaType(accept);
-            }
-            if (MediaType.APPLICATION_JSON.equals(mt)) {
-                fmt = ".json"; // NOI18N
-            }
-        }
-        if (".json".equals(fmt)) { // NOI18N
-            return toJSON();
-        } else {
-            return toXML(); // Preferred representation
-        }
-    }
-
-    private Representation toJSON() throws ResourceException {
+    @Get("json")
+    public Representation toJSON() throws ResourceException {
         try {
             JSONObject pubsj = new JSONObject();
@@ -288 +267 @@
     }
 
-    private Representation toXML() throws ResourceException {
+    @Get("xml")
+    public Representation toXML() throws ResourceException {
         try {
             DomRepresentation rep = new DomRepresentation(MediaType.TEXT_XML);

trunk/src/com/calenco/staticres/workspace-html.ftl

@@ -174 +174 @@
                     }
                 });
-                /* Fill TC list */
-                var tcStore = new dojo.data.ItemFileReadStore({url: "/system/toolchains.json"});
-                tcStore.fetch({
-                    query: {}, start: 0, count: 1, onComplete: function(res) {
-                        tcsel = new dijit.form.FilteringSelect({
-                            name: "toolchain",
-                            store: tcStore,
-                            searchAttr: "desc",
-                            value: tcStore.getIdentity(res[0]),
-                            invalidMessage: "Not valid, please select one of the available values only"
-                        }).placeAt("ptoolchain");
-                    }
-                });
-                /* Fill XSLs list */
-                var xslStore = new dojo.data.ItemFileReadStore({url: "/workspaces/${wksp}/stylesheets"});
-                xslStore.fetch({
-                    query: {}, start: 0, count: 1, onComplete: function(res) {
-                        xslsel = new dijit.form.FilteringSelect({
-                            store: xslStore,
-                            searchAttr: "desc",
-                            value: xslStore.getIdentity(res[0])
-                        }, "pxsl");
-                    }
-                });
                 /* Fetch system(-wide available) languages */
                 dojo.xhrGet({
-                    url: "/system/languages.json",
+                    url: "/system/languages",
+                    headers: {Accept: "application/json"},
                     handleAs: "json",
                     load: function(response, ioArgs) {
@@ -591 +568 @@
                                             </div>
                                             <div class="pfctrl">
-                                                <input id="pxsl" name="xsl" dojotype="dijit.form.FilteringSelect" invalidmessage="Not valid, please select one of the available values only" />
+                                                <div id="pxsl"></div>
                                             </div>
                                         </div>
@@ -1295 +1272 @@
                 var fname = new String(selectedFile).replace(noPathRE, "");
                 dojo.xhrGet({
-                    url: "/workspaces/${wksp}/publications.json?file=" + selectedFile,
+                    url: "/workspaces/${wksp}/publications?file=" + selectedFile,
                     preventCache: true,
+                    headers: {Accept: "application/json"},
                     handleAs: "json",
                     handle: function(response, ioArgs) {
@@ -1406 +1384 @@
             function createPub() {
                 dijit.byId("plist.dlg").hide();
+                // Fill XSL with just the default XSL
+                var xslStore = new dojo.data.ItemFileReadStore({
+                    data: {count: 1, label: "name", identifier: "href", items: [{name: "[ DEFAULT ]", href: "DEFAULT"}]},
+                    clearOnClose: true
+                });
+                xslStore.fetch({
+                    query: {}, onComplete: function(res) {
+                        dojo.empty("pxsl");
+                        if (xslsel) {
+                            xslsel.destroyRecursive(false);
+                        }
+                        xslsel = new dijit.form.FilteringSelect({
+                            name: "xsl",
+                            store: xslStore,
+                            searchAttr: "name",
+                            value: xslStore.getIdentity(res[0]),
+                            invalidMessage: "Not valid, please select one of the available values only"
+                        }).placeAt("pxsl");
+                    }
+                });
+                // Fill TC list with possible TCs for the selected file
+                var tcStore = new dojo.data.ItemFileReadStore({
+                    url: selectedFile + "/toolchains",
+                    urlPreventCache: true,
+                    clearOnClose: true
+                });
+                tcStore.fetch({
+                    query: {}, sort: [{attribute: "desc"}], onComplete: function(res) {
+                        dojo.empty("ptoolchain");
+                        if (tcsel) {
+                            tcsel.destroyRecursive(false);
+                        }
+                        tcsel = new dijit.form.FilteringSelect({
+                            name: "toolchain",
+                            store: tcStore,
+                            searchAttr: "desc",
+                            invalidMessage: "Not valid, please select one of the available values only",
+                            onChange: function(item) {
+                                dojo.xhrGet({ // Not the most efficient way, but it just works(TM)
+                                    url: selectedFile + "/stylesheets/" + item,
+                                    handleAs: "json",
+                                    handle: function(response, ioArgs) {
+                                        if (ioArgs.xhr.status != 200) {
+                                            console.warn("Cannot retrieve XSLs matching the given toolchain and file", response, ioArgs);
+                                        } else {
+                                            var xslData = {count: 1, label: "name", identifier: "href", items: [{name: "[ DEFAULT ]", href: "DEFAULT"}]};
+                                            if (response.count > 0) {
+                                                for (var i = 0; i < response.count; i++) {
+                                                    xslData.items.push(response.items[i]);
+                                                }
+                                            }
+                                            xslData.count += response.count;
+                                            xslStore.close();
+                                            var xslStore2 = new dojo.data.ItemFileReadStore({
+                                                data: xslData,
+                                                clearOnClose: true
+                                            });
+                                            xslStore2.fetch({
+                                                query: {}, onComplete: function(res) {
+                                                    dojo.empty("pxsl");
+                                                    if (xslsel) {
+                                                        xslsel.destroyRecursive(false);
+                                                    }
+                                                    xslsel = new dijit.form.FilteringSelect({
+                                                        name: "xsl",
+                                                        store: xslStore2,
+                                                        searchAttr: "name",
+                                                        value: xslStore2.getIdentity(res[0]),
+                                                        invalidMessage: "Not valid, please select one of the available values only"
+                                                    }).placeAt("pxsl");
+                                                }
+                                            });
+                                        }
+                                        return response;
+                                    }
+                                });
+                            }
+                        }).placeAt("ptoolchain");
+                        tcsel.attr("value", tcStore.getIdentity(res[0])); // Set value and update XSL list accordingly
+                    }
+                });
                 var nform = dojo.byId("pnewf");
                 nform.reset();
                 dojo.byId("pinput-file").value = selectedFile;
-                fillXsl("pxsl");
                 var dlg = dijit.byId("pnew");
                 dlg.attr("title", "Create Publication for " + selectedFile);
-                dojo.connect(dlg, "onCancel", function(e) {dijit.byId("plist.dlg").show();});
+                dojo.connect(dlg, "onCancel", function(e) {if (tcsel) {tcsel.destroyRecursive(false);} if (xslsel) {xslsel.destroyRecursive(false);} dijit.byId("plist.dlg").show();});
                 dlg.show();
             }
@@ -1573 +1631 @@
             }
 
-            function fillXsl(/* String */selId) {
-                var xslStore = new dojo.data.ItemFileReadStore({url: selectedFile + "/stylesheets"});
-                xslStore.fetch({
-                    query: {}, start: 0, count: 1, onComplete: function(res) {
-                        xslsel = dijit.byId(selId);
-                        xslsel.attr("store", xslStore);
-                        xslsel.attr("searchAttr", "name");
-                        xslsel.attr("value", xslStore.getIdentity(res[0]));
-                    }
-                });
-            }
-
             function fillLangs(/* String */selId) {
                 var langDS = new dojo.data.ItemFileReadStore({url: "/workspaces/${wksp}/languages"});

trunk/src/com/calenco/staticres/workspaces-html.ftl

@@ -70 +70 @@
             function init() {
                 dojo.xhrGet({
-                    url: "/system/languages.json",
+                    url: "/system/languages",
+                    headers: {Accept: "application/json"},
                     handleAs: "json",
                     load: function(response, ioArgs) {