You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2014/05/05 17:06:37 UTC
svn commit: r1592546 - in /chemistry/opencmis/trunk:
chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/
chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apach...
Author: fmui
Date: Mon May 5 15:06:36 2014
New Revision: 1592546
URL: http://svn.apache.org/r1592546
Log:
adjusted method name to other methods in RepositoryCapabilitiesImpl
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/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/dataobjects/RepositoryCapabilitiesImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/RepositoryInfoConverterTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.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/JSONConverter.java?rev=1592546&r1=1592545&r2=1592546&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java Mon May 5 15:06:36 2014
@@ -495,7 +495,7 @@ public final class JSONConverter {
result.setIsPwcSearchable(getBoolean(json, JSON_CAP_PWC_SEARCHABLE));
result.setIsPwcUpdatable(getBoolean(json, JSON_CAP_PWC_UPDATABLE));
result.setAllVersionsSearchable(getBoolean(json, JSON_CAP_ALL_VERSIONS_SEARCHABLE));
- result.setOrderByCapability(getEnum(json, JSON_CAP_ORDER_BY, CapabilityOrderBy.class));
+ result.setCapabilityOrderBy(getEnum(json, JSON_CAP_ORDER_BY, CapabilityOrderBy.class));
result.setCapabilityQuery(getEnum(json, JSON_CAP_QUERY, CapabilityQuery.class));
result.setCapabilityJoin(getEnum(json, JSON_CAP_JOIN, CapabilityJoin.class));
result.setCapabilityAcl(getEnum(json, JSON_CAP_ACL, CapabilityAcl.class));
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.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/WSConverter.java?rev=1592546&r1=1592545&r2=1592546&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java Mon May 5 15:06:36 2014
@@ -397,7 +397,7 @@ public final class WSConverter {
result.setIsPwcUpdatable(capabilities.isCapabilityPWCUpdatable());
result.setSupportsGetDescendants(capabilities.isCapabilityGetDescendants());
result.setSupportsGetFolderTree(capabilities.isCapabilityGetFolderTree());
- result.setOrderByCapability(convert(CapabilityOrderBy.class, capabilities.getCapabilityOrderBy()));
+ result.setCapabilityOrderBy(convert(CapabilityOrderBy.class, capabilities.getCapabilityOrderBy()));
result.setSupportsMultifiling(capabilities.isCapabilityMultifiling());
result.setSupportsUnfiling(capabilities.isCapabilityUnfiling());
result.setSupportsVersionSpecificFiling(capabilities.isCapabilityVersionSpecificFiling());
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=1592546&r1=1592545&r2=1592546&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 Mon May 5 15:06:36 2014
@@ -1266,7 +1266,7 @@ public final class XMLConverter {
}
if (isTag(name, TAG_CAP_ORDER_BY)) {
- target.setOrderByCapability(readEnum(parser, CapabilityOrderBy.class));
+ target.setCapabilityOrderBy(readEnum(parser, CapabilityOrderBy.class));
return true;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.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/dataobjects/RepositoryCapabilitiesImpl.java?rev=1592546&r1=1592545&r2=1592546&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java Mon May 5 15:06:36 2014
@@ -173,10 +173,17 @@ public class RepositoryCapabilitiesImpl
return capabilityOrderBy;
}
- public void setOrderByCapability(CapabilityOrderBy capabilityOrderBy) {
+ public void setCapabilityOrderBy(CapabilityOrderBy capabilityOrderBy) {
this.capabilityOrderBy = capabilityOrderBy;
}
+ /**
+ * @deprecated use {@link #setCapabilityOrderBy(CapabilityOrderBy)}
+ */
+ public void setOrderByCapability(CapabilityOrderBy capabilityOrderBy) {
+ setCapabilityOrderBy(capabilityOrderBy);
+ }
+
public Boolean isMultifilingSupported() {
return supportsMultifiling;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/RepositoryInfoConverterTest.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/xml/RepositoryInfoConverterTest.java?rev=1592546&r1=1592545&r2=1592546&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/RepositoryInfoConverterTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/RepositoryInfoConverterTest.java Mon May 5 15:06:36 2014
@@ -117,7 +117,7 @@ public class RepositoryInfoConverterTest
cap1.setSupportsGetDescendants(randomBoolean());
cap1.setSupportsGetFolderTree(randomBoolean());
cap1.setSupportsMultifiling(randomBoolean());
- cap1.setOrderByCapability(randomEnum(CapabilityOrderBy.class));
+ cap1.setCapabilityOrderBy(randomEnum(CapabilityOrderBy.class));
cap1.setSupportsUnfiling(randomBoolean());
cap1.setSupportsVersionSpecificFiling(randomBoolean());
@@ -247,7 +247,7 @@ public class RepositoryInfoConverterTest
repInfo2.setExtensionFeature(null);
if (repInfo.getCapabilities() != null) {
RepositoryCapabilitiesImpl capabilities = new RepositoryCapabilitiesImpl(repInfo.getCapabilities());
- capabilities.setOrderByCapability(null);
+ capabilities.setCapabilityOrderBy(null);
capabilities.setCreatablePropertyTypes(null);
capabilities.setNewTypeSettableAttributes(null);
repInfo2.setCapabilities(capabilities);
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=1592546&r1=1592545&r2=1592546&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 May 5 15:06:36 2014
@@ -230,7 +230,7 @@ public class FileShareRepository {
capabilities.setCapabilityRendition(CapabilityRenditions.NONE);
if (cmisVersion != CmisVersion.CMIS_1_0) {
- capabilities.setOrderByCapability(CapabilityOrderBy.NONE);
+ capabilities.setCapabilityOrderBy(CapabilityOrderBy.NONE);
NewTypeSettableAttributesImpl typeSetAttributes = new NewTypeSettableAttributesImpl();
typeSetAttributes.setCanSetControllableAcl(false);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java?rev=1592546&r1=1592545&r2=1592546&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Mon May 5 15:06:36 2014
@@ -471,7 +471,7 @@ public class StoreManagerImpl implements
CreatablePropertyTypesImpl creatablePropertyTypes = new CreatablePropertyTypesImpl();
creatablePropertyTypes.setCanCreate(propertyTypeSet);
caps.setCreatablePropertyTypes(creatablePropertyTypes);
- caps.setOrderByCapability(CapabilityOrderBy.COMMON);
+ caps.setCapabilityOrderBy(CapabilityOrderBy.COMMON);
} else {
repoInfo.setCmisVersionSupported(CmisVersion.CMIS_1_0.value());
repoInfo.setCmisVersion(CmisVersion.CMIS_1_0);