Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 353501002E for ; Fri, 2 Jan 2015 14:27:30 +0000 (UTC) Received: (qmail 46256 invoked by uid 500); 2 Jan 2015 14:27:31 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 46212 invoked by uid 500); 2 Jan 2015 14:27:30 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 46200 invoked by uid 99); 2 Jan 2015 14:27:30 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2015 14:27:30 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BDD21AC08CB; Fri, 2 Jan 2015 14:27:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1649042 - in /chemistry/opencmis/trunk: chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/ chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apa... Date: Fri, 02 Jan 2015 14:27:30 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150102142730.BDD21AC08CB@hades.apache.org> Author: fmui Date: Fri Jan 2 14:27:30 2015 New Revision: 1649042 URL: http://svn.apache.org/r1649042 Log: XMLConverter corrections Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConstants.java chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1649042&r1=1649041&r2=1649042&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Fri Jan 2 14:27:30 2015 @@ -309,7 +309,7 @@ public final class XMLConverter { XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAG_ACLCAP_SUPPORTED_PERMISSIONS, source.getSupportedPermissions()); - XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAGACLCAP_ACL_PROPAGATION, source.getAclPropagation()); + XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAG_ACLCAP_ACL_PROPAGATION, source.getAclPropagation()); if (source.getPermissions() != null) { for (PermissionDefinition pd : source.getPermissions()) { writer.startTag(NAMESPACE_CMIS, TAG_ACLCAP_PERMISSIONS); @@ -580,13 +580,13 @@ public final class XMLConverter { PropertyHtmlDefinition def = (PropertyHtmlDefinition) source; if (def.getDefaultValue() != null) { - writeProperty(writer, new PropertyIdImpl(null, def.getDefaultValue()), true); + writeProperty(writer, new PropertyHtmlImpl(null, def.getDefaultValue()), true); } } else if (source instanceof PropertyUriDefinition) { PropertyUriDefinition def = (PropertyUriDefinition) source; if (def.getDefaultValue() != null) { - writeProperty(writer, new PropertyIdImpl(null, def.getDefaultValue()), true); + writeProperty(writer, new PropertyUriImpl(null, def.getDefaultValue()), true); } } @@ -1445,7 +1445,7 @@ public final class XMLConverter { return true; } - if (isTag(name, TAGACLCAP_ACL_PROPAGATION)) { + if (isTag(name, TAG_ACLCAP_ACL_PROPAGATION)) { target.setAclPropagation(readEnum(parser, AclPropagation.class)); return true; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConstants.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConstants.java?rev=1649042&r1=1649041&r2=1649042&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConstants.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConstants.java Fri Jan 2 14:27:30 2015 @@ -96,7 +96,7 @@ public final class XMLConstants { public static final String TAG_CAP_NEW_TYPE_SETTABLE_ATTRIBUTES_CONTROLABLEACL = "controllableACL"; public static final String TAG_ACLCAP_SUPPORTED_PERMISSIONS = "supportedPermissions"; - public static final String TAGACLCAP_ACL_PROPAGATION = "propagation"; + public static final String TAG_ACLCAP_ACL_PROPAGATION = "propagation"; public static final String TAG_ACLCAP_PERMISSIONS = "permissions"; public static final String TAG_ACLCAP_PERMISSION_MAPPING = "mapping"; Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1649042&r1=1649041&r2=1649042&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Fri Jan 2 14:27:30 2015 @@ -307,7 +307,7 @@ public final class XMLConverter { XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAG_ACLCAP_SUPPORTED_PERMISSIONS, source.getSupportedPermissions()); - XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAGACLCAP_ACL_PROPAGATION, source.getAclPropagation()); + XMLUtils.write(writer, PREFIX_CMIS, NAMESPACE_CMIS, TAG_ACLCAP_ACL_PROPAGATION, source.getAclPropagation()); if (source.getPermissions() != null) { for (PermissionDefinition pd : source.getPermissions()) { writer.writeStartElement(PREFIX_CMIS, TAG_ACLCAP_PERMISSIONS, NAMESPACE_CMIS); @@ -579,13 +579,13 @@ public final class XMLConverter { PropertyHtmlDefinition def = (PropertyHtmlDefinition) source; if (def.getDefaultValue() != null) { - writeProperty(writer, new PropertyIdImpl(null, def.getDefaultValue()), true); + writeProperty(writer, new PropertyHtmlImpl(null, def.getDefaultValue()), true); } } else if (source instanceof PropertyUriDefinition) { PropertyUriDefinition def = (PropertyUriDefinition) source; if (def.getDefaultValue() != null) { - writeProperty(writer, new PropertyIdImpl(null, def.getDefaultValue()), true); + writeProperty(writer, new PropertyUriImpl(null, def.getDefaultValue()), true); } } @@ -1440,7 +1440,7 @@ public final class XMLConverter { return true; } - if (isTag(name, TAGACLCAP_ACL_PROPAGATION)) { + if (isTag(name, TAG_ACLCAP_ACL_PROPAGATION)) { target.setAclPropagation(readEnum(parser, AclPropagation.class)); return true; }