Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/PolicyService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/PolicyService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/PolicyService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/PolicyService.java Thu Aug 13 12:05:59 2015 @@ -45,6 +45,7 @@ public class PolicyService { * getAppliedPolicies. */ public static class GetAppliedPolicies extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -88,6 +89,7 @@ public class PolicyService { * applyPolicy. */ public static class ApplyPolicy extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -135,6 +137,7 @@ public class PolicyService { * removePolicy. */ public static class RemovePolicy extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RelationshipService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RelationshipService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RelationshipService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RelationshipService.java Thu Aug 13 12:05:59 2015 @@ -48,6 +48,7 @@ public class RelationshipService { * getObjectRelationships. */ public static class GetObjectRelationships extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java Thu Aug 13 12:05:59 2015 @@ -60,6 +60,7 @@ public class RepositoryService { * getRepositories. */ public static class GetRepositories extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -95,6 +96,7 @@ public class RepositoryService { * getRepositoryInfo. */ public static class GetRepositoryInfo extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -129,6 +131,7 @@ public class RepositoryService { * getLastResult. */ public static class GetLastResult extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -172,6 +175,7 @@ public class RepositoryService { * getTypeChildren. */ public static class GetTypeChildren extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -207,6 +211,7 @@ public class RepositoryService { } public static class GetTypeDescendants extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -251,6 +256,7 @@ public class RepositoryService { * getTypeDefinition. */ public static class GetTypeDefinition extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -285,6 +291,7 @@ public class RepositoryService { * createType. */ public static class CreateType extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -336,6 +343,7 @@ public class RepositoryService { * updateType. */ public static class UpdateType extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -384,6 +392,7 @@ public class RepositoryService { * deleteType. */ public static class DeleteType extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ServerTypeCacheImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ServerTypeCacheImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ServerTypeCacheImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ServerTypeCacheImpl.java Thu Aug 13 12:05:59 2015 @@ -48,6 +48,7 @@ public class ServerTypeCacheImpl impleme objectToTypeDefinitions = new HashMap<String, TypeDefinition>(); } + @Override public TypeDefinition getTypeDefinition(String typeId) { TypeDefinition type = typeDefinitions.get(typeId); if (type == null) { @@ -60,6 +61,7 @@ public class ServerTypeCacheImpl impleme return type; } + @Override public TypeDefinition reloadTypeDefinition(String typeId) { TypeDefinition type = service.getTypeDefinition(repositoryId, typeId, null); if (type != null) { @@ -69,6 +71,7 @@ public class ServerTypeCacheImpl impleme return type; } + @Override public TypeDefinition getTypeDefinitionForObject(String objectId) { TypeDefinition type = objectToTypeDefinitions.get(objectId); if (type == null) { @@ -102,6 +105,7 @@ public class ServerTypeCacheImpl impleme return type; } + @Override public PropertyDefinition<?> getPropertyDefinition(String propId) { for (TypeDefinition typeDef : typeDefinitions.values()) { PropertyDefinition<?> propDef = typeDef.getPropertyDefinitions().get(propId); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java Thu Aug 13 12:05:59 2015 @@ -52,6 +52,7 @@ public class VersioningService { * checkOut. */ public static class CheckOut extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -103,6 +104,7 @@ public class VersioningService { * checkOut. */ public static class CancelCheckOut extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -134,6 +136,7 @@ public class VersioningService { * checkIn. */ public static class CheckIn extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; @@ -195,6 +198,7 @@ public class VersioningService { * getAllVersions. */ public static class GetAllVersions extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { assert context != null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java Thu Aug 13 12:05:59 2015 @@ -66,6 +66,7 @@ public abstract class AbstractSimpleToke private static final UrlServiceCall URL_SERVICE_CALL = new UrlServiceCall(); + @Override public void service(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response) { String repositoryId = null; // TODO: determine repository id @@ -401,6 +402,7 @@ public abstract class AbstractSimpleToke } static class UrlServiceCall extends AbstractBrowserServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { // no implementation Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/TokenCallContextHandler.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/TokenCallContextHandler.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/TokenCallContextHandler.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/TokenCallContextHandler.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class TokenCallContextHandler ext tokenHandler = new SimpleTokenHandler(); } + @Override public Map<String, String> getCallContextMap(HttpServletRequest request) { Map<String, String> result = new HashMap<String, String>(); @@ -80,6 +81,7 @@ public class TokenCallContextHandler ext return result; } + @Override public void service(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response) { tokenHandler.service(servletContext, request, response); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class AclService extends Abstract @Resource public WebServiceContext wsContext; + @Override public CmisACLType applyACL(String repositoryId, String objectId, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, EnumACLPropagation aclPropagation, CmisExtensionType extension) throws CmisException { @@ -78,6 +79,7 @@ public class AclService extends Abstract } } + @Override public CmisACLType getACL(String repositoryId, String objectId, Boolean onlyBasicPermissions, CmisExtensionType extension) throws CmisException { CmisService service = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/DiscoveryService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/DiscoveryService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/DiscoveryService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/DiscoveryService.java Thu Aug 13 12:05:59 2015 @@ -49,6 +49,7 @@ public class DiscoveryService extends Ab @Resource public WebServiceContext wsContext; + @Override public void getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties, String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, CmisExtensionType extension, Holder<CmisObjectListType> objects) throws CmisException { @@ -83,6 +84,7 @@ public class DiscoveryService extends Ab } } + @Override public CmisObjectListType query(String repositoryId, String statement, Boolean searchAllVersions, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/MultiFilingService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/MultiFilingService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/MultiFilingService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/MultiFilingService.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public class MultiFilingService extends @Resource public WebServiceContext wsContext; + @Override public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -68,6 +69,7 @@ public class MultiFilingService extends } } + @Override public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java Thu Aug 13 12:05:59 2015 @@ -56,6 +56,7 @@ public class NavigationService extends A @Resource public WebServiceContext wsContext; + @Override public CmisObjectListType getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { @@ -85,6 +86,7 @@ public class NavigationService extends A } } + @Override public CmisObjectInFolderListType getChildren(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) @@ -115,6 +117,7 @@ public class NavigationService extends A } } + @Override public List<CmisObjectInFolderContainerType> getDescendants(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, CmisExtensionType extension) throws CmisException { @@ -152,6 +155,7 @@ public class NavigationService extends A } } + @Override public CmisObjectType getFolderParent(String repositoryId, String folderId, String filter, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -178,6 +182,7 @@ public class NavigationService extends A } } + @Override public List<CmisObjectInFolderContainerType> getFolderTree(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, CmisExtensionType extension) throws CmisException { @@ -215,6 +220,7 @@ public class NavigationService extends A } } + @Override public List<CmisObjectParentsType> getObjectParents(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includeRelativePathSegment, CmisExtensionType extension) throws CmisException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java Thu Aug 13 12:05:59 2015 @@ -73,6 +73,7 @@ public class ObjectService extends Abstr @Resource public WebServiceContext wsContext; + @Override public void createDocument(String repositoryId, CmisPropertiesType properties, String folderId, CmisContentStreamType contentStream, EnumVersioningState versioningState, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, @@ -109,6 +110,7 @@ public class ObjectService extends Abstr } } + @Override public void createDocumentFromSource(String repositoryId, String sourceId, CmisPropertiesType properties, String folderId, EnumVersioningState versioningState, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, @@ -143,6 +145,7 @@ public class ObjectService extends Abstr } } + @Override public void createFolder(String repositoryId, CmisPropertiesType properties, String folderId, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { @@ -175,6 +178,7 @@ public class ObjectService extends Abstr } } + @Override public void createPolicy(String repositoryId, CmisPropertiesType properties, String folderId, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { @@ -207,6 +211,7 @@ public class ObjectService extends Abstr } } + @Override public void createRelationship(String repositoryId, CmisPropertiesType properties, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { @@ -239,6 +244,7 @@ public class ObjectService extends Abstr } } + @Override public void createItem(String repositoryId, CmisPropertiesType properties, String folderId, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { @@ -271,6 +277,7 @@ public class ObjectService extends Abstr } } + @Override public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -301,6 +308,7 @@ public class ObjectService extends Abstr } } + @Override public void deleteObject(String repositoryId, String objectId, Boolean allVersions, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -327,6 +335,7 @@ public class ObjectService extends Abstr } } + @Override public FailedToDelete deleteTree(String repositoryId, String folderId, Boolean allVersions, EnumUnfileObject unfileObjects, Boolean continueOnFailure, CmisExtensionType extension) throws CmisException { @@ -353,6 +362,7 @@ public class ObjectService extends Abstr } } + @Override public CmisAllowableActionsType getAllowableActions(String repositoryId, String objectId, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -379,6 +389,7 @@ public class ObjectService extends Abstr } } + @Override public CmisContentStreamType getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset, BigInteger length, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -404,6 +415,7 @@ public class ObjectService extends Abstr } } + @Override public CmisObjectType getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) throws CmisException { @@ -433,6 +445,7 @@ public class ObjectService extends Abstr } } + @Override public CmisObjectType getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) throws CmisException { @@ -462,6 +475,7 @@ public class ObjectService extends Abstr } } + @Override public CmisPropertiesType getProperties(String repositoryId, String objectId, String filter, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -486,6 +500,7 @@ public class ObjectService extends Abstr } } + @Override public List<CmisRenditionType> getRenditions(String repositoryId, String objectId, String renditionFilter, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -519,6 +534,7 @@ public class ObjectService extends Abstr } } + @Override public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -547,6 +563,7 @@ public class ObjectService extends Abstr } } + @Override public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag, Holder<String> changeToken, CmisContentStreamType contentStream, Holder<CmisExtensionType> extension) throws CmisException { @@ -581,6 +598,7 @@ public class ObjectService extends Abstr } } + @Override public void appendContentStream(String repositoryId, Holder<String> objectId, Boolean isLastChunk, Holder<String> changeToken, CmisContentStreamType contentStream, Holder<CmisExtensionType> extension) throws CmisException { @@ -615,6 +633,7 @@ public class ObjectService extends Abstr } } + @Override public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken, CmisPropertiesType properties, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -645,6 +664,7 @@ public class ObjectService extends Abstr } } + @Override public void bulkUpdateProperties(String repositoryId, CmisBulkUpdateType bulkUpdateData, Holder<CmisExtensionType> extension, Holder<CmisObjectIdAndChangeTokenType> objectIdAndChangeToken) throws CmisException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService10.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService10.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService10.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService10.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ import org.apache.chemistry.opencmis.com @WebService(endpointInterface = "org.apache.chemistry.opencmis.server.impl.webservices.ObjectServicePort10") public class ObjectService10 extends ObjectService implements ObjectServicePort10 { + @Override @WebMethod(exclude = true) public void createItem(String repositoryId, CmisPropertiesType properties, String folderId, CmisAccessControlListType addACEs, CmisAccessControlListType removeACEs, @@ -54,6 +55,7 @@ public class ObjectService10 extends Obj throw new CmisException(fault.getMessage(), fault); } + @Override @WebMethod(exclude = true) public void bulkUpdateProperties(String repositoryId, CmisBulkUpdateType bulkUpdateData, Holder<CmisExtensionType> extension, Holder<CmisObjectIdAndChangeTokenType> objectIdAndChangeToken) @@ -66,6 +68,7 @@ public class ObjectService10 extends Obj throw new CmisException(fault.getMessage(), fault); } + @Override @WebMethod(exclude = true) public void appendContentStream(String repositoryId, Holder<String> objectId, Boolean isLastChunk, Holder<String> changeToken, CmisContentStreamType contentStream, Holder<CmisExtensionType> extension) Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java Thu Aug 13 12:05:59 2015 @@ -49,6 +49,7 @@ public class PolicyService extends Abstr @Resource public WebServiceContext wsContext; + @Override public void applyPolicy(String repositoryId, String policyId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -75,6 +76,7 @@ public class PolicyService extends Abstr } } + @Override public List<CmisObjectType> getAppliedPolicies(String repositoryId, String objectId, String filter, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -110,6 +112,7 @@ public class PolicyService extends Abstr } } + @Override public void removePolicy(String repositoryId, String policyId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ProtectionRequestWrapper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ProtectionRequestWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ProtectionRequestWrapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ProtectionRequestWrapper.java Thu Aug 13 12:05:59 2015 @@ -234,7 +234,7 @@ public class ProtectionRequestWrapper ex expandBuffer(1); } - linebuffer[pos++] = (byte) b; + linebuffer[pos++] = b; if (b == LF) { checkBoundary(pos - 1); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java Thu Aug 13 12:05:59 2015 @@ -46,6 +46,7 @@ public class RelationshipService extends @Resource public WebServiceContext wsContext; + @Override public CmisObjectListType getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes, EnumRelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions, BigInteger maxItems, BigInteger skipCount, Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java Thu Aug 13 12:05:59 2015 @@ -58,6 +58,7 @@ public class RepositoryService extends A @Resource public WebServiceContext wsContext; + @Override public List<CmisRepositoryEntryType> getRepositories(CmisExtensionType extension) throws CmisException { CmisService service = null; try { @@ -94,6 +95,7 @@ public class RepositoryService extends A } } + @Override public CmisRepositoryInfoType getRepositoryInfo(String repositoryId, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -120,6 +122,7 @@ public class RepositoryService extends A } } + @Override public CmisTypeDefinitionListType getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { @@ -146,6 +149,7 @@ public class RepositoryService extends A } } + @Override public CmisTypeDefinitionType getTypeDefinition(String repositoryId, String typeId, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -170,6 +174,7 @@ public class RepositoryService extends A } } + @Override public List<CmisTypeContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth, Boolean includePropertyDefinitions, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -198,6 +203,7 @@ public class RepositoryService extends A } } + @Override public void createType(String repositoryId, Holder<CmisTypeDefinitionType> type, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -222,6 +228,7 @@ public class RepositoryService extends A } } + @Override public void updateType(String repositoryId, Holder<CmisTypeDefinitionType> type, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -246,6 +253,7 @@ public class RepositoryService extends A } } + @Override public void deleteType(String repositoryId, String typeId, Holder<CmisExtensionType> extension) throws CmisException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService10.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService10.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService10.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService10.java Thu Aug 13 12:05:59 2015 @@ -38,6 +38,7 @@ import org.apache.chemistry.opencmis.com @WebService(endpointInterface = "org.apache.chemistry.opencmis.server.impl.webservices.RepositoryServicePort10") public class RepositoryService10 extends RepositoryService implements RepositoryServicePort10 { + @Override @WebMethod(exclude = true) public void createType(String repositoryId, Holder<CmisTypeDefinitionType> type, CmisExtensionType extension) throws CmisException { @@ -49,6 +50,7 @@ public class RepositoryService10 extends throw new CmisException(fault.getMessage(), fault); } + @Override @WebMethod(exclude = true) public void updateType(String repositoryId, Holder<CmisTypeDefinitionType> type, CmisExtensionType extension) throws CmisException { @@ -60,6 +62,7 @@ public class RepositoryService10 extends throw new CmisException(fault.getMessage(), fault); } + @Override @WebMethod(exclude = true) public void deleteType(String repositoryId, String typeId, Holder<CmisExtensionType> extension) throws CmisException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/SoapActionRemoveInterceptor.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/SoapActionRemoveInterceptor.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/SoapActionRemoveInterceptor.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/SoapActionRemoveInterceptor.java Thu Aug 13 12:05:59 2015 @@ -23,7 +23,6 @@ import java.util.Iterator; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor; import org.apache.cxf.binding.soap.interceptor.SoapActionInInterceptor; -import org.apache.cxf.interceptor.Fault; import org.apache.cxf.interceptor.Interceptor; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; @@ -40,7 +39,7 @@ public class SoapActionRemoveInterceptor } @Override - public void handleMessage(SoapMessage message) throws Fault { + public void handleMessage(SoapMessage message) { Interceptor<? extends Message> soapActionInInterceptor = null; Iterator<Interceptor<? extends Message>> iterator = message.getInterceptorChain().getIterator(); while (iterator.hasNext()) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/UsernameTokenInterceptor.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/UsernameTokenInterceptor.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/UsernameTokenInterceptor.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/UsernameTokenInterceptor.java Thu Aug 13 12:05:59 2015 @@ -28,7 +28,6 @@ import org.apache.chemistry.opencmis.com import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor; import org.apache.cxf.headers.Header; -import org.apache.cxf.interceptor.Fault; import org.apache.cxf.phase.Phase; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -54,7 +53,7 @@ public class UsernameTokenInterceptor ex protected static final String WSSE_PASSWORD_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText";; @Override - public void handleMessage(SoapMessage message) throws Fault { + public void handleMessage(SoapMessage message) { Header securityHeader = message.getHeader(WSSE_SECURITY); if (securityHeader != null) { if (!(securityHeader.getObject() instanceof Node)) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java Thu Aug 13 12:05:59 2015 @@ -58,6 +58,7 @@ public class VersioningService extends A @Resource public WebServiceContext wsContext; + @Override public void cancelCheckOut(String repositoryId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { CmisService service = null; @@ -84,6 +85,7 @@ public class VersioningService extends A } } + @Override public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, CmisPropertiesType properties, CmisContentStreamType contentStream, String checkinComment, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension) @@ -117,6 +119,7 @@ public class VersioningService extends A } } + @Override public void checkOut(String repositoryId, Holder<String> objectId, Holder<CmisExtensionType> extension, Holder<Boolean> contentCopied) throws CmisException { CmisService service = null; @@ -150,6 +153,7 @@ public class VersioningService extends A } } + @Override public List<CmisObjectType> getAllVersions(String repositoryId, String versionSeriesId, String filter, Boolean includeAllowableActions, CmisExtensionType extension) throws CmisException { CmisService service = null; @@ -186,6 +190,7 @@ public class VersioningService extends A } } + @Override public CmisObjectType getObjectOfLatestVersion(String repositoryId, String versionSeriesId, Boolean major, String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) @@ -216,6 +221,7 @@ public class VersioningService extends A } } + @Override public CmisPropertiesType getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId, Boolean major, String filter, CmisExtensionType extension) throws CmisException { CmisService service = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/BasicAuthCallContextHandler.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/BasicAuthCallContextHandler.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/BasicAuthCallContextHandler.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/BasicAuthCallContextHandler.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public class BasicAuthCallContextHandler public BasicAuthCallContextHandler() { } + @Override public Map<String, String> getCallContextMap(HttpServletRequest request) { assert request != null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public class NoBodyHttpServletResponseWr return noBodyStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (writer == null) { writer = new PrintWriter(new OutputStreamWriter(noBodyStream, getCharacterEncoding())); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java Thu Aug 13 12:05:59 2015 @@ -212,6 +212,7 @@ public class ThresholdOutputStream exten } } + @Override public void setMimeType(String mimeType) { this.mimeType = mimeType; } @@ -220,6 +221,7 @@ public class ThresholdOutputStream exten return mimeType; } + @Override public void setFileName(String filename) { this.filename = filename; } @@ -228,6 +230,7 @@ public class ThresholdOutputStream exten return filename; } + @Override public long getLength() { return length; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java Thu Aug 13 12:05:59 2015 @@ -25,6 +25,7 @@ import java.io.File; * * @deprecated use {@link TempStoreOutputStreamFactory} */ +@Deprecated public final class ThresholdOutputStreamFactory extends TempStoreOutputStreamFactory { private ThresholdOutputStreamFactory(File tempDir, int memoryThreshold, long maxContentSize, boolean encrypt) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/HttpRequestHeadMethodTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/HttpRequestHeadMethodTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/HttpRequestHeadMethodTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/HttpRequestHeadMethodTest.java Thu Aug 13 12:05:59 2015 @@ -134,6 +134,7 @@ public class HttpRequestHeadMethodTest { } static class UrlServiceCall extends AbstractAtomPubServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { // no implementation @@ -147,6 +148,7 @@ public class HttpRequestHeadMethodTest { this.os = os; } + @Override public void write(int i) throws IOException { os.write(i); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/ProxyRequestTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/ProxyRequestTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/ProxyRequestTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/ProxyRequestTest.java Thu Aug 13 12:05:59 2015 @@ -226,6 +226,7 @@ public class ProxyRequestTest { } static class UrlSerivceCall extends AbstractAtomPubServiceCall { + @Override public void serve(CallContext context, CmisService service, String repositoryId, HttpServletRequest request, HttpServletResponse response) throws Exception { // no implementation Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareCmisService.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/FileShareCmisService.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareCmisService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareCmisService.java Thu Aug 13 12:05:59 2015 @@ -69,6 +69,7 @@ public class FileShareCmisService extend * * This method should only be called by the service factory. */ + @Override public void setCallContext(CallContext context) { this.context = context; } @@ -76,6 +77,7 @@ public class FileShareCmisService extend /** * Gets the call context. */ + @Override public CallContext getCallContext() { return context; } 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=1695691&r1=1695690&r2=1695691&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 Thu Aug 13 12:05:59 2015 @@ -890,7 +890,7 @@ public class FileShareRepository { // get the type id String typeId = FileShareUtils.getIdProperty(oldProperties, PropertyIds.OBJECT_TYPE_ID); if (typeId == null) { - typeId = (file.isDirectory() ? BaseTypeId.CMIS_FOLDER.value() : BaseTypeId.CMIS_DOCUMENT.value()); + typeId = file.isDirectory() ? BaseTypeId.CMIS_FOLDER.value() : BaseTypeId.CMIS_DOCUMENT.value(); } // get the creator @@ -1165,12 +1165,12 @@ public class FileShareRepository { boolean ips = FileShareUtils.getBooleanParameter(includePathSegment, false); // skip and max - int skip = (skipCount == null ? 0 : skipCount.intValue()); + int skip = skipCount == null ? 0 : skipCount.intValue(); if (skip < 0) { skip = 0; } - int max = (maxItems == null ? Integer.MAX_VALUE : maxItems.intValue()); + int max = maxItems == null ? Integer.MAX_VALUE : maxItems.intValue(); if (max < 0) { max = Integer.MAX_VALUE; } @@ -1237,7 +1237,7 @@ public class FileShareRepository { boolean userReadOnly = checkUser(context, false); // check depth - int d = (depth == null ? 2 : depth.intValue()); + int d = depth == null ? 2 : depth.intValue(); if (d == 0) { throw new CmisInvalidArgumentException("Depth must not be 0!"); } @@ -1445,7 +1445,7 @@ public class FileShareRepository { } // copy filter - Set<String> filter = (orgfilter == null ? null : new HashSet<String>(orgfilter)); + Set<String> filter = orgfilter == null ? null : new HashSet<String>(orgfilter); // find base type String typeId = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.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/TypeManagerImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java Thu Aug 13 12:05:59 2015 @@ -262,7 +262,7 @@ public class TypeManagerImpl implements } private static boolean isRootType(TypeDefinitionContainer c) { - return (c.getTypeDefinition().getId().equals(c.getTypeDefinition().getBaseTypeId().value())); + return c.getTypeDefinition().getId().equals(c.getTypeDefinition().getBaseTypeId().value()); } private static PropertyDefinition<?> clonePropertyDefinition(PropertyDefinition<?> src) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.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/query/InMemoryQueryProcessor.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/query/InMemoryQueryProcessor.java Thu Aug 13 12:05:59 2015 @@ -118,8 +118,7 @@ public class InMemoryQueryProcessor { */ public ObjectList query(TypeManager tm, ObjectStore objectStore, String user, String repositoryId, String statement, Boolean searchAllVersions, Boolean includeAllowableActions, - IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, - BigInteger skipCount) { + IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount) { processQueryAndCatchExc(statement, tm); // calls query processor @@ -137,10 +136,11 @@ public class InMemoryQueryProcessor { /** * Process a query. + * * @param statement - * CMISQL statement to execute + * CMISQL statement to execute * @param tm - * type manager for the repository + * type manager for the repository */ public void processQueryAndCatchExc(String statement, TypeManager tm) { QueryUtilStrict queryUtil = new QueryUtilStrict(statement, tm, null); @@ -153,27 +153,26 @@ public class InMemoryQueryProcessor { } /** - * Create the list of matching objects for this query. + * Create the list of matching objects for this query. + * * @param tm - * type manager for the given repository + * type manager for the given repository * @param user - * user execuing the query + * user execuing the query * @param includeAllowableActions - * include allowable actions + * include allowable actions * @param includeRelationships - * include relationships + * include relationships * @param renditionFilter - * include renditions + * include renditions * @param maxItems - * max number of items to return + * max number of items to return * @param skipCount - * items to skip - * @return - * list of objects matching the query + * items to skip + * @return list of objects matching the query */ public ObjectList buildResultList(TypeManager tm, String user, Boolean includeAllowableActions, - IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, - BigInteger skipCount) { + IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount) { sortMatches(); @@ -763,7 +762,7 @@ public class InMemoryQueryProcessor { break; case STRING: if (rVal instanceof String) { - String unesc = StringUtil.unescape((String) rVal, null); + String unesc = StringUtil.unescape((String) rVal, null); LOG.debug("compare strings: " + lValue + " with " + unesc); return ((String) lValue).compareTo(unesc); } else { @@ -816,9 +815,8 @@ public class InMemoryQueryProcessor { * Translate SQL wildcards %, _ to Java regex syntax. * * @param wildcardString - * string to process - * @return - * string with replaced characters + * string to process + * @return string with replaced characters */ public static String translatePattern(String wildcardString) { int index = 0; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.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/api/TypeManagerCreatable.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java Thu Aug 13 12:05:59 2015 @@ -36,6 +36,7 @@ public interface TypeManagerCreatable ex * @param addInheritedProperties * add properties from supertype to type definition */ + @Override void addTypeDefinition(TypeDefinition typeDefinition, boolean addInheritedProperties); /** @@ -44,6 +45,7 @@ public interface TypeManagerCreatable ex * @param typeDefinition * type to be modified */ + @Override void updateTypeDefinition(TypeDefinition typeDefinition); /** @@ -53,5 +55,6 @@ public interface TypeManagerCreatable ex * @param typeId * id of type to be deleted */ + @Override void deleteTypeDefinition(String typeId); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.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/ImageThumbnailGenerator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.java Thu Aug 13 12:05:59 2015 @@ -37,7 +37,7 @@ import org.apache.chemistry.opencmis.com public class ImageThumbnailGenerator { private static final int DEFAULT_LENGTH = 100; - private static final String RENDITION_MIME_TYPE = "image/jpeg";; + private static final String RENDITION_MIME_TYPE = "image/jpeg"; private InputStream image; private int thumbWidth; private int thumbHeight; Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.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/InMemoryAcl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.java Thu Aug 13 12:05:59 2015 @@ -49,7 +49,7 @@ public class InMemoryAcl implements Clon int res = o1.getPrincipalId().compareTo(o2.getPrincipalId()); return res; } - }; + } private static final Comparator<? super InMemoryAce> COMP = new AceComparator<InMemoryAce>(); private static final InMemoryAcl DEFAULT_ACL = new InMemoryAcl(new ArrayList<InMemoryAce>() { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CallContextWrapper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CallContextWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CallContextWrapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CallContextWrapper.java Thu Aug 13 12:05:59 2015 @@ -39,58 +39,72 @@ public class CallContextWrapper implemen this.context = context; } + @Override public String getBinding() { return context.getBinding(); } + @Override public boolean isObjectInfoRequired() { return context.isObjectInfoRequired(); } + @Override public Object get(String key) { return context.get(key); } + @Override public CmisVersion getCmisVersion() { return context.getCmisVersion(); } + @Override public String getRepositoryId() { return context.getRepositoryId(); } + @Override public String getUsername() { return context.getUsername(); } + @Override public String getPassword() { return context.getPassword(); } + @Override public String getLocale() { return context.getLocale(); } + @Override public BigInteger getOffset() { return context.getOffset(); } + @Override public BigInteger getLength() { return context.getLength(); } + @Override public File getTempDirectory() { return context.getTempDirectory(); } + @Override public boolean encryptTempFiles() { return context.encryptTempFiles(); } + @Override public int getMemoryThreshold() { return context.getMemoryThreshold(); } + @Override public long getMaxContentSize() { return context.getMaxContentSize(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MutableCallContextWrapper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MutableCallContextWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MutableCallContextWrapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MutableCallContextWrapper.java Thu Aug 13 12:05:59 2015 @@ -55,6 +55,7 @@ public class MutableCallContextWrapper i } } + @Override public Object get(String key) { if (values == null) { return context.get(key); @@ -67,6 +68,7 @@ public class MutableCallContextWrapper i } } + @Override public void put(String key, Object value) { if (values == null) { ((MutableCallContext) context).put(key, value); @@ -75,6 +77,7 @@ public class MutableCallContextWrapper i } } + @Override public Object remove(String key) { if (values == null) { return ((MutableCallContext) context).remove(key); @@ -90,54 +93,67 @@ public class MutableCallContextWrapper i } } + @Override public String getBinding() { return context.getBinding(); } + @Override public boolean isObjectInfoRequired() { return context.isObjectInfoRequired(); } + @Override public CmisVersion getCmisVersion() { return (CmisVersion) get(CMIS_VERSION); } + @Override public String getRepositoryId() { return (String) get(REPOSITORY_ID); } + @Override public String getUsername() { return (String) get(USERNAME); } + @Override public String getPassword() { return (String) get(PASSWORD); } + @Override public String getLocale() { return (String) get(LOCALE); } + @Override public BigInteger getOffset() { return (BigInteger) get(OFFSET); } + @Override public BigInteger getLength() { return (BigInteger) get(LENGTH); } + @Override public File getTempDirectory() { return (File) get(TEMP_DIR); } + @Override public boolean encryptTempFiles() { return Boolean.TRUE.equals(get(ENCRYPT_TEMP_FILE)); } + @Override public int getMemoryThreshold() { return (Integer) get(MEMORY_THRESHOLD); } + @Override public long getMaxContentSize() { return (Long) get(MAX_CONTENT_SIZE); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java Thu Aug 13 12:05:59 2015 @@ -827,12 +827,12 @@ public final class TypeDefinitionFactory return result; } - int maxItemsInt = (maxItems == null ? Integer.MAX_VALUE : maxItems.intValue()); + int maxItemsInt = maxItems == null ? Integer.MAX_VALUE : maxItems.intValue(); if (maxItemsInt < 0) { maxItemsInt = 0; } - int skipCountInt = (skipCount == null ? 0 : skipCount.intValue()); + int skipCountInt = skipCount == null ? 0 : skipCount.intValue(); if (skipCountInt < 0) { skipCountInt = 0; } @@ -855,6 +855,7 @@ public final class TypeDefinitionFactory } Collections.sort(targetList, new Comparator<TypeDefinition>() { + @Override public int compare(TypeDefinition td1, TypeDefinition td2) { String pid1 = td1.getParentTypeId(); String pid2 = td2.getParentTypeId(); @@ -929,7 +930,7 @@ public final class TypeDefinitionFactory throw new IllegalArgumentException("Types map must be set!"); } - int depthInt = (depth == null ? -1 : depth.intValue()); + int depthInt = depth == null ? -1 : depth.intValue(); if (depthInt == 0) { throw new IllegalArgumentException("Depth must not be 0!"); } @@ -945,8 +946,8 @@ public final class TypeDefinitionFactory return Collections.<TypeDefinitionContainer> emptyList(); } - boolean includePropertyDefinitionsBool = (includePropertyDefinitions == null ? false - : includePropertyDefinitions.booleanValue()); + boolean includePropertyDefinitionsBool = includePropertyDefinitions == null ? false + : includePropertyDefinitions.booleanValue(); // gather parent ids Map<String, Set<String>> typeDefChildren = new HashMap<String, Set<String>>(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java Thu Aug 13 12:05:59 2015 @@ -503,8 +503,6 @@ public final class TypeValidator { return true; } else if (propertyId.equals(PropertyIds.VERSION_LABEL)) { return true; - } else if (propertyId.equals(PropertyIds.VERSION_SERIES_ID)) { - return true; } else if (propertyId.equals(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT)) { return true; } else if (propertyId.equals(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY)) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java Thu Aug 13 12:05:59 2015 @@ -67,6 +67,7 @@ public class LoggingFilter implements Fi private boolean logHeaders = true; private int indent = -1; + @Override public void init(FilterConfig cfg) throws ServletException { String val; @@ -101,9 +102,11 @@ public class LoggingFilter implements Fi } } + @Override public void destroy() { } + @Override public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException { LOG.debug("Logging filter doFilter");
