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 62A69C270 for ; Mon, 9 Sep 2013 06:17:50 +0000 (UTC) Received: (qmail 51215 invoked by uid 500); 9 Sep 2013 06:17:49 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 51160 invoked by uid 500); 9 Sep 2013 06:17:46 -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 51138 invoked by uid 99); 9 Sep 2013 06:17:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 06:17:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 09 Sep 2013 06:17:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 29C962388994; Mon, 9 Sep 2013 06:17:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1520963 - in /chemistry/opencmis/trunk: chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/ chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chem... Date: Mon, 09 Sep 2013 06:17:21 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130909061722.29C962388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmui Date: Mon Sep 9 06:17:21 2013 New Revision: 1520963 URL: http://svn.apache.org/r1520963 Log: more JavaDoc and small fixes Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java?rev=1520963&r1=1520962&r2=1520963&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java Mon Sep 9 06:17:21 2013 @@ -29,68 +29,101 @@ public final class PropertyIds { // ---- base ---- /** * CMIS property {@code cmis:name}: name of the object. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String NAME = "cmis:name"; /** - * CMIS property {@code cmis:objectId}: id of the object. + * CMIS property {@code cmis:objectId}: ID of the object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String OBJECT_ID = "cmis:objectId"; /** - * CMIS property {@code cmis:objectTypeId}: id of primary type of the + * CMIS property {@code cmis:objectTypeId}: ID of primary type of the * object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String OBJECT_TYPE_ID = "cmis:objectTypeId"; /** - * CMIS property {@code cmis:baseTypeId}: id of the base type of the object. + * CMIS property {@code cmis:baseTypeId}: ID of the base type of the object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String BASE_TYPE_ID = "cmis:baseTypeId"; /** * CMIS property {@code cmis:createdBy}: creator of the object. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String CREATED_BY = "cmis:createdBy"; /** * CMIS property {@code cmis:creationDate}: creation date. + *

+ * CMIS data type: datetime
+ * Java type: GregorianCalendar * * @cmis 1.0 */ public static final String CREATION_DATE = "cmis:creationDate"; /** * CMIS property {@code cmis:lastModifiedBy}: last modifier of the object. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String LAST_MODIFIED_BY = "cmis:lastModifiedBy"; /** * CMIS property {@code cmis:lastModificationDate}: last modification date. + *

+ * CMIS data type: datetime
+ * Java type: GregorianCalendar * * @cmis 1.0 */ public static final String LAST_MODIFICATION_DATE = "cmis:lastModificationDate"; /** * CMIS property {@code cmis:changeToken}: change token of the object. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String CHANGE_TOKEN = "cmis:changeToken"; /** * CMIS property {@code cmis:description}: description of the object. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.1 */ public static final String DESCRIPTION = "cmis:description"; /** * CMIS property {@code cmis:secondaryObjectTypeIds} (multivalue): list of - * ids of the secondary types of the object. + * IDs of the secondary types of the object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.1 */ @@ -100,6 +133,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isImmutable}: flag the indicates if * the document is immutable. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.0 */ @@ -107,6 +143,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isLatestVersion}: flag the indicates * if the document is the latest version. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.0 */ @@ -114,6 +153,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isMajorVersion}: flag the indicates if * the document is a major version. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.0 */ @@ -121,6 +163,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isLatestMajorVersion}: flag the * indicates if the document is the latest major version. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.0 */ @@ -128,13 +173,19 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:versionLabel}: version label of the * document. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String VERSION_LABEL = "cmis:versionLabel"; /** - * CMIS document property {@code cmis:versionSeriesId}: id of the version + * CMIS document property {@code cmis:versionSeriesId}: ID of the version * series. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ @@ -142,6 +193,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isVersionSeriesCheckedOut}: flag the * indicates if the document is checked out. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.0 */ @@ -149,13 +203,19 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:versionSeriesCheckedOutBy}: user who * checked out the document, if the document is checked out. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String VERSION_SERIES_CHECKED_OUT_BY = "cmis:versionSeriesCheckedOutBy"; /** - * CMIS document property {@code cmis:versionSeriesCheckedOutId}: id of the + * CMIS document property {@code cmis:versionSeriesCheckedOutId}: ID of the * PWC, if the document is checked out. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ @@ -163,6 +223,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:checkinComment}: check-in comment for * the document version. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ @@ -170,6 +233,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:contentStreamLength}: length of the * content stream, if the document has content. + *

+ * CMIS data type: integer
+ * Java type: BigInteger * * @cmis 1.0 */ @@ -177,6 +243,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:contentStreamMimeType}: MIME type of * the content stream, if the document has content. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ @@ -184,12 +253,18 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:contentStreamFileName}: file name, if * the document has content. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ public static final String CONTENT_STREAM_FILE_NAME = "cmis:contentStreamFileName"; /** - * CMIS document property {@code cmis:contentStreamId}: content stream id. + * CMIS document property {@code cmis:contentStreamId}: content stream ID. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ @@ -197,6 +272,9 @@ public final class PropertyIds { /** * CMIS document property {@code cmis:isPrivateWorkingCopy}: flag the * indicates if the document is a PWC. + *

+ * CMIS data type: boolean
+ * Java type: Boolean * * @cmis 1.1 */ @@ -204,20 +282,29 @@ public final class PropertyIds { // ---- folder ---- /** - * CMIS folder property {@code cmis:parentId}: id of the parent folder. + * CMIS folder property {@code cmis:parentId}: ID of the parent folder. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String PARENT_ID = "cmis:parentId"; /** * CMIS folder property {@code cmis:allowedChildObjectTypeIds} (multivalue): - * ids of the types that can be filed in the folder. + * IDs of the types that can be filed in the folder. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String ALLOWED_CHILD_OBJECT_TYPE_IDS = "cmis:allowedChildObjectTypeIds"; /** * CMIS folder property {@code cmis:path}: folder path. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ @@ -225,15 +312,21 @@ public final class PropertyIds { // ---- relationship ---- /** - * CMIS relationship property {@code cmis:sourceId}: id of the source + * CMIS relationship property {@code cmis:sourceId}: ID of the source * object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ public static final String SOURCE_ID = "cmis:sourceId"; /** - * CMIS relationship property {@code cmis:targetId}: id of the target + * CMIS relationship property {@code cmis:targetId}: ID of the target * object. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.0 */ @@ -242,6 +335,9 @@ public final class PropertyIds { // ---- policy ---- /** * CMIS policy property {@code cmis:policyText}: policy text. + *

+ * CMIS data type: string
+ * Java type: String * * @cmis 1.0 */ @@ -250,12 +346,18 @@ public final class PropertyIds { // ---- retention --- /** * CMIS retention property {@code cmis:rm_expirationDate}: expiration date. + *

+ * CMIS data type: datetime
+ * Java type: GregorianCalendar * * @cmis 1.1 */ public static final String EXPIRATION_DATE = "cmis:rm_expirationDate"; /** * CMIS retention property {@code cmis:rm_startOfRetention}: start date. + *

+ * CMIS data type: datetime
+ * Java type: GregorianCalendar * * @cmis 1.1 */ @@ -263,16 +365,21 @@ public final class PropertyIds { /** * CMIS retention property {@code cmis:rm_destructionDate}: destruction * date. + *

+ * CMIS data type: datetime
+ * Java type: GregorianCalendar * * @cmis 1.1 */ public static final String DESTRUCTION_DATE = "cmis:rm_destructionDate"; /** - * CMIS retention property {@code cmis:rm_holdIds} (multivalue): ids of the + * CMIS retention property {@code cmis:rm_holdIds} (multivalue): IDs of the * holds that are applied. + *

+ * CMIS data type: id
+ * Java type: String * * @cmis 1.1 */ public static final String HOLD_IDS = "cmis:rm_holdIds"; - } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java?rev=1520963&r1=1520962&r2=1520963&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java Mon Sep 9 06:17:21 2013 @@ -19,7 +19,7 @@ package org.apache.chemistry.opencmis.commons; /** - * Secondary type ids that are defined in the CMIS specification. + * Secondary type IDs that are defined in the CMIS specification. * * @cmis 1.1 */ Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java?rev=1520963&r1=1520962&r2=1520963&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java Mon Sep 9 06:17:21 2013 @@ -27,13 +27,9 @@ import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.util.List; import java.util.Map; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java?rev=1520963&r1=1520962&r2=1520963&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Mon Sep 9 06:17:21 2013 @@ -1939,7 +1939,7 @@ public class FileShareRepository { addAction(aas, Action.CAN_CREATE_FOLDER, !userReadOnly); addAction(aas, Action.CAN_DELETE_TREE, !userReadOnly && !isReadOnly); } else { - addAction(aas, Action.CAN_GET_CONTENT_STREAM, true); + addAction(aas, Action.CAN_GET_CONTENT_STREAM, file.length() > 0); addAction(aas, Action.CAN_SET_CONTENT_STREAM, !userReadOnly && !isReadOnly); addAction(aas, Action.CAN_DELETE_CONTENT_STREAM, !userReadOnly && !isReadOnly); addAction(aas, Action.CAN_GET_ALL_VERSIONS, true);