Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 58479 invoked from network); 6 Jan 2010 15:23:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Jan 2010 15:23:07 -0000 Received: (qmail 75575 invoked by uid 500); 6 Jan 2010 15:23:07 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 75523 invoked by uid 500); 6 Jan 2010 15:23:07 -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 75513 invoked by uid 99); 6 Jan 2010 15:23:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2010 15:23:07 +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; Wed, 06 Jan 2010 15:23:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03F3A23889B3; Wed, 6 Jan 2010 15:22:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r896476 - in /incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src: main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Date: Wed, 06 Jan 2010 15:22:43 -0000 To: chemistry-commits@incubator.apache.org From: fguillaume@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100106152244.03F3A23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fguillaume Date: Wed Jan 6 15:22:42 2010 New Revision: 896476 URL: http://svn.apache.org/viewvc?rev=896476&view=rev Log: Return type property definitions when a single type is requested Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.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/CMISTypesCollection.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java?rev=896476&r1=896475&r2=896476&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java (original) +++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java Wed Jan 6 15:22:42 2010 @@ -32,6 +32,7 @@ import org.apache.abdera.model.Feed; import org.apache.abdera.model.Person; import org.apache.abdera.protocol.server.RequestContext; +import org.apache.abdera.protocol.server.ResponseContext; import org.apache.abdera.protocol.server.context.ResponseContextException; import org.apache.chemistry.CMIS; import org.apache.chemistry.PropertyDefinition; @@ -47,6 +48,8 @@ */ public class CMISTypesCollection extends CMISCollection { + protected boolean singleEntry; + public CMISTypesCollection(String type, String id, Repository repository) { super(type, "types", id, repository); } @@ -88,9 +91,17 @@ */ @Override + public ResponseContext getEntry(RequestContext request) { + singleEntry = true; + return super.getEntry(request); + } + + @Override public String addEntryDetails(RequestContext request, Entry entry, IRI feedIri, Type type) throws ResponseContextException { - boolean includePropertyDefinitions = "true".equals(request.getParameter("includePropertyDefinitions")); + boolean includePropertyDefinitions = singleEntry + || getParameter(request, + AtomPubCMIS.PARAM_INCLUDE_PROPERTY_DEFINITIONS, false); Factory factory = request.getAbdera().getFactory(); entry.setId(getId(type)); 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=896476&r1=896475&r2=896476&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 Wed Jan 6 15:22:42 2010 @@ -207,6 +207,21 @@ resp.release(); } + public void testType() throws Exception { + ClientResponse resp = client.get(base + "/type/cmis:document"); + assertEquals(HttpStatus.SC_OK, resp.getStatus()); + Element el = resp.getDocument().getRoot(); + assertNotNull(el); + Element t = el.getFirstChild(new QName(AtomPubCMIS.CMISRA_NS, "type")); + assertNotNull(t); + // check that when we get a simple type, the property definitions are + // returned as well + Element p = t.getFirstChild(new QName(CMIS.CMIS_NS, + "propertyIdDefinition")); + assertNotNull(p); + resp.release(); + } + public void testChildren() throws Exception { ClientResponse resp = client.get(base + "/children/" + rootFolderId); assertEquals(HttpStatus.SC_OK, resp.getStatus());