Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 68516 invoked from network); 14 Jan 2010 00:49:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jan 2010 00:49:16 -0000 Received: (qmail 31270 invoked by uid 500); 14 Jan 2010 00:49:16 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 31221 invoked by uid 500); 14 Jan 2010 00:49:16 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 31211 invoked by uid 99); 14 Jan 2010 00:49:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jan 2010 00:49:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jan 2010 00:49:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 202E823888EC; Thu, 14 Jan 2010 00:48:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r899010 - in /incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src: main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Date: Thu, 14 Jan 2010 00:48:54 -0000 To: chemistry-commits@incubator.apache.org From: fguillaume@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100114004855.202E823888EC@eris.apache.org> Author: fguillaume Date: Thu Jan 14 00:48:54 2010 New Revision: 899010 URL: http://svn.apache.org/viewvc?rev=899010&view=rev Log: Make JAX-RS binding support GET on descendants and foldertree Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java?rev=899010&r1=899009&r2=899010&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java (original) +++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java Thu Jan 14 00:48:54 2010 @@ -297,16 +297,32 @@ return postAbderaEntry(2); } + @GET + @Produces(AtomPubCMIS.MEDIA_TYPE_CMIS_TREE) + @Path("descendants/{objectid}") + public Response doGetDescendants() { + // objectid decoded by Abdera getCollectionAdapter + return getAbderaFeed(2); + } + @DELETE @Path("descendants/{objectid}") - public Response deleteDescendants() { + public Response doDeleteDescendants() { // objectid decoded by Abdera getCollectionAdapter return deleteAbderaEntry(2); } + @GET + @Produces(AtomPub.MEDIA_TYPE_ATOM_FEED) + @Path("foldetree/{objectid}") + public Response doGetFolderTree() { + // objectid decoded by Abdera getCollectionAdapter + return getAbderaFeed(2); + } + @DELETE @Path("foldertree/{objectid}") - public Response deleteFolderTree() { + public Response doDeleteFolderTree() { // objectid decoded by Abdera getCollectionAdapter return deleteAbderaEntry(2); } Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java?rev=899010&r1=899009&r2=899010&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java (original) +++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Thu Jan 14 00:48:54 2010 @@ -345,36 +345,45 @@ } public void testDelete() { - RequestOptions options = new RequestOptions(); - ClientResponse resp = client.delete(base + "/object/" + doc3id, options); + ClientResponse resp = client.delete(base + "/object/" + doc3id); assertEquals(HttpStatus.SC_NO_CONTENT, resp.getStatus()); resp.release(); - resp = client.delete(base + "/object/no-such-id", options); + resp = client.delete(base + "/object/no-such-id"); assertEquals(HttpStatus.SC_NOT_FOUND, resp.getStatus()); resp.release(); } - public void testDeleteDescendants() { - RequestOptions options = new RequestOptions(); - ClientResponse resp = client.delete(base + "/descendants/" + folder1id, - options); + public void testDescendants() { + ClientResponse resp = client.get(base + "/descendants/" + rootFolderId + + "?" + AtomPubCMIS.PARAM_DEPTH + "=1"); + assertEquals(HttpStatus.SC_OK, resp.getStatus()); + Element ch = resp.getDocument().getRoot(); + assertNotNull(ch); + resp.release(); + + resp = client.delete(base + "/descendants/" + folder1id); assertEquals(HttpStatus.SC_NO_CONTENT, resp.getStatus()); resp.release(); - resp = client.delete(base + "/descendants/no-such-id", options); + resp = client.delete(base + "/descendants/no-such-id"); assertEquals(HttpStatus.SC_NOT_FOUND, resp.getStatus()); resp.release(); } - public void testDeleteFolderTree() { - RequestOptions options = new RequestOptions(); - ClientResponse resp = client.delete(base + "/foldertree/" + folder1id, - options); + public void testFolderTree() { + ClientResponse resp = client.get(base + "/descendants/" + rootFolderId + + "?" + AtomPubCMIS.PARAM_DEPTH + "=1"); + assertEquals(HttpStatus.SC_OK, resp.getStatus()); + Element ch = resp.getDocument().getRoot(); + assertNotNull(ch); + resp.release(); + + resp = client.delete(base + "/foldertree/" + folder1id); assertEquals(HttpStatus.SC_NO_CONTENT, resp.getStatus()); resp.release(); - resp = client.delete(base + "/foldertree/no-such-id", options); + resp = client.delete(base + "/foldertree/no-such-id"); assertEquals(HttpStatus.SC_NOT_FOUND, resp.getStatus()); resp.release(); }