Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 37544 invoked from network); 9 Mar 2010 08:33:09 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Mar 2010 08:33:09 -0000 Received: (qmail 28350 invoked by uid 500); 9 Mar 2010 08:32:42 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 28305 invoked by uid 500); 9 Mar 2010 08:32:42 -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 28296 invoked by uid 99); 9 Mar 2010 08:32:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 08:32:41 +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; Tue, 09 Mar 2010 08:32:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C8CE2388980; Tue, 9 Mar 2010 08:32:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r920730 - in /incubator/chemistry/trunk/opencmis: opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/ opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/ Date: Tue, 09 Mar 2010 08:32:18 -0000 To: chemistry-commits@incubator.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100309083218.2C8CE2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmui Date: Tue Mar 9 08:32:17 2010 New Revision: 920730 URL: http://svn.apache.org/viewvc?rev=920730&view=rev Log: fixed ACLPropagation parameter Modified: incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java Modified: incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java?rev=920730&r1=920729&r2=920730&view=diff ============================================================================== --- incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java (original) +++ incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java Tue Mar 9 08:32:17 2010 @@ -21,6 +21,7 @@ package org.apache.opencmis.commons.impl import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import org.apache.opencmis.commons.enums.AclPropagation; import org.apache.opencmis.commons.enums.IncludeRelationships; import org.apache.opencmis.commons.enums.RelationshipDirection; import org.apache.opencmis.commons.enums.UnfileObjects; @@ -181,6 +182,9 @@ public class UrlBuilder { else if (value instanceof ReturnVersion) { return ((ReturnVersion) value).value(); } + else if (value instanceof AclPropagation) { + return ((AclPropagation) value).value(); + } return value.toString(); } Modified: incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java?rev=920730&r1=920729&r2=920730&view=diff ============================================================================== --- incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java (original) +++ incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java Tue Mar 9 08:32:17 2010 @@ -199,10 +199,11 @@ public final class AtomPubUtils { Method m = clazz.getMethod("fromValue", new Class[] { String.class }); return (T) m.invoke(null, new Object[] { value }); } - catch (IllegalArgumentException iae) { - throw new CmisInvalidArgumentException("Invalid parameter '" + name + "'!"); - } catch (Exception e) { + if (e instanceof IllegalArgumentException) { + throw new CmisInvalidArgumentException("Invalid parameter '" + name + "'!"); + } + throw new CmisRuntimeException(e.getMessage(), e); } }