chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r967058 - /incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java
Date Fri, 23 Jul 2010 11:59:00 GMT
Author: fmui
Date: Fri Jul 23 11:59:00 2010
New Revision: 967058

URL: http://svn.apache.org/viewvc?rev=967058&view=rev
Log:
- AtomPub server: version history link bug fix

Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java?rev=967058&r1=967057&r2=967058&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/server/AbstractCmisService.java
Fri Jul 23 11:59:00 2010
@@ -1,4 +1,5 @@
 package org.apache.chemistry.opencmis.commons.impl.server;
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,6 @@ package org.apache.chemistry.opencmis.co
  *
  */
 
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
@@ -925,7 +925,7 @@ public abstract class AbstractCmisServic
                 infoImpl.setWorkingCopyId(null);
                 infoImpl.setWorkingCopyOriginalId(null);
 
-                infoImpl.setVersionSeriesId(getStringProperty(object, PropertyIds.VERSION_SERIES_ID));
+                infoImpl.setVersionSeriesId(getIdProperty(object, PropertyIds.VERSION_SERIES_ID));
                 if (infoImpl.getVersionSeriesId() != null) {
                     Boolean isLatest = getBooleanProperty(object, PropertyIds.IS_LATEST_VERSION);
                     infoImpl.setIsCurrentVersion(isLatest == null ? true : isLatest.booleanValue());
@@ -936,7 +936,7 @@ public abstract class AbstractCmisServic
 
                         // get latest version
                         List<ObjectData> versions = getAllVersions(repositoryId, objectId,
infoImpl
-                                .getVersionSeriesId(), PropertyIds.OBJECT_ID, Boolean.FALSE,
null);
+                                .getVersionSeriesId(), null, Boolean.FALSE, null);
                         if (versions != null && versions.size() > 0) {
                             infoImpl.setWorkingCopyOriginalId(versions.get(0).getId());
                         }
@@ -946,7 +946,7 @@ public abstract class AbstractCmisServic
                 // content
                 String fileName = getStringProperty(object, PropertyIds.CONTENT_STREAM_FILE_NAME);
                 String mimeType = getStringProperty(object, PropertyIds.CONTENT_STREAM_MIME_TYPE);
-                String streamId = getStringProperty(object, PropertyIds.CONTENT_STREAM_ID);
+                String streamId = getIdProperty(object, PropertyIds.CONTENT_STREAM_ID);
                 BigInteger length = getIntegerProperty(object, PropertyIds.CONTENT_STREAM_LENGTH);
                 boolean hasContent = fileName != null || mimeType != null || streamId !=
null || length != null;
                 if (hasContent) {
@@ -960,8 +960,8 @@ public abstract class AbstractCmisServic
                 }
 
                 // parent
-                List<ObjectParentData> parents = getObjectParents(repositoryId, objectId,
PropertyIds.OBJECT_ID,
-                        Boolean.FALSE, IncludeRelationships.NONE, "cmis:none", Boolean.FALSE,
null);
+                List<ObjectParentData> parents = getObjectParents(repositoryId, objectId,
null, Boolean.FALSE,
+                        IncludeRelationships.NONE, "cmis:none", Boolean.FALSE, null);
                 infoImpl.setHasParent(parents.size() > 0);
 
                 // policies and relationships



Mime
View raw message