You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2010/04/16 14:52:00 UTC
svn commit: r934854 [2/5] - in /incubator/chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/ja...
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java Fri Apr 16 12:51:57 2010
@@ -20,60 +20,64 @@ package org.apache.chemistry.opencmis.co
/**
* Collection of session parameters.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
-public interface SessionParameter {
+public final class SessionParameter {
- // ---- general parameter ----
- public static final String USER = "org.apache.chemistry.opencmis.user";
- public static final String PASSWORD = "org.apache.chemistry.opencmis.password";
-
- // ---- provider parameter ----
- /** Predefined binding types (see {@code BindingType}) */
- public static final String BINDING_TYPE = "org.apache.chemistry.opencmis.provider.binding.type";
-
- /** Class name of the binding class. */
- public static final String BINDING_SPI_CLASS = "org.apache.chemistry.opencmis.provider.binding.classname";
-
- /** URL of the AtomPub service document. */
- public static final String ATOMPUB_URL = "org.apache.chemistry.opencmis.provider.atompub.url";
-
- public static final String WEBSERVICES_REPOSITORY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RepositoryService";
- public static final String WEBSERVICES_NAVIGATION_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.NavigationService";
- public static final String WEBSERVICES_OBJECT_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ObjectService";
- public static final String WEBSERVICES_VERSIONING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.VersioningService";
- public static final String WEBSERVICES_DISCOVERY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.DiscoveryService";
- public static final String WEBSERVICES_RELATIONSHIP_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RelationshipService";
- public static final String WEBSERVICES_MULTIFILING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.MultiFilingService";
- public static final String WEBSERVICES_POLICY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.PolicyService";
- public static final String WEBSERVICES_ACL_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ACLService";
-
- /** Class name of the authentication provider. */
- public static final String AUTHENTICATION_PROVIDER_CLASS = "org.apache.chemistry.opencmis.provider.auth.classname";
-
- /**
- * Toggle for HTTP basic authentication. Evaluated by the standard
- * authentication provider.
- */
- public static final String AUTH_HTTP_BASIC = "org.apache.chemistry.opencmis.provider.auth.http.basic";
- /**
- * Toggle for WS-Security UsernameToken authentication. Evaluated by the
- * standard authentication provider.
- */
- public static final String AUTH_SOAP_USERNAMETOKEN = "org.apache.chemistry.opencmis.provider.auth.soap.usernametoken";
-
- public static final String CACHE_SIZE_REPOSITORIES = "org.apache.chemistry.opencmis.provider.cache.repositories.size";
- public static final String CACHE_SIZE_TYPES = "org.apache.chemistry.opencmis.provider.cache.types.size";
- public static final String CACHE_SIZE_OBJECTS = "org.apache.chemistry.opencmis.provider.cache.objects.size";
-
- // --- session control ---
-
- public static final String LOCALE_ISO639_LANGUAGE = "org.apache.chemistry.opencmis.locale.iso639";
- public static final String LOCALE_ISO3166_COUNTRY = "org.apache.chemistry.opencmis.locale.iso3166";
- public static final String LOCALE_VARIANT = "org.apache.chemistry.opencmis.locale.variant";
+ // utility class
+ private SessionParameter() {
+ }
+
+ // ---- general parameter ----
+ public static final String USER = "org.apache.chemistry.opencmis.user";
+ public static final String PASSWORD = "org.apache.chemistry.opencmis.password";
+
+ // ---- provider parameter ----
+ /** Predefined binding types (see {@code BindingType}) */
+ public static final String BINDING_TYPE = "org.apache.chemistry.opencmis.provider.binding.type";
+
+ /** Class name of the binding class. */
+ public static final String BINDING_SPI_CLASS = "org.apache.chemistry.opencmis.provider.binding.classname";
+
+ /** URL of the AtomPub service document. */
+ public static final String ATOMPUB_URL = "org.apache.chemistry.opencmis.provider.atompub.url";
+
+ public static final String WEBSERVICES_REPOSITORY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RepositoryService";
+ public static final String WEBSERVICES_NAVIGATION_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.NavigationService";
+ public static final String WEBSERVICES_OBJECT_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ObjectService";
+ public static final String WEBSERVICES_VERSIONING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.VersioningService";
+ public static final String WEBSERVICES_DISCOVERY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.DiscoveryService";
+ public static final String WEBSERVICES_RELATIONSHIP_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RelationshipService";
+ public static final String WEBSERVICES_MULTIFILING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.MultiFilingService";
+ public static final String WEBSERVICES_POLICY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.PolicyService";
+ public static final String WEBSERVICES_ACL_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ACLService";
+
+ /** Class name of the authentication provider. */
+ public static final String AUTHENTICATION_PROVIDER_CLASS = "org.apache.chemistry.opencmis.provider.auth.classname";
+
+ /**
+ * Toggle for HTTP basic authentication. Evaluated by the standard
+ * authentication provider.
+ */
+ public static final String AUTH_HTTP_BASIC = "org.apache.chemistry.opencmis.provider.auth.http.basic";
+ /**
+ * Toggle for WS-Security UsernameToken authentication. Evaluated by the
+ * standard authentication provider.
+ */
+ public static final String AUTH_SOAP_USERNAMETOKEN = "org.apache.chemistry.opencmis.provider.auth.soap.usernametoken";
+
+ public static final String CACHE_SIZE_REPOSITORIES = "org.apache.chemistry.opencmis.provider.cache.repositories.size";
+ public static final String CACHE_SIZE_TYPES = "org.apache.chemistry.opencmis.provider.cache.types.size";
+ public static final String CACHE_SIZE_OBJECTS = "org.apache.chemistry.opencmis.provider.cache.objects.size";
+
+ // --- session control ---
+
+ public static final String LOCALE_ISO639_LANGUAGE = "org.apache.chemistry.opencmis.locale.iso639";
+ public static final String LOCALE_ISO3166_COUNTRY = "org.apache.chemistry.opencmis.locale.iso3166";
+ public static final String LOCALE_VARIANT = "org.apache.chemistry.opencmis.locale.variant";
- public static final String SESSION_TYPE = "org.apache.chemistry.opencmis.session.type";
- public static final String REPOSITORY_ID = "org.apache.chemistry.opencmis.session.repository.id";
+ public static final String SESSION_TYPE = "org.apache.chemistry.opencmis.session.type";
+ public static final String REPOSITORY_ID = "org.apache.chemistry.opencmis.session.repository.id";
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/AllowableActions.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/AllowableActions.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/AllowableActions.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/AllowableActions.java Fri Apr 16 12:51:57 2010
@@ -20,10 +20,10 @@ package org.apache.chemistry.opencmis.co
import java.util.Set;
-import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
+import org.apache.chemistry.opencmis.commons.enums.Action;
public interface AllowableActions extends ExtensionsData {
- Set<AllowableActionsEnum> getAllowableActions();
+ Set<Action> getAllowableActions();
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/BindingsObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/BindingsObjectFactory.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/BindingsObjectFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/BindingsObjectFactory.java Fri Apr 16 12:51:57 2010
@@ -37,39 +37,39 @@ public interface BindingsObjectFactory {
Acl createAccessControlList(List<Ace> aces);
- PropertyBooleanData createPropertyBooleanData(String id, List<Boolean> values);
+ PropertyBoolean createPropertyBooleanData(String id, List<Boolean> values);
- PropertyBooleanData createPropertyBooleanData(String id, Boolean value);
+ PropertyBoolean createPropertyBooleanData(String id, Boolean value);
- PropertyIdData createPropertyIdData(String id, List<String> values);
+ PropertyId createPropertyIdData(String id, List<String> values);
- PropertyIdData createPropertyIdData(String id, String value);
+ PropertyId createPropertyIdData(String id, String value);
- PropertyIntegerData createPropertyIntegerData(String id, List<BigInteger> values);
+ PropertyInteger createPropertyIntegerData(String id, List<BigInteger> values);
- PropertyIntegerData createPropertyIntegerData(String id, BigInteger value);
+ PropertyInteger createPropertyIntegerData(String id, BigInteger value);
- PropertyDateTimeData createPropertyDateTimeData(String id, List<GregorianCalendar> values);
+ PropertyDateTime createPropertyDateTimeData(String id, List<GregorianCalendar> values);
- PropertyDateTimeData createPropertyDateTimeData(String id, GregorianCalendar value);
+ PropertyDateTime createPropertyDateTimeData(String id, GregorianCalendar value);
- PropertyDecimalData createPropertyDecimalData(String id, List<BigDecimal> values);
+ PropertyDecimal createPropertyDecimalData(String id, List<BigDecimal> values);
- PropertyDecimalData createPropertyDecimalData(String id, BigDecimal value);
+ PropertyDecimal createPropertyDecimalData(String id, BigDecimal value);
- PropertyHtmlData createPropertyHtmlData(String id, List<String> values);
+ PropertyHtml createPropertyHtmlData(String id, List<String> values);
- PropertyHtmlData createPropertyHtmlData(String id, String value);
+ PropertyHtml createPropertyHtmlData(String id, String value);
- PropertyStringData createPropertyStringData(String id, List<String> values);
+ PropertyString createPropertyStringData(String id, List<String> values);
- PropertyStringData createPropertyStringData(String id, String value);
+ PropertyString createPropertyStringData(String id, String value);
- PropertyUriData createPropertyUriData(String id, List<String> values);
+ PropertyUri createPropertyUriData(String id, List<String> values);
- PropertyUriData createPropertyUriData(String id, String value);
+ PropertyUri createPropertyUriData(String id, String value);
- PropertiesData createPropertiesData(List<PropertyData<?>> properties);
+ Properties createPropertiesData(List<PropertyData<?>> properties);
ContentStream createContentStream(String filename, BigInteger length, String mimetype,
InputStream stream);
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfo.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfoData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfo.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfo.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfoData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfoData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfo.java Fri Apr 16 12:51:57 2010
@@ -20,11 +20,11 @@ package org.apache.chemistry.opencmis.co
import java.util.GregorianCalendar;
-import org.apache.chemistry.opencmis.commons.enums.TypeOfChanges;
+import org.apache.chemistry.opencmis.commons.enums.ChangeType;
-public interface ChangeEventInfoData extends ExtensionsData {
+public interface ChangeEventInfo extends ExtensionsData {
- TypeOfChanges getChangeType();
+ ChangeType getChangeType();
GregorianCalendar getChangeTime();
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ChangeEventInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectData.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectData.java Fri Apr 16 12:51:57 2010
@@ -49,7 +49,7 @@ public interface ObjectData extends Exte
*
* @return the properties or <code>null</code> if no properties are known
*/
- PropertiesData getProperties();
+ Properties getProperties();
/**
* Returns the allowable actions.
@@ -71,7 +71,7 @@ public interface ObjectData extends Exte
*
* @return the change event infos or <code>null</code> if the infos are unknown
*/
- ChangeEventInfoData getChangeEventInfo();
+ ChangeEventInfo getChangeEventInfo();
/**
* Returns the access control list.
@@ -93,7 +93,7 @@ public interface ObjectData extends Exte
*
* @return the policy ids or <code>null</code> if no policies are applied or the ids are unknown
*/
- PolicyIdListData getPolicyIds();
+ PolicyIdList getPolicyIds();
/**
* Returns the renditions of this object.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/ObjectService.java Fri Apr 16 12:51:57 2010
@@ -22,7 +22,7 @@ import java.math.BigInteger;
import java.util.List;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
/**
@@ -35,22 +35,22 @@ import org.apache.chemistry.opencmis.com
*/
public interface ObjectService {
- String createDocument(String repositoryId, PropertiesData properties, String folderId,
+ String createDocument(String repositoryId, Properties properties, String folderId,
ContentStream contentStream, VersioningState versioningState, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension);
- String createDocumentFromSource(String repositoryId, String sourceId, PropertiesData properties,
+ String createDocumentFromSource(String repositoryId, String sourceId, Properties properties,
String folderId, VersioningState versioningState, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension);
- String createFolder(String repositoryId, PropertiesData properties, String folderId,
+ String createFolder(String repositoryId, Properties properties, String folderId,
List<String> policies, Acl addAces, Acl removeAces,
ExtensionsData extension);
- String createRelationship(String repositoryId, PropertiesData properties, List<String> policies,
+ String createRelationship(String repositoryId, Properties properties, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension);
- String createPolicy(String repositoryId, PropertiesData properties, String folderId,
+ String createPolicy(String repositoryId, Properties properties, String folderId,
List<String> policies, Acl addAces, Acl removeAces,
ExtensionsData extension);
@@ -61,7 +61,7 @@ public interface ObjectService {
Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension);
- PropertiesData getProperties(String repositoryId, String objectId, String filter,
+ Properties getProperties(String repositoryId, String objectId, String filter,
ExtensionsData extension);
List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter,
@@ -75,7 +75,7 @@ public interface ObjectService {
BigInteger offset, BigInteger length, ExtensionsData extension);
void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
- PropertiesData properties, ExtensionsData extension);
+ Properties properties, ExtensionsData extension);
void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId,
String sourceFolderId, ExtensionsData extension);
@@ -84,7 +84,7 @@ public interface ObjectService {
ExtensionsData extension);
FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions,
- UnfileObjects unfileObjects, Boolean continueOnFailure, ExtensionsData extension);
+ UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension);
void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag,
Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension);
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdList.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdListData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdList.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdList.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdListData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdListData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdList.java Fri Apr 16 12:51:57 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-public interface PolicyIdListData extends ExtensionsData {
+public interface PolicyIdList extends ExtensionsData {
List<String> getPolicyIds();
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PolicyIdList.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/Properties.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertiesData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/Properties.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/Properties.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertiesData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertiesData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/Properties.java Fri Apr 16 12:51:57 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
import java.util.Map;
-public interface PropertiesData extends ExtensionsData {
+public interface Properties extends ExtensionsData {
Map<String, PropertyData<?>> getProperties();
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/Properties.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBoolean.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBooleanData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBoolean.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBoolean.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBooleanData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBooleanData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBoolean.java Fri Apr 16 12:51:57 2010
@@ -19,6 +19,6 @@
package org.apache.chemistry.opencmis.commons.api;
-public interface PropertyBooleanData extends PropertyData<Boolean> {
+public interface PropertyBoolean extends PropertyData<Boolean> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyBoolean.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTime.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTimeData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTime.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTime.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTimeData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTimeData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTime.java Fri Apr 16 12:51:57 2010
@@ -20,6 +20,6 @@ package org.apache.chemistry.opencmis.co
import java.util.GregorianCalendar;
-public interface PropertyDateTimeData extends PropertyData<GregorianCalendar> {
+public interface PropertyDateTime extends PropertyData<GregorianCalendar> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDateTime.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimal.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimalData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimal.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimal.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimalData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimalData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimal.java Fri Apr 16 12:51:57 2010
@@ -20,6 +20,6 @@ package org.apache.chemistry.opencmis.co
import java.math.BigDecimal;
-public interface PropertyDecimalData extends PropertyData<BigDecimal> {
+public interface PropertyDecimal extends PropertyData<BigDecimal> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyDecimal.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtml.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtmlData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtml.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtml.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtmlData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtmlData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtml.java Fri Apr 16 12:51:57 2010
@@ -18,6 +18,6 @@
*/
package org.apache.chemistry.opencmis.commons.api;
-public interface PropertyHtmlData extends PropertyData<String> {
+public interface PropertyHtml extends PropertyData<String> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyHtml.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyId.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIdData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyId.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyId.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIdData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIdData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyId.java Fri Apr 16 12:51:57 2010
@@ -18,6 +18,6 @@
*/
package org.apache.chemistry.opencmis.commons.api;
-public interface PropertyIdData extends PropertyData<String> {
+public interface PropertyId extends PropertyData<String> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyId.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyInteger.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIntegerData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyInteger.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyInteger.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIntegerData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyIntegerData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyInteger.java Fri Apr 16 12:51:57 2010
@@ -20,6 +20,6 @@ package org.apache.chemistry.opencmis.co
import java.math.BigInteger;
-public interface PropertyIntegerData extends PropertyData<BigInteger> {
+public interface PropertyInteger extends PropertyData<BigInteger> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyInteger.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyString.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyStringData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyString.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyString.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyStringData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyStringData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyString.java Fri Apr 16 12:51:57 2010
@@ -18,6 +18,6 @@
*/
package org.apache.chemistry.opencmis.commons.api;
-public interface PropertyStringData extends PropertyData<String> {
+public interface PropertyString extends PropertyData<String> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyString.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUri.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUriData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUri.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUri.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUriData.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUriData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUri.java Fri Apr 16 12:51:57 2010
@@ -19,6 +19,6 @@
package org.apache.chemistry.opencmis.commons.api;
-public interface PropertyUriData extends PropertyData<String> {
+public interface PropertyUri extends PropertyData<String> {
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/PropertyUri.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/VersioningService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/VersioningService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/VersioningService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/api/VersioningService.java Fri Apr 16 12:51:57 2010
@@ -37,7 +37,7 @@ public interface VersioningService {
public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension);
public void checkIn(String repositoryId, Holder<String> objectId, Boolean major,
- PropertiesData properties, ContentStream contentStream, String checkinComment,
+ Properties properties, ContentStream contentStream, String checkinComment,
List<String> policies, Acl addAces, Acl removeAces,
ExtensionsData extension);
@@ -46,7 +46,7 @@ public interface VersioningService {
IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
Boolean includeAcl, ExtensionsData extension);
- public PropertiesData getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId,
+ public Properties getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId,
Boolean major, String filter, ExtensionsData extension);
public List<ObjectData> getAllVersions(String repositoryId, String objectId,
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/AllowableActionsEnum.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/AllowableActionsEnum.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/AllowableActionsEnum.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java Fri Apr 16 12:51:57 2010
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.commons.enums;
-public enum AllowableActionsEnum {
+public enum Action {
CAN_DELETE_OBJECT("canDeleteObject"), //
CAN_UPDATE_PROPERTIES("canUpdateProperties"), //
@@ -52,7 +52,7 @@ public enum AllowableActionsEnum {
private final String value;
- AllowableActionsEnum(String v) {
+ Action(String v) {
value = v;
}
@@ -60,8 +60,8 @@ public enum AllowableActionsEnum {
return value;
}
- public static AllowableActionsEnum fromValue(String v) {
- for (AllowableActionsEnum c : AllowableActionsEnum.values()) {
+ public static Action fromValue(String v) {
+ for (Action c : Action.values()) {
if (c.value.equals(v)) {
return c;
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/Action.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/ChangeType.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/TypeOfChanges.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/ChangeType.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/ChangeType.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/TypeOfChanges.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/TypeOfChanges.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/ChangeType.java Fri Apr 16 12:51:57 2010
@@ -18,12 +18,12 @@
*/
package org.apache.chemistry.opencmis.commons.enums;
-public enum TypeOfChanges {
+public enum ChangeType {
CREATED("created"), UPDATED("updated"), DELETED("deleted"), SECURITY("security");
private final String value;
- TypeOfChanges(String v) {
+ ChangeType(String v) {
value = v;
}
@@ -31,8 +31,8 @@ public enum TypeOfChanges {
return value;
}
- public static TypeOfChanges fromValue(String v) {
- for (TypeOfChanges c : TypeOfChanges.values()) {
+ public static ChangeType fromValue(String v) {
+ for (ChangeType c : ChangeType.values()) {
if (c.value.equals(v)) {
return c;
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/ChangeType.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObject.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObjects.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObject.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObject.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObjects.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObjects.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObject.java Fri Apr 16 12:51:57 2010
@@ -20,16 +20,18 @@ package org.apache.chemistry.opencmis.co
/**
* Unfile Object Enum.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
-public enum UnfileObjects {
+public enum UnfileObject {
- UNFILE("unfile"), DELETESINGLEFILED("deletesinglefiled"), DELETE("delete");
+ UNFILE("unfile"), //
+ DELETESINGLEFILED("deletesinglefiled"), //
+ DELETE("delete");
private final String value;
- UnfileObjects(String v) {
+ UnfileObject(String v) {
value = v;
}
@@ -37,8 +39,8 @@ public enum UnfileObjects {
return value;
}
- public static UnfileObjects fromValue(String v) {
- for (UnfileObjects c : UnfileObjects.values()) {
+ public static UnfileObject fromValue(String v) {
+ for (UnfileObject c : UnfileObject.values()) {
if (c.value.equals(v)) {
return c;
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/enums/UnfileObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.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/Converter.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java Fri Apr 16 12:51:57 2010
@@ -58,26 +58,26 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
import org.apache.chemistry.opencmis.commons.api.PermissionDefinition;
import org.apache.chemistry.opencmis.commons.api.PermissionMapping;
-import org.apache.chemistry.opencmis.commons.api.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.api.PolicyIdList;
import org.apache.chemistry.opencmis.commons.api.PolicyTypeDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
-import org.apache.chemistry.opencmis.commons.api.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
+import org.apache.chemistry.opencmis.commons.api.PropertyBoolean;
import org.apache.chemistry.opencmis.commons.api.PropertyBooleanDefinition;
import org.apache.chemistry.opencmis.commons.api.PropertyData;
-import org.apache.chemistry.opencmis.commons.api.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDateTime;
import org.apache.chemistry.opencmis.commons.api.PropertyDateTimeDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDecimal;
import org.apache.chemistry.opencmis.commons.api.PropertyDecimalDefinition;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyHtmlData;
+import org.apache.chemistry.opencmis.commons.api.PropertyHtml;
import org.apache.chemistry.opencmis.commons.api.PropertyHtmlDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.api.PropertyId;
import org.apache.chemistry.opencmis.commons.api.PropertyIdDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.api.PropertyInteger;
import org.apache.chemistry.opencmis.commons.api.PropertyIntegerDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
import org.apache.chemistry.opencmis.commons.api.PropertyStringDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.api.PropertyUri;
import org.apache.chemistry.opencmis.commons.api.PropertyUriDefinition;
import org.apache.chemistry.opencmis.commons.api.RelationshipTypeDefinition;
import org.apache.chemistry.opencmis.commons.api.RenditionData;
@@ -87,7 +87,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
-import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
+import org.apache.chemistry.opencmis.commons.enums.Action;
import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
@@ -100,7 +100,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.enums.DateTimeResolution;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
import org.apache.chemistry.opencmis.commons.enums.SupportedPermissions;
-import org.apache.chemistry.opencmis.commons.enums.TypeOfChanges;
+import org.apache.chemistry.opencmis.commons.enums.ChangeType;
import org.apache.chemistry.opencmis.commons.enums.Updatability;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractPropertyData;
@@ -126,28 +126,28 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectParentDataImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionDefinitionDataImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionMappingDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyIdListDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyIdListImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyTypeDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriDefinitionImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RelationshipTypeDefinitionImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RenditionDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionContainerImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionListImpl;
@@ -289,7 +289,7 @@ public final class Converter {
return null;
}
- RepositoryCapabilitiesDataImpl result = new RepositoryCapabilitiesDataImpl();
+ RepositoryCapabilitiesImpl result = new RepositoryCapabilitiesImpl();
result.setAllVersionsSearchable(capabilities.isCapabilityAllVersionsSearchable());
result.setCapabilityAcl(convert(CapabilityAcl.class, capabilities.getCapabilityACL()));
@@ -1384,7 +1384,7 @@ public final class Converter {
changeEventInfo.setChangeTime(object.getChangeEventInfo().getChangeTime()
.toGregorianCalendar());
}
- changeEventInfo.setTypeOfChanges(convert(TypeOfChanges.class, object.getChangeEventInfo()
+ changeEventInfo.setChangeType(convert(ChangeType.class, object.getChangeEventInfo()
.getChangeType()));
convertExtension(object.getChangeEventInfo(), changeEventInfo);
@@ -1413,12 +1413,12 @@ public final class Converter {
/**
* Converts a properties object.
*/
- public static PropertiesData convert(CmisPropertiesType properties) {
+ public static Properties convert(CmisPropertiesType properties) {
if (properties == null) {
return null;
}
- PropertiesDataImpl result = new PropertiesDataImpl();
+ PropertiesImpl result = new PropertiesImpl();
for (CmisProperty property : properties.getProperty()) {
result.addProperty(convert(property));
@@ -1441,35 +1441,35 @@ public final class Converter {
PropertyData<?> result = null;
if (property instanceof CmisPropertyString) {
- result = new PropertyStringDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyStringImpl(property.getPropertyDefinitionId(),
((CmisPropertyString) property).getValue());
}
else if (property instanceof CmisPropertyId) {
- result = new PropertyIdDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyIdImpl(property.getPropertyDefinitionId(),
((CmisPropertyId) property).getValue());
}
else if (property instanceof CmisPropertyInteger) {
- result = new PropertyIntegerDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyIntegerImpl(property.getPropertyDefinitionId(),
((CmisPropertyInteger) property).getValue());
}
else if (property instanceof CmisPropertyDecimal) {
- result = new PropertyDecimalDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyDecimalImpl(property.getPropertyDefinitionId(),
((CmisPropertyDecimal) property).getValue());
}
else if (property instanceof CmisPropertyBoolean) {
- result = new PropertyBooleanDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyBooleanImpl(property.getPropertyDefinitionId(),
((CmisPropertyBoolean) property).getValue());
}
else if (property instanceof CmisPropertyDateTime) {
- result = new PropertyDateTimeDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyDateTimeImpl(property.getPropertyDefinitionId(),
convertXMLCalendar(((CmisPropertyDateTime) property).getValue()));
}
else if (property instanceof CmisPropertyHtml) {
- result = new PropertyHtmlDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyHtmlImpl(property.getPropertyDefinitionId(),
((CmisPropertyHtml) property).getValue());
}
else if (property instanceof CmisPropertyUri) {
- result = new PropertyUriDataImpl(property.getPropertyDefinitionId(),
+ result = new PropertyUriImpl(property.getPropertyDefinitionId(),
((CmisPropertyUri) property).getValue());
}
else {
@@ -1489,7 +1489,7 @@ public final class Converter {
/**
* Converts a properties object.
*/
- public static CmisPropertiesType convert(PropertiesData properties) {
+ public static CmisPropertiesType convert(Properties properties) {
if (properties == null) {
return null;
}
@@ -1518,41 +1518,41 @@ public final class Converter {
CmisProperty result = null;
- if (property instanceof PropertyStringData) {
+ if (property instanceof PropertyString) {
result = new CmisPropertyString();
- ((CmisPropertyString) result).getValue().addAll(((PropertyStringData) property).getValues());
+ ((CmisPropertyString) result).getValue().addAll(((PropertyString) property).getValues());
}
- else if (property instanceof PropertyIdData) {
+ else if (property instanceof PropertyId) {
result = new CmisPropertyId();
- ((CmisPropertyId) result).getValue().addAll(((PropertyIdData) property).getValues());
+ ((CmisPropertyId) result).getValue().addAll(((PropertyId) property).getValues());
}
- else if (property instanceof PropertyIntegerData) {
+ else if (property instanceof PropertyInteger) {
result = new CmisPropertyInteger();
((CmisPropertyInteger) result).getValue()
- .addAll(((PropertyIntegerData) property).getValues());
+ .addAll(((PropertyInteger) property).getValues());
}
- else if (property instanceof PropertyDecimalData) {
+ else if (property instanceof PropertyDecimal) {
result = new CmisPropertyDecimal();
((CmisPropertyDecimal) result).getValue()
- .addAll(((PropertyDecimalData) property).getValues());
+ .addAll(((PropertyDecimal) property).getValues());
}
- else if (property instanceof PropertyBooleanData) {
+ else if (property instanceof PropertyBoolean) {
result = new CmisPropertyBoolean();
((CmisPropertyBoolean) result).getValue()
- .addAll(((PropertyBooleanData) property).getValues());
+ .addAll(((PropertyBoolean) property).getValues());
}
- else if (property instanceof PropertyDateTimeData) {
+ else if (property instanceof PropertyDateTime) {
result = new CmisPropertyDateTime();
((CmisPropertyDateTime) result).getValue().addAll(
- convertCalendar(((PropertyDateTimeData) property).getValues()));
+ convertCalendar(((PropertyDateTime) property).getValues()));
}
- else if (property instanceof PropertyHtmlData) {
+ else if (property instanceof PropertyHtml) {
result = new CmisPropertyHtml();
- ((CmisPropertyHtml) result).getValue().addAll(((PropertyHtmlData) property).getValues());
+ ((CmisPropertyHtml) result).getValue().addAll(((PropertyHtml) property).getValues());
}
- else if (property instanceof PropertyUriData) {
+ else if (property instanceof PropertyUri) {
result = new CmisPropertyUri();
- ((CmisPropertyUri) result).getValue().addAll(((PropertyUriData) property).getValues());
+ ((CmisPropertyUri) result).getValue().addAll(((PropertyUri) property).getValues());
}
else {
return null;
@@ -1755,37 +1755,37 @@ public final class Converter {
AllowableActionsImpl result = new AllowableActionsImpl();
- Set<AllowableActionsEnum> set = EnumSet.noneOf(AllowableActionsEnum.class);
+ Set<Action> set = EnumSet.noneOf(Action.class);
- if(Boolean.TRUE.equals(allowableActions.isCanAddObjectToFolder())) { set.add(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER); }
- if(Boolean.TRUE.equals(allowableActions.isCanApplyACL())) { set.add(AllowableActionsEnum.CAN_APPLY_ACL); }
- if(Boolean.TRUE.equals(allowableActions.isCanApplyPolicy())) { set.add(AllowableActionsEnum.CAN_APPLY_POLICY); }
- if(Boolean.TRUE.equals(allowableActions.isCanCancelCheckOut())) { set.add(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT); }
- if(Boolean.TRUE.equals(allowableActions.isCanCheckIn())) { set.add(AllowableActionsEnum.CAN_CHECK_IN); }
- if(Boolean.TRUE.equals(allowableActions.isCanCheckOut())) { set.add(AllowableActionsEnum.CAN_CHECK_OUT); }
- if(Boolean.TRUE.equals(allowableActions.isCanCreateDocument())) { set.add(AllowableActionsEnum.CAN_CREATE_DOCUMENT); }
- if(Boolean.TRUE.equals(allowableActions.isCanCreateFolder())) { set.add(AllowableActionsEnum.CAN_CREATE_FOLDER); }
- if(Boolean.TRUE.equals(allowableActions.isCanCreateRelationship())) { set.add(AllowableActionsEnum.CAN_CREATE_RELATIONSHIP); }
- if(Boolean.TRUE.equals(allowableActions.isCanDeleteContentStream())) { set.add(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM); }
- if(Boolean.TRUE.equals(allowableActions.isCanDeleteObject())) { set.add(AllowableActionsEnum.CAN_DELETE_OBJECT); }
- if(Boolean.TRUE.equals(allowableActions.isCanDeleteTree())) { set.add(AllowableActionsEnum.CAN_DELETE_TREE); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetACL())) { set.add(AllowableActionsEnum.CAN_GET_ACL); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetAllVersions())) { set.add(AllowableActionsEnum.CAN_GET_ALL_VERSIONS); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetAppliedPolicies())) { set.add(AllowableActionsEnum.CAN_GET_APPLIED_POLICIES); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetChildren())) { set.add(AllowableActionsEnum.CAN_GET_CHILDREN); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetContentStream())) { set.add(AllowableActionsEnum.CAN_GET_CONTENT_STREAM); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetDescendants())) { set.add(AllowableActionsEnum.CAN_GET_DESCENDANTS); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetFolderParent())) { set.add(AllowableActionsEnum.CAN_GET_FOLDER_PARENT); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetFolderTree())) { set.add(AllowableActionsEnum.CAN_GET_FOLDER_TREE); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetObjectParents())) { set.add(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetObjectRelationships())) { set.add(AllowableActionsEnum.CAN_GET_OBJECT_RELATIONSHIPS); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetProperties())) { set.add(AllowableActionsEnum.CAN_GET_PROPERTIES); }
- if(Boolean.TRUE.equals(allowableActions.isCanGetRenditions())) { set.add(AllowableActionsEnum.CAN_GET_RENDITIONS); }
- if(Boolean.TRUE.equals(allowableActions.isCanMoveObject())) { set.add(AllowableActionsEnum.CAN_MOVE_OBJECT); }
- if(Boolean.TRUE.equals(allowableActions.isCanRemoveObjectFromFolder())) { set.add(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER); }
- if(Boolean.TRUE.equals(allowableActions.isCanRemovePolicy())) { set.add(AllowableActionsEnum.CAN_REMOVE_POLICY); }
- if(Boolean.TRUE.equals(allowableActions.isCanSetContentStream())) { set.add(AllowableActionsEnum.CAN_SET_CONTENT_STREAM); }
- if(Boolean.TRUE.equals(allowableActions.isCanUpdateProperties())) { set.add(AllowableActionsEnum.CAN_UPDATE_PROPERTIES); }
+ if(Boolean.TRUE.equals(allowableActions.isCanAddObjectToFolder())) { set.add(Action.CAN_ADD_OBJECT_TO_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanApplyACL())) { set.add(Action.CAN_APPLY_ACL); }
+ if(Boolean.TRUE.equals(allowableActions.isCanApplyPolicy())) { set.add(Action.CAN_APPLY_POLICY); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCancelCheckOut())) { set.add(Action.CAN_CANCEL_CHECK_OUT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCheckIn())) { set.add(Action.CAN_CHECK_IN); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCheckOut())) { set.add(Action.CAN_CHECK_OUT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateDocument())) { set.add(Action.CAN_CREATE_DOCUMENT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateFolder())) { set.add(Action.CAN_CREATE_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateRelationship())) { set.add(Action.CAN_CREATE_RELATIONSHIP); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteContentStream())) { set.add(Action.CAN_DELETE_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteObject())) { set.add(Action.CAN_DELETE_OBJECT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteTree())) { set.add(Action.CAN_DELETE_TREE); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetACL())) { set.add(Action.CAN_GET_ACL); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetAllVersions())) { set.add(Action.CAN_GET_ALL_VERSIONS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetAppliedPolicies())) { set.add(Action.CAN_GET_APPLIED_POLICIES); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetChildren())) { set.add(Action.CAN_GET_CHILDREN); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetContentStream())) { set.add(Action.CAN_GET_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetDescendants())) { set.add(Action.CAN_GET_DESCENDANTS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetFolderParent())) { set.add(Action.CAN_GET_FOLDER_PARENT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetFolderTree())) { set.add(Action.CAN_GET_FOLDER_TREE); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetObjectParents())) { set.add(Action.CAN_GET_OBJECT_PARENTS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetObjectRelationships())) { set.add(Action.CAN_GET_OBJECT_RELATIONSHIPS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetProperties())) { set.add(Action.CAN_GET_PROPERTIES); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetRenditions())) { set.add(Action.CAN_GET_RENDITIONS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanMoveObject())) { set.add(Action.CAN_MOVE_OBJECT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanRemoveObjectFromFolder())) { set.add(Action.CAN_REMOVE_OBJECT_FROM_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanRemovePolicy())) { set.add(Action.CAN_REMOVE_POLICY); }
+ if(Boolean.TRUE.equals(allowableActions.isCanSetContentStream())) { set.add(Action.CAN_SET_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanUpdateProperties())) { set.add(Action.CAN_UPDATE_PROPERTIES); }
result.setAllowableActions(set);
@@ -1806,37 +1806,37 @@ public final class Converter {
CmisAllowableActionsType result = new CmisAllowableActionsType();
if (allowableActions.getAllowableActions() != null) {
- Set<AllowableActionsEnum> set = allowableActions.getAllowableActions();
+ Set<Action> set = allowableActions.getAllowableActions();
- result.setCanAddObjectToFolder(set.contains(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER));
- result.setCanApplyACL(set.contains(AllowableActionsEnum.CAN_APPLY_ACL));
- result.setCanApplyPolicy(set.contains(AllowableActionsEnum.CAN_APPLY_POLICY));
- result.setCanCancelCheckOut(set.contains(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT));
- result.setCanCheckIn(set.contains(AllowableActionsEnum.CAN_CHECK_IN));
- result.setCanCheckOut(set.contains(AllowableActionsEnum.CAN_CHECK_OUT));
- result.setCanCreateDocument(set.contains(AllowableActionsEnum.CAN_CREATE_DOCUMENT));
- result.setCanCreateFolder(set.contains(AllowableActionsEnum.CAN_CREATE_FOLDER));
- result.setCanCreateRelationship(set.contains(AllowableActionsEnum.CAN_CREATE_RELATIONSHIP));
- result.setCanDeleteContentStream(set.contains(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM));
- result.setCanDeleteObject(set.contains(AllowableActionsEnum.CAN_DELETE_OBJECT));
- result.setCanDeleteTree(set.contains(AllowableActionsEnum.CAN_DELETE_TREE));
- result.setCanGetACL(set.contains(AllowableActionsEnum.CAN_GET_ACL));
- result.setCanGetAllVersions(set.contains(AllowableActionsEnum.CAN_GET_ALL_VERSIONS));
- result.setCanGetAppliedPolicies(set.contains(AllowableActionsEnum.CAN_GET_APPLIED_POLICIES));
- result.setCanGetChildren(set.contains(AllowableActionsEnum.CAN_GET_CHILDREN));
- result.setCanGetContentStream(set.contains(AllowableActionsEnum.CAN_GET_CONTENT_STREAM));
- result.setCanGetDescendants(set.contains(AllowableActionsEnum.CAN_GET_DESCENDANTS));
- result.setCanGetFolderParent(set.contains(AllowableActionsEnum.CAN_GET_FOLDER_PARENT));
- result.setCanGetFolderTree(set.contains(AllowableActionsEnum.CAN_GET_FOLDER_TREE));
- result.setCanGetObjectParents(set.contains(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS));
- result.setCanGetObjectRelationships(set.contains(AllowableActionsEnum.CAN_GET_OBJECT_RELATIONSHIPS));
- result.setCanGetProperties(set.contains(AllowableActionsEnum.CAN_GET_PROPERTIES));
- result.setCanGetRenditions(set.contains(AllowableActionsEnum.CAN_GET_RENDITIONS));
- result.setCanMoveObject(set.contains(AllowableActionsEnum.CAN_MOVE_OBJECT));
- result.setCanRemoveObjectFromFolder(set.contains(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER));
- result.setCanRemovePolicy(set.contains(AllowableActionsEnum.CAN_REMOVE_POLICY));
- result.setCanSetContentStream(set.contains(AllowableActionsEnum.CAN_SET_CONTENT_STREAM));
- result.setCanUpdateProperties(set.contains(AllowableActionsEnum.CAN_UPDATE_PROPERTIES));
+ result.setCanAddObjectToFolder(set.contains(Action.CAN_ADD_OBJECT_TO_FOLDER));
+ result.setCanApplyACL(set.contains(Action.CAN_APPLY_ACL));
+ result.setCanApplyPolicy(set.contains(Action.CAN_APPLY_POLICY));
+ result.setCanCancelCheckOut(set.contains(Action.CAN_CANCEL_CHECK_OUT));
+ result.setCanCheckIn(set.contains(Action.CAN_CHECK_IN));
+ result.setCanCheckOut(set.contains(Action.CAN_CHECK_OUT));
+ result.setCanCreateDocument(set.contains(Action.CAN_CREATE_DOCUMENT));
+ result.setCanCreateFolder(set.contains(Action.CAN_CREATE_FOLDER));
+ result.setCanCreateRelationship(set.contains(Action.CAN_CREATE_RELATIONSHIP));
+ result.setCanDeleteContentStream(set.contains(Action.CAN_DELETE_CONTENT_STREAM));
+ result.setCanDeleteObject(set.contains(Action.CAN_DELETE_OBJECT));
+ result.setCanDeleteTree(set.contains(Action.CAN_DELETE_TREE));
+ result.setCanGetACL(set.contains(Action.CAN_GET_ACL));
+ result.setCanGetAllVersions(set.contains(Action.CAN_GET_ALL_VERSIONS));
+ result.setCanGetAppliedPolicies(set.contains(Action.CAN_GET_APPLIED_POLICIES));
+ result.setCanGetChildren(set.contains(Action.CAN_GET_CHILDREN));
+ result.setCanGetContentStream(set.contains(Action.CAN_GET_CONTENT_STREAM));
+ result.setCanGetDescendants(set.contains(Action.CAN_GET_DESCENDANTS));
+ result.setCanGetFolderParent(set.contains(Action.CAN_GET_FOLDER_PARENT));
+ result.setCanGetFolderTree(set.contains(Action.CAN_GET_FOLDER_TREE));
+ result.setCanGetObjectParents(set.contains(Action.CAN_GET_OBJECT_PARENTS));
+ result.setCanGetObjectRelationships(set.contains(Action.CAN_GET_OBJECT_RELATIONSHIPS));
+ result.setCanGetProperties(set.contains(Action.CAN_GET_PROPERTIES));
+ result.setCanGetRenditions(set.contains(Action.CAN_GET_RENDITIONS));
+ result.setCanMoveObject(set.contains(Action.CAN_MOVE_OBJECT));
+ result.setCanRemoveObjectFromFolder(set.contains(Action.CAN_REMOVE_OBJECT_FROM_FOLDER));
+ result.setCanRemovePolicy(set.contains(Action.CAN_REMOVE_POLICY));
+ result.setCanSetContentStream(set.contains(Action.CAN_SET_CONTENT_STREAM));
+ result.setCanUpdateProperties(set.contains(Action.CAN_UPDATE_PROPERTIES));
}
@@ -1849,12 +1849,12 @@ public final class Converter {
/**
* Converts a list of policy ids.
*/
- public static PolicyIdListData convert(CmisListOfIdsType policyIds) {
+ public static PolicyIdList convert(CmisListOfIdsType policyIds) {
if (policyIds == null) {
return null;
}
- PolicyIdListDataImpl result = new PolicyIdListDataImpl();
+ PolicyIdListImpl result = new PolicyIdListImpl();
result.setPolicyIds(policyIds.getId());
// handle extensions
@@ -1866,7 +1866,7 @@ public final class Converter {
/**
* Converts a list of policy ids.
*/
- public static CmisListOfIdsType convert(PolicyIdListData policyIds) {
+ public static CmisListOfIdsType convert(PolicyIdList policyIds) {
if (policyIds == null) {
return null;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.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/UrlBuilder.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java Fri Apr 16 12:51:57 2010
@@ -24,7 +24,7 @@ import java.net.URLEncoder;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
/**
@@ -173,8 +173,8 @@ public class UrlBuilder {
else if (value instanceof VersioningState) {
return ((VersioningState) value).value();
}
- else if (value instanceof UnfileObjects) {
- return ((UnfileObjects) value).value();
+ else if (value instanceof UnfileObject) {
+ return ((UnfileObject) value).value();
}
else if (value instanceof RelationshipDirection) {
return ((RelationshipDirection) value).value();
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.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/dataobjects/AllowableActionsImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java Fri Apr 16 12:51:57 2010
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.chemistry.opencmis.commons.api.AllowableActions;
-import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
+import org.apache.chemistry.opencmis.commons.enums.Action;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
@@ -30,18 +30,18 @@ import org.apache.chemistry.opencmis.com
*/
public class AllowableActionsImpl extends AbstractExtensionData implements AllowableActions {
- private Set<AllowableActionsEnum> allowableActions = new HashSet<AllowableActionsEnum>();
+ private Set<Action> allowableActions = new HashSet<Action>();
/*
* (non-Javadoc)
*
* @see org.apache.opencmis.client.provider.AllowableActionsData#getAllowableActions()
*/
- public Set<AllowableActionsEnum> getAllowableActions() {
+ public Set<Action> getAllowableActions() {
return allowableActions;
}
- public void setAllowableActions(Set<AllowableActionsEnum> allowableActions) {
+ public void setAllowableActions(Set<Action> allowableActions) {
this.allowableActions = allowableActions;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.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/dataobjects/BindingsObjectFactoryImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java Fri Apr 16 12:51:57 2010
@@ -29,16 +29,16 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.Acl;
import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
import org.apache.chemistry.opencmis.commons.api.ContentStream;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
-import org.apache.chemistry.opencmis.commons.api.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
+import org.apache.chemistry.opencmis.commons.api.PropertyBoolean;
import org.apache.chemistry.opencmis.commons.api.PropertyData;
-import org.apache.chemistry.opencmis.commons.api.PropertyDateTimeData;
-import org.apache.chemistry.opencmis.commons.api.PropertyDecimalData;
-import org.apache.chemistry.opencmis.commons.api.PropertyHtmlData;
-import org.apache.chemistry.opencmis.commons.api.PropertyIdData;
-import org.apache.chemistry.opencmis.commons.api.PropertyIntegerData;
-import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
-import org.apache.chemistry.opencmis.commons.api.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDateTime;
+import org.apache.chemistry.opencmis.commons.api.PropertyDecimal;
+import org.apache.chemistry.opencmis.commons.api.PropertyHtml;
+import org.apache.chemistry.opencmis.commons.api.PropertyId;
+import org.apache.chemistry.opencmis.commons.api.PropertyInteger;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
+import org.apache.chemistry.opencmis.commons.api.PropertyUri;
/**
* CMIS binding object factory implementation.
@@ -66,71 +66,71 @@ public class BindingsObjectFactoryImpl i
return new ContentStreamImpl(filename, length, mimetype, stream);
}
- public PropertiesData createPropertiesData(List<PropertyData<?>> properties) {
- return new PropertiesDataImpl(properties);
+ public Properties createPropertiesData(List<PropertyData<?>> properties) {
+ return new PropertiesImpl(properties);
}
- public PropertyBooleanData createPropertyBooleanData(String id, List<Boolean> values) {
- return new PropertyBooleanDataImpl(id, values);
+ public PropertyBoolean createPropertyBooleanData(String id, List<Boolean> values) {
+ return new PropertyBooleanImpl(id, values);
}
- public PropertyBooleanData createPropertyBooleanData(String id, Boolean value) {
- return new PropertyBooleanDataImpl(id, value);
+ public PropertyBoolean createPropertyBooleanData(String id, Boolean value) {
+ return new PropertyBooleanImpl(id, value);
}
- public PropertyDateTimeData createPropertyDateTimeData(String id, List<GregorianCalendar> values) {
- return new PropertyDateTimeDataImpl(id, values);
+ public PropertyDateTime createPropertyDateTimeData(String id, List<GregorianCalendar> values) {
+ return new PropertyDateTimeImpl(id, values);
}
- public PropertyDateTimeData createPropertyDateTimeData(String id, GregorianCalendar value) {
- return new PropertyDateTimeDataImpl(id, value);
+ public PropertyDateTime createPropertyDateTimeData(String id, GregorianCalendar value) {
+ return new PropertyDateTimeImpl(id, value);
}
- public PropertyDecimalData createPropertyDecimalData(String id, List<BigDecimal> values) {
- return new PropertyDecimalDataImpl(id, values);
+ public PropertyDecimal createPropertyDecimalData(String id, List<BigDecimal> values) {
+ return new PropertyDecimalImpl(id, values);
}
- public PropertyDecimalData createPropertyDecimalData(String id, BigDecimal value) {
- return new PropertyDecimalDataImpl(id, value);
+ public PropertyDecimal createPropertyDecimalData(String id, BigDecimal value) {
+ return new PropertyDecimalImpl(id, value);
}
- public PropertyHtmlData createPropertyHtmlData(String id, List<String> values) {
- return new PropertyHtmlDataImpl(id, values);
+ public PropertyHtml createPropertyHtmlData(String id, List<String> values) {
+ return new PropertyHtmlImpl(id, values);
}
- public PropertyHtmlData createPropertyHtmlData(String id, String value) {
- return new PropertyHtmlDataImpl(id, value);
+ public PropertyHtml createPropertyHtmlData(String id, String value) {
+ return new PropertyHtmlImpl(id, value);
}
- public PropertyIdData createPropertyIdData(String id, List<String> values) {
- return new PropertyIdDataImpl(id, values);
+ public PropertyId createPropertyIdData(String id, List<String> values) {
+ return new PropertyIdImpl(id, values);
}
- public PropertyIdData createPropertyIdData(String id, String value) {
- return new PropertyIdDataImpl(id, value);
+ public PropertyId createPropertyIdData(String id, String value) {
+ return new PropertyIdImpl(id, value);
}
- public PropertyIntegerData createPropertyIntegerData(String id, List<BigInteger> values) {
- return new PropertyIntegerDataImpl(id, values);
+ public PropertyInteger createPropertyIntegerData(String id, List<BigInteger> values) {
+ return new PropertyIntegerImpl(id, values);
}
- public PropertyIntegerData createPropertyIntegerData(String id, BigInteger value) {
- return new PropertyIntegerDataImpl(id, value);
+ public PropertyInteger createPropertyIntegerData(String id, BigInteger value) {
+ return new PropertyIntegerImpl(id, value);
}
- public PropertyStringData createPropertyStringData(String id, List<String> values) {
- return new PropertyStringDataImpl(id, values);
+ public PropertyString createPropertyStringData(String id, List<String> values) {
+ return new PropertyStringImpl(id, values);
}
- public PropertyStringData createPropertyStringData(String id, String value) {
- return new PropertyStringDataImpl(id, value);
+ public PropertyString createPropertyStringData(String id, String value) {
+ return new PropertyStringImpl(id, value);
}
- public PropertyUriData createPropertyUriData(String id, List<String> values) {
- return new PropertyUriDataImpl(id, values);
+ public PropertyUri createPropertyUriData(String id, List<String> values) {
+ return new PropertyUriImpl(id, values);
}
- public PropertyUriData createPropertyUriData(String id, String value) {
- return new PropertyUriDataImpl(id, value);
+ public PropertyUri createPropertyUriData(String id, String value) {
+ return new PropertyUriImpl(id, value);
}
}