You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by sf...@apache.org on 2011/04/18 19:08:29 UTC

svn commit: r1094656 [2/4] - in /chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ chemistry-opencmis-client/chemistry-opencmis-client-bindings...

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java Mon Apr 18 17:08:24 2011
@@ -25,8 +25,8 @@ import java.util.Map;
 
 public class MimeTypes {
 
-    private static Map<String, String> EXT2MIME = new HashMap<String, String>();
-    private static Map<String, String> MIME2EXT = new HashMap<String, String>();
+    private static final Map<String, String> EXT2MIME = new HashMap<String, String>();
+    private static final Map<String, String> MIME2EXT = new HashMap<String, String>();
 
     static {
         // extension to MIME type

Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java Mon Apr 18 17:08:24 2011
@@ -33,8 +33,8 @@ import org.apache.chemistry.opencmis.com
  */
 public class UrlBuilder {
 
-    private StringBuilder urlPart;
-    private StringBuilder queryPart;
+    private final StringBuilder urlPart;
+    private final StringBuilder queryPart;
 
     /**
      * Constructor.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java Mon Apr 18 17:08:24 2011
@@ -30,11 +30,11 @@ public class CmisExtensionElementImpl im
 
     private static final long serialVersionUID = 1L;
 
-    private String name;
-    private String namespace;
-    private String value;
+    private final String name;
+    private final String namespace;
+    private final String value;
     private Map<String, String> attributes;
-    private List<CmisExtensionElement> children;
+    private final List<CmisExtensionElement> children;
 
     /**
      * Constructor for a leaf.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.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/CallContextImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java Mon Apr 18 17:08:24 2011
@@ -29,9 +29,9 @@ import org.apache.chemistry.opencmis.com
  */
 public class CallContextImpl implements CallContext {
 
-    private String binding;
-    private boolean objectInfoRequired;
-    private Map<String, Object> parameter = new HashMap<String, Object>();
+    private final String binding;
+    private final boolean objectInfoRequired;
+    private final Map<String, Object> parameter = new HashMap<String, Object>();
 
     public CallContextImpl(String binding, String repositoryId, boolean objectInfoRequired) {
         this.binding = binding;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.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/atompub/AtomEntry.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.java Mon Apr 18 17:08:24 2011
@@ -37,7 +37,7 @@ import org.apache.chemistry.opencmis.com
  */
 public class AtomEntry extends AtomDocumentBase {
 
-    private final static String DEFAULT_AUTHOR = "unknown";
+    private static final String DEFAULT_AUTHOR = "unknown";
 
     /**
      * Creates an Atom entry document.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.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/atompub/AtomEntryParser.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java Mon Apr 18 17:08:24 2011
@@ -61,15 +61,15 @@ import org.apache.chemistry.opencmis.com
  */
 public class AtomEntryParser {
 
-    private final static String TAG_ENTRY = "entry";
-    private final static String TAG_TITLE = "title";
-    private final static String TAG_OBJECT = "object";
-    private final static String TAG_CONTENT = "content";
-    private final static String TAG_BASE64 = "base64";
-    private final static String TAG_MEDIATYPE = "mediatype";
+    private static final String TAG_ENTRY = "entry";
+    private static final String TAG_TITLE = "title";
+    private static final String TAG_OBJECT = "object";
+    private static final String TAG_CONTENT = "content";
+    private static final String TAG_BASE64 = "base64";
+    private static final String TAG_MEDIATYPE = "mediatype";
 
-    private final static String ATTR_SRC = "src";
-    private final static String ATTR_TYPE = "type";
+    private static final String ATTR_SRC = "src";
+    private static final String ATTR_TYPE = "type";
 
     protected boolean ignoreAtomContentSrc;
 
@@ -564,7 +564,7 @@ public class AtomEntryParser {
     }
 
     private static class LightByteArrayOutputStream extends OutputStream {
-        private final static int MAX_GROW = 10 * 1024 * 1024;
+        private static final int MAX_GROW = 10 * 1024 * 1024;
 
         private byte[] buf = null;
         private int size = 0;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.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/ControlParser.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java Mon Apr 18 17:08:24 2011
@@ -32,11 +32,11 @@ import org.apache.chemistry.opencmis.com
  */
 public class ControlParser {
 
-    private HttpServletRequest request;
+    private final HttpServletRequest request;
 
-    private Map<String, String> zeroDim = new HashMap<String, String>();
-    private Map<String, Map<Integer, String>> oneDim = new HashMap<String, Map<Integer, String>>();
-    private Map<String, Map<Integer, Map<Integer, String>>> twoDim = new HashMap<String, Map<Integer, Map<Integer, String>>>();
+    private final Map<String, String> zeroDim = new HashMap<String, String>();
+    private final Map<String, Map<Integer, String>> oneDim = new HashMap<String, Map<Integer, String>>();
+    private final Map<String, Map<Integer, Map<Integer, String>>> twoDim = new HashMap<String, Map<Integer, Map<Integer, String>>>();
 
     public ControlParser(HttpServletRequest request) {
         this.request = request;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/TypeCache.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/TypeCache.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/TypeCache.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/TypeCache.java Mon Apr 18 17:08:24 2011
@@ -30,9 +30,9 @@ import org.apache.chemistry.opencmis.com
  */
 public class TypeCache {
 
-    private String repositoryId;
-    private CmisService service;
-    private Map<String, TypeDefinition> typeDefinitions;
+    private final String repositoryId;
+    private final CmisService service;
+    private final Map<String, TypeDefinition> typeDefinitions;
 
     public TypeCache(String repositoryId, CmisService service) {
         this.repositoryId = repositoryId;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConstants.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/json/JSONConstants.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConstants.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConstants.java Mon Apr 18 17:08:24 2011
@@ -23,161 +23,166 @@ package org.apache.chemistry.opencmis.se
  */
 public class JSONConstants {
 
-    public final static String ERROR_EXCEPTION = "exception";
-    public final static String ERROR_MESSAGE = "message";
-    public final static String ERROR_STACKTRACE = "stacktrace";
-
-    public final static String REPINFO_ID = "repositoryId";
-    public final static String REPINFO_NAME = "repositoryName";
-    public final static String REPINFO_DESCRIPTION = "repositoryDescription";
-    public final static String REPINFO_VENDOR = "vendorName";
-    public final static String REPINFO_PRODUCT = "productName";
-    public final static String REPINFO_PRODUCT_VERSION = "productVersion";
-    public final static String REPINFO_ROOT_FOLDER_ID = "rootFolderId";
-    public final static String REPINFO_REPOSITORY_URL = "repositoryUrl";
-    public final static String REPINFO_ROOT_FOLDER_URL = "rootFolderUrl";
-    public final static String REPINFO_CAPABILITIES = "capabilities";
-    public final static String REPINFO_ACL_CAPABILITIES = "aclCapabilities";
-    public final static String REPINFO_CHANGE_LOCK_TOKEN = "latestChangeLogToken";
-    public final static String REPINFO_CMIS_VERSION_SUPPORTED = "cmisVersionSupported";
-    public final static String REPINFO_THIN_CLIENT_URI = "thinClientURI";
-    public final static String REPINFO_CHANGES_INCOMPLETE = "changesIncomplete";
-    public final static String REPINFO_CHANGES_ON_TYPE = "changesOnType";
-    public final static String REPINFO_PRINCIPAL_ID_ANONYMOUS = "principalIdAnonymous";
-    public final static String REPINFO_PRINCIPAL_ID_ANYONE = "principalIdAnyone";
-
-    public final static String JSON_CAP_CONTENT_STREAM_UPDATES = "capabilityContentStreamUpdatability";
-    public final static String JSON_CAP_CHANGES = "capabilityChanges";
-    public final static String JSON_CAP_RENDITIONS = "capabilityRenditions";
-    public final static String JSON_CAP_GET_DESCENDANTS = "capabilityGetDescendants";
-    public final static String JSON_CAP_GET_FOLDER_TREE = "capabilityGetFolderTree";
-    public final static String JSON_CAP_MULTIFILING = "capabilityMultifiling";
-    public final static String JSON_CAP_UNFILING = "capabilityUnfiling";
-    public final static String JSON_CAP_VERSION_SPECIFIC_FILING = "capabilityVersionSpecificFiling";
-    public final static String JSON_CAP_PWC_SEARCHABLE = "capabilityPWCSearchable";
-    public final static String JSON_CAP_PWC_UPDATABLE = "capabilityPWCUpdatable";
-    public final static String JSON_CAP_ALL_VERSIONS_SEARCHABLE = "capabilityAllVersionsSearchable";
-    public final static String JSON_CAP_QUERY = "capabilityQuery";
-    public final static String JSON_CAP_JOIN = "capabilityJoin";
-    public final static String JSON_CAP_ACL = "capabilityACL";
-
-    public final static String JSON_ACLCAP_SUPPORTED_PERMISSIONS = "supportedPermissions";
-    public final static String JSON_ACLCAP_ACL_PROPAGATION = "propagation";
-    public final static String JSON_ACLCAP_PERMISSIONS = "permissions";
-    public final static String JSON_ACLCAP_PERMISSION_MAPPING = "permissionMapping";
-
-    public final static String JSON_ACLCAP_PERMISSION_PERMISSION = "permission";
-    public final static String JSON_ACLCAP_PERMISSION_DESCRIPTION = "description";
-
-    public final static String JSON_ACLCAP_MAPPING_KEY = "key";
-    public final static String JSON_ACLCAP_MAPPING_PERMISSION = "permission";
-
-    public final static String JSON_OBJECT_PROPERTIES = "properties";
-    public final static String JSON_OBJECT_ALLOWABLE_ACTIONS = "allowableActions";
-    public final static String JSON_OBJECT_RELATIONSHIPS = "relationships";
-    public final static String JSON_OBJECT_CHANGE_EVENT_INFO = "changeEventInfo";
-    public final static String JSON_OBJECT_ACL = "acl";
-    public final static String JSON_OBJECT_EXACT_ACL = "exactACL";
-    public final static String JSON_OBJECT_POLICY_IDS = "policyIds";
-    public final static String JSON_OBJECT_RENDITIONS = "renditions";
-
-    public final static String JSON_OBJECTINFOLDER_OBJECT = "object";
-    public final static String JSON_OBJECTINFOLDER_PATH_SEGMENT = "pathSegment";
-    public final static String JSON_OBJECTPARENTS_OBJECT = "object";
-    public final static String JSON_OBJECTPARENTS_RELATIVE_PATH_SEGMENT = "relativePathSegment";
-
-    public final static String JSON_PROPERTY_ID = "id";
-    public final static String JSON_PROPERTY_LOCALNAME = "localName";
-    public final static String JSON_PROPERTY_DISPLAYNAME = "displayName";
-    public final static String JSON_PROPERTY_QUERYNAME = "queryName";
-    public final static String JSON_PROPERTY_VALUE = "value";
-    public final static String JSON_PROPERTY_DATATYPE = "type";
-    public final static String JSON_PROPERTY_CARDINALITY = "cardinality";
-
-    public final static String JSON_CHANGE_EVENT_TYPE = "changeType";
-    public final static String JSON_CHANGE_EVENT_TIME = "changeTime";
-
-    public final static String JSON_ACL_ACES = "aces";
-    public final static String JSON_ACL_IS_EXACT = "isExact";
-
-    public final static String JSON_ACE_PRINCIPAL = "princial";
-    public final static String JSON_ACE_PRINCIPAL_ID = "princialId";
-    public final static String JSON_ACE_PERMISSIONS = "permissions";
-    public final static String JSON_ACE_IS_DIRECT = "isDirect";
-
-    public final static String JSON_RENDITION_STREAM_ID = "streamId";
-    public final static String JSON_RENDITION_MIMETYPE = "mimeType";
-    public final static String JSON_RENDITION_LENGTH = "length";
-    public final static String JSON_RENDITION_KIND = "kind";
-    public final static String JSON_RENDITION_TITLE = "title";
-    public final static String JSON_RENDITION_HEIGHT = "height";
-    public final static String JSON_RENDITION_WIDTH = "width";
-    public final static String JSON_RENDITION_DOCUMENT_ID = "renditionDocumentId";
-
-    public final static String JSON_OBJECTLIST_OBJECTS = "objects";
-    public final static String JSON_OBJECTLIST_HAS_MORE_ITEMS = "hasMoreItems";
-    public final static String JSON_OBJECTLIST_NUM_ITEMS = "numItems";
-
-    public final static String JSON_OBJECTINFOLDERLIST_OBJECTS = "objects";
-    public final static String JSON_OBJECTINFOLDERLIST_HAS_MORE_ITEMS = "hasMoreItems";
-    public final static String JSON_OBJECTINFOLDERLIST_NUM_ITEMS = "numItems";
-
-    public final static String JSON_OBJECTINFOLDERCONTAINER_OBJECT = "object";
-    public final static String JSON_OBJECTINFOLDERCONTAINER_CHILDREN = "children";
-
-    public final static String JSON_TYPE_ID = "id";
-    public final static String JSON_TYPE_LOCALNAME = "localName";
-    public final static String JSON_TYPE_LOCALNAMESPACE = "localNamespace";
-    public final static String JSON_TYPE_DISPLAYNAME = "displayName";
-    public final static String JSON_TYPE_QUERYNAME = "queryName";
-    public final static String JSON_TYPE_DESCRIPTION = "description";
-    public final static String JSON_TYPE_BASE_ID = "baseId";
-    public final static String JSON_TYPE_PARENT_ID = "parentId";
-    public final static String JSON_TYPE_CREATABLE = "creatable";
-    public final static String JSON_TYPE_FILEABLE = "fileable";
-    public final static String JSON_TYPE_QUERYABLE = "queryable";
-    public final static String JSON_TYPE_FULLTEXT_INDEXED = "fulltextIndexed";
-    public final static String JSON_TYPE_INCLUDE_IN_SUPERTYPE_QUERY = "includedInSupertypeQuery";
-    public final static String JSON_TYPE_CONTROLABLE_POLICY = "controllablePolicy";
-    public final static String JSON_TYPE_CONTROLABLE_ACL = "controllableACL";
-    public final static String JSON_TYPE_PROPERTY_DEFINITIONS = "propertyDefinitions";
-
-    public final static String JSON_TYPE_VERSIONABLE = "versionable"; // document
-    public final static String JSON_TYPE_CONTENTSTREAM_ALLOWED = "contentStreamAllowed"; // document
-
-    public final static String JSON_TYPE_ALLOWED_SOURCE_TYPES = "allowedSourceTypes"; // relationship
-    public final static String JSON_TYPE_ALLOWED_TARGET_TYPES = "allowedTargetTypes"; // relationship
-
-    public final static String JSON_PROPERTYTYPE_ID = "id";
-    public final static String JSON_PROPERTYTYPE_LOCALNAME = "localName";
-    public final static String JSON_PROPERTYTYPE_LOCALNAMESPACE = "localNamespace";
-    public final static String JSON_PROPERTYTYPE_DISPLAYNAME = "displayName";
-    public final static String JSON_PROPERTYTYPE_QUERYNAME = "queryName";
-    public final static String JSON_PROPERTYTYPE_DESCRIPTION = "description";
-    public final static String JSON_PROPERTYTYPE_PROPERTY_TYPE = "propertyType";
-    public final static String JSON_PROPERTYTYPE_CARDINALITY = "cardinality";
-    public final static String JSON_PROPERTYTYPE_UPDATABILITY = "updatability";
-    public final static String JSON_PROPERTYTYPE_INHERITED = "inherited";
-    public final static String JSON_PROPERTYTYPE_REQUIRED = "required";
-    public final static String JSON_PROPERTYTYPE_QUERYABLE = "queryable";
-    public final static String JSON_PROPERTYTYPE_OPENCHOICE = "openChoice";
-
-    public final static String JSON_PROPERTYTYPE_DEAULT_VALUE = "defaultValue";
-
-    public final static String JSON_PROPERTYTYPE_MAX_LENGTH = "maxLength";
-    public final static String JSON_PROPERTYTYPE_MIN_VALUE = "minValue";
-    public final static String JSON_PROPERTYTYPE_MAX_VALUE = "maxValue";
-    public final static String JSON_PROPERTYTYPE_MAX_PRECISION = "precision";
-    public final static String JSON_PROPERTYTYPE_MAX_RESOLUTION = "resolution";
-
-    public final static String JSON_PROPERTYTYPE_CHOICE_DISPLAYNAME = "displayName";
-    public final static String JSON_PROPERTYTYPE_CHOICE_VALUE = "value";
-    public final static String JSON_PROPERTYTYPE_CHOICE_CHOICE = "choice";
-
-    public final static String JSON_TYPESLIST_TYPES = "types";
-    public final static String JSON_TYPESLIST_HAS_MORE_ITEMS = "hasMoreItems";
-    public final static String JSON_TYPESLIST_NUM_ITEMS = "numItems";
+    public static final String ERROR_EXCEPTION = "exception";
+    public static final String ERROR_MESSAGE = "message";
+    public static final String ERROR_STACKTRACE = "stacktrace";
+
+    public static final String REPINFO_ID = "repositoryId";
+    public static final String REPINFO_NAME = "repositoryName";
+    public static final String REPINFO_DESCRIPTION = "repositoryDescription";
+    public static final String REPINFO_VENDOR = "vendorName";
+    public static final String REPINFO_PRODUCT = "productName";
+    public static final String REPINFO_PRODUCT_VERSION = "productVersion";
+    public static final String REPINFO_ROOT_FOLDER_ID = "rootFolderId";
+    public static final String REPINFO_REPOSITORY_URL = "repositoryUrl";
+    public static final String REPINFO_ROOT_FOLDER_URL = "rootFolderUrl";
+    public static final String REPINFO_CAPABILITIES = "capabilities";
+    public static final String REPINFO_ACL_CAPABILITIES = "aclCapabilities";
+    public static final String REPINFO_CHANGE_LOCK_TOKEN = "latestChangeLogToken";
+    public static final String REPINFO_CMIS_VERSION_SUPPORTED = "cmisVersionSupported";
+    public static final String REPINFO_THIN_CLIENT_URI = "thinClientURI";
+    public static final String REPINFO_CHANGES_INCOMPLETE = "changesIncomplete";
+    public static final String REPINFO_CHANGES_ON_TYPE = "changesOnType";
+    public static final String REPINFO_PRINCIPAL_ID_ANONYMOUS = "principalIdAnonymous";
+    public static final String REPINFO_PRINCIPAL_ID_ANYONE = "principalIdAnyone";
+
+    public static final String JSON_CAP_CONTENT_STREAM_UPDATES = "capabilityContentStreamUpdatability";
+    public static final String JSON_CAP_CHANGES = "capabilityChanges";
+    public static final String JSON_CAP_RENDITIONS = "capabilityRenditions";
+    public static final String JSON_CAP_GET_DESCENDANTS = "capabilityGetDescendants";
+    public static final String JSON_CAP_GET_FOLDER_TREE = "capabilityGetFolderTree";
+    public static final String JSON_CAP_MULTIFILING = "capabilityMultifiling";
+    public static final String JSON_CAP_UNFILING = "capabilityUnfiling";
+    public static final String JSON_CAP_VERSION_SPECIFIC_FILING = "capabilityVersionSpecificFiling";
+    public static final String JSON_CAP_PWC_SEARCHABLE = "capabilityPWCSearchable";
+    public static final String JSON_CAP_PWC_UPDATABLE = "capabilityPWCUpdatable";
+    public static final String JSON_CAP_ALL_VERSIONS_SEARCHABLE = "capabilityAllVersionsSearchable";
+    public static final String JSON_CAP_QUERY = "capabilityQuery";
+    public static final String JSON_CAP_JOIN = "capabilityJoin";
+    public static final String JSON_CAP_ACL = "capabilityACL";
+
+    public static final String JSON_ACLCAP_SUPPORTED_PERMISSIONS = "supportedPermissions";
+    public static final String JSON_ACLCAP_ACL_PROPAGATION = "propagation";
+    public static final String JSON_ACLCAP_PERMISSIONS = "permissions";
+    public static final String JSON_ACLCAP_PERMISSION_MAPPING = "permissionMapping";
+
+    public static final String JSON_ACLCAP_PERMISSION_PERMISSION = "permission";
+    public static final String JSON_ACLCAP_PERMISSION_DESCRIPTION = "description";
+
+    public static final String JSON_ACLCAP_MAPPING_KEY = "key";
+    public static final String JSON_ACLCAP_MAPPING_PERMISSION = "permission";
+
+    public static final String JSON_OBJECT_PROPERTIES = "properties";
+    public static final String JSON_OBJECT_ALLOWABLE_ACTIONS = "allowableActions";
+    public static final String JSON_OBJECT_RELATIONSHIPS = "relationships";
+    public static final String JSON_OBJECT_CHANGE_EVENT_INFO = "changeEventInfo";
+    public static final String JSON_OBJECT_ACL = "acl";
+    public static final String JSON_OBJECT_EXACT_ACL = "exactACL";
+    public static final String JSON_OBJECT_POLICY_IDS = "policyIds";
+    public static final String JSON_OBJECT_RENDITIONS = "renditions";
+
+    public static final String JSON_OBJECTINFOLDER_OBJECT = "object";
+    public static final String JSON_OBJECTINFOLDER_PATH_SEGMENT = "pathSegment";
+    public static final String JSON_OBJECTPARENTS_OBJECT = "object";
+    public static final String JSON_OBJECTPARENTS_RELATIVE_PATH_SEGMENT = "relativePathSegment";
+
+    public static final String JSON_PROPERTY_ID = "id";
+    public static final String JSON_PROPERTY_LOCALNAME = "localName";
+    public static final String JSON_PROPERTY_DISPLAYNAME = "displayName";
+    public static final String JSON_PROPERTY_QUERYNAME = "queryName";
+    public static final String JSON_PROPERTY_VALUE = "value";
+    public static final String JSON_PROPERTY_DATATYPE = "type";
+    public static final String JSON_PROPERTY_CARDINALITY = "cardinality";
+
+    public static final String JSON_CHANGE_EVENT_TYPE = "changeType";
+    public static final String JSON_CHANGE_EVENT_TIME = "changeTime";
+
+    public static final String JSON_ACL_ACES = "aces";
+    public static final String JSON_ACL_IS_EXACT = "isExact";
+
+    public static final String JSON_ACE_PRINCIPAL = "princial";
+    public static final String JSON_ACE_PRINCIPAL_ID = "princialId";
+    public static final String JSON_ACE_PERMISSIONS = "permissions";
+    public static final String JSON_ACE_IS_DIRECT = "isDirect";
+
+    public static final String JSON_RENDITION_STREAM_ID = "streamId";
+    public static final String JSON_RENDITION_MIMETYPE = "mimeType";
+    public static final String JSON_RENDITION_LENGTH = "length";
+    public static final String JSON_RENDITION_KIND = "kind";
+    public static final String JSON_RENDITION_TITLE = "title";
+    public static final String JSON_RENDITION_HEIGHT = "height";
+    public static final String JSON_RENDITION_WIDTH = "width";
+    public static final String JSON_RENDITION_DOCUMENT_ID = "renditionDocumentId";
+
+    public static final String JSON_OBJECTLIST_OBJECTS = "objects";
+    public static final String JSON_OBJECTLIST_HAS_MORE_ITEMS = "hasMoreItems";
+    public static final String JSON_OBJECTLIST_NUM_ITEMS = "numItems";
+
+    public static final String JSON_OBJECTINFOLDERLIST_OBJECTS = "objects";
+    public static final String JSON_OBJECTINFOLDERLIST_HAS_MORE_ITEMS = "hasMoreItems";
+    public static final String JSON_OBJECTINFOLDERLIST_NUM_ITEMS = "numItems";
+
+    public static final String JSON_OBJECTINFOLDERCONTAINER_OBJECT = "object";
+    public static final String JSON_OBJECTINFOLDERCONTAINER_CHILDREN = "children";
+
+    public static final String JSON_TYPE_ID = "id";
+    public static final String JSON_TYPE_LOCALNAME = "localName";
+    public static final String JSON_TYPE_LOCALNAMESPACE = "localNamespace";
+    public static final String JSON_TYPE_DISPLAYNAME = "displayName";
+    public static final String JSON_TYPE_QUERYNAME = "queryName";
+    public static final String JSON_TYPE_DESCRIPTION = "description";
+    public static final String JSON_TYPE_BASE_ID = "baseId";
+    public static final String JSON_TYPE_PARENT_ID = "parentId";
+    public static final String JSON_TYPE_CREATABLE = "creatable";
+    public static final String JSON_TYPE_FILEABLE = "fileable";
+    public static final String JSON_TYPE_QUERYABLE = "queryable";
+    public static final String JSON_TYPE_FULLTEXT_INDEXED = "fulltextIndexed";
+    public static final String JSON_TYPE_INCLUDE_IN_SUPERTYPE_QUERY = "includedInSupertypeQuery";
+    public static final String JSON_TYPE_CONTROLABLE_POLICY = "controllablePolicy";
+    public static final String JSON_TYPE_CONTROLABLE_ACL = "controllableACL";
+    public static final String JSON_TYPE_PROPERTY_DEFINITIONS = "propertyDefinitions";
+
+    public static final String JSON_TYPE_VERSIONABLE = "versionable"; // document
+    public static final String JSON_TYPE_CONTENTSTREAM_ALLOWED = "contentStreamAllowed"; // document
+
+    public static final String JSON_TYPE_ALLOWED_SOURCE_TYPES = "allowedSourceTypes"; // relationship
+    public static final String JSON_TYPE_ALLOWED_TARGET_TYPES = "allowedTargetTypes"; // relationship
+
+    public static final String JSON_PROPERTYTYPE_ID = "id";
+    public static final String JSON_PROPERTYTYPE_LOCALNAME = "localName";
+    public static final String JSON_PROPERTYTYPE_LOCALNAMESPACE = "localNamespace";
+    public static final String JSON_PROPERTYTYPE_DISPLAYNAME = "displayName";
+    public static final String JSON_PROPERTYTYPE_QUERYNAME = "queryName";
+    public static final String JSON_PROPERTYTYPE_DESCRIPTION = "description";
+    public static final String JSON_PROPERTYTYPE_PROPERTY_TYPE = "propertyType";
+    public static final String JSON_PROPERTYTYPE_CARDINALITY = "cardinality";
+    public static final String JSON_PROPERTYTYPE_UPDATABILITY = "updatability";
+    public static final String JSON_PROPERTYTYPE_INHERITED = "inherited";
+    public static final String JSON_PROPERTYTYPE_REQUIRED = "required";
+    public static final String JSON_PROPERTYTYPE_QUERYABLE = "queryable";
+    public static final String JSON_PROPERTYTYPE_OPENCHOICE = "openChoice";
+
+    public static final String JSON_PROPERTYTYPE_DEAULT_VALUE = "defaultValue";
+
+    public static final String JSON_PROPERTYTYPE_MAX_LENGTH = "maxLength";
+    public static final String JSON_PROPERTYTYPE_MIN_VALUE = "minValue";
+    public static final String JSON_PROPERTYTYPE_MAX_VALUE = "maxValue";
+    public static final String JSON_PROPERTYTYPE_MAX_PRECISION = "precision";
+    public static final String JSON_PROPERTYTYPE_MAX_RESOLUTION = "resolution";
+
+    public static final String JSON_PROPERTYTYPE_CHOICE_DISPLAYNAME = "displayName";
+    public static final String JSON_PROPERTYTYPE_CHOICE_VALUE = "value";
+    public static final String JSON_PROPERTYTYPE_CHOICE_CHOICE = "choice";
+
+    public static final String JSON_TYPESLIST_TYPES = "types";
+    public static final String JSON_TYPESLIST_HAS_MORE_ITEMS = "hasMoreItems";
+    public static final String JSON_TYPESLIST_NUM_ITEMS = "numItems";
+
+    public static final String JSON_TYPESCONTAINER_TYPE = "type";
+    public static final String JSON_TYPESCONTAINER_CHILDREN = "children";
+
+    // Constant utility class.
+    private JSONConstants() {
+    }
 
-    public final static String JSON_TYPESCONTAINER_TYPE = "type";
-    public final static String JSON_TYPESCONTAINER_CHILDREN = "children";
 }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.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/json/JSONConverter.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java Mon Apr 18 17:08:24 2011
@@ -64,10 +64,12 @@ import org.apache.chemistry.opencmis.ser
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
+import static org.apache.chemistry.opencmis.server.impl.browser.json.JSONConstants.*;
+
 /**
  * OpenCMIS objects to JSON converter.
  */
-public class JSONConverter extends JSONConstants {
+public class JSONConverter {
 
     /**
      * Private constructor.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/dummy/DummyService.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/dummy/DummyService.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/dummy/DummyService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/dummy/DummyService.java Mon Apr 18 17:08:24 2011
@@ -40,7 +40,7 @@ import org.apache.chemistry.opencmis.com
  */
 public class DummyService extends AbstractCmisService {
 
-	private RepositoryInfoImpl fRepInfo;
+	private final RepositoryInfoImpl fRepInfo;
 
 	public DummyService(String id, String name) {
 		fRepInfo = new RepositoryInfoImpl();

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AuthHandler.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/AuthHandler.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AuthHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AuthHandler.java Mon Apr 18 17:08:24 2011
@@ -189,7 +189,7 @@ public class AuthHandler implements Mess
         @XmlAnyElement(lax = true)
         protected List<Object> any;
         @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+        private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
         public List<Object> getAny() {
             if (any == null) {
@@ -218,7 +218,7 @@ public class AuthHandler implements Mess
         @XmlSchemaType(name = "ID")
         protected String id;
         @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+        private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
         public AttributedString getUsername() {
             return username;
@@ -278,7 +278,7 @@ public class AuthHandler implements Mess
         @XmlSchemaType(name = "ID")
         protected String id;
         @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+        private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
         public String getValue() {
             return value;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.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/Dispatcher.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java Mon Apr 18 17:08:24 2011
@@ -48,7 +48,7 @@ public class Dispatcher implements Seria
 
     private static final Log LOG = LogFactory.getLog(Dispatcher.class.getName());
 
-    private Map<String, Method> methodMap = new HashMap<String, Method>();
+    private final Map<String, Method> methodMap = new HashMap<String, Method>();
 
     public Dispatcher() {
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.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/ExceptionHelper.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java Mon Apr 18 17:08:24 2011
@@ -32,7 +32,7 @@ public class ExceptionHelper {
 
     public static final String STACK_TRACE_PROPERTY = "org.apache.chemistry.opencmis.stacktrace.disable";
 
-    private static boolean sendStackTrace;
+    private static final boolean sendStackTrace;
 
     static {
         sendStackTrace = System.getProperty(STACK_TRACE_PROPERTY) == null;

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=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Mon Apr 18 17:08:24 2011
@@ -148,15 +148,15 @@ public class FileShareRepository {
     private static final Log log = LogFactory.getLog(FileShareRepository.class);
 
     /** Repository id */
-    private String fRepositoryId;
+    private final String fRepositoryId;
     /** Root directory */
-    private File fRoot;
+    private final File fRoot;
     /** Types */
-    private TypeManager fTypes;
+    private final TypeManager fTypes;
     /** User table */
-    private Map<String, Boolean> fUserMap;
+    private final Map<String, Boolean> fUserMap;
     /** Repository info */
-    private RepositoryInfoImpl fRepositoryInfo;
+    private final RepositoryInfoImpl fRepositoryInfo;
 
     /**
      * Constructor.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareService.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/FileShareService.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareService.java Mon Apr 18 17:08:24 2011
@@ -56,7 +56,7 @@ import org.apache.chemistry.opencmis.com
  */
 public class FileShareService extends AbstractCmisService {
 
-    private RepositoryMap repositoryMap;
+    private final RepositoryMap repositoryMap;
     private CallContext context;
 
     /**

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/RepositoryMap.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/RepositoryMap.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/RepositoryMap.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/RepositoryMap.java Mon Apr 18 17:08:24 2011
@@ -34,8 +34,8 @@ import org.apache.chemistry.opencmis.com
  */
 public class RepositoryMap {
 
-    private Map<String, FileShareRepository> fMap;
-    private Map<String, String> fLogins;
+    private final Map<String, FileShareRepository> fMap;
+    private final Map<String, String> fLogins;
 
     public RepositoryMap() {
         fMap = new HashMap<String, FileShareRepository>();

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.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/TypeManager.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java Mon Apr 18 17:08:24 2011
@@ -64,10 +64,10 @@ import org.apache.commons.logging.LogFac
  *
  */
 public class TypeManager {
-    public final static String DOCUMENT_TYPE_ID = "cmis:document";
-    public final static String FOLDER_TYPE_ID = "cmis:folder";
-    public final static String RELATIONSHIP_TYPE_ID = "cmis:relationship";
-    public final static String POLICY_TYPE_ID = "cmis:policy";
+    public static final String DOCUMENT_TYPE_ID = "cmis:document";
+    public static final String FOLDER_TYPE_ID = "cmis:folder";
+    public static final String RELATIONSHIP_TYPE_ID = "cmis:relationship";
+    public static final String POLICY_TYPE_ID = "cmis:policy";
 
     private static final String NAMESPACE = "http://opencmis.org/fileshare";
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.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/DummyCallContext.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java Mon Apr 18 17:08:24 2011
@@ -28,7 +28,7 @@ import java.util.Map;
 import org.apache.chemistry.opencmis.commons.server.CallContext;
 
 public class DummyCallContext implements CallContext {
-    private Map<String, Object> fParameter = new HashMap<String, Object>();
+    private final Map<String, Object> fParameter = new HashMap<String, Object>();
 
     public DummyCallContext() {
         fParameter.put(USERNAME, "TestUser");

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.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/NameValidator.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java Mon Apr 18 17:08:24 2011
@@ -31,7 +31,7 @@ public class NameValidator {
      * @param s
      *            string to verify
      */
-    static public boolean isValidId(String s) {
+    public static boolean isValidId(String s) {
         if (null == s || s.length() == 0)
             return false;
         
@@ -47,7 +47,7 @@ public class NameValidator {
         return true;
     }
 
-    static public boolean isValidLocalName(String s) {
+    public static boolean isValidLocalName(String s) {
         return isValidId(s);
     }
 
@@ -58,7 +58,7 @@ public class NameValidator {
      * @param s
      *            string to verify
      */
-    static public boolean isValidName(String s) {
+    public static boolean isValidName(String s) {
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
             if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '.' || c == '-'
@@ -68,11 +68,11 @@ public class NameValidator {
         return true;
     }
 
-    static public boolean isValidNamespace(String s) {
+    public static boolean isValidNamespace(String s) {
         return isValidId(s);
     }
 
-    static public boolean isValidQueryName(String s) {
+    public static boolean isValidQueryName(String s) {
         return isValidId(s);
     }
 

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=1094656&r1=1094655&r2=1094656&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 Mon Apr 18 17:08:24 2011
@@ -51,7 +51,7 @@ public class TypeManagerImpl implements 
     /**
      * map from repository id to a types map
      */
-    private Map<String, TypeDefinitionContainer> fTypesMap = new HashMap<String, TypeDefinitionContainer>();
+    private final Map<String, TypeDefinitionContainer> fTypesMap = new HashMap<String, TypeDefinitionContainer>();
 
     /* (non-Javadoc)
      * @see org.apache.chemistry.opencmis.inmemory.TypeManager#getTypeById(java.lang.String)

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=1094656&r1=1094655&r2=1094656&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 Mon Apr 18 17:08:24 2011
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.tree.Tree;
 import org.apache.chemistry.opencmis.commons.data.ObjectData;
 import org.apache.chemistry.opencmis.commons.data.ObjectList;
@@ -42,8 +41,6 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.enums.Cardinality;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.PropertyType;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectListImpl;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.DocumentVersion;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.Filing;
@@ -73,7 +70,7 @@ import org.apache.commons.logging.LogFac
  */
 public class InMemoryQueryProcessor {
 
-    private static Log LOG = LogFactory.getLog(InMemoryQueryProcessor.class);
+    private static final Log LOG = LogFactory.getLog(InMemoryQueryProcessor.class);
 
     private List<StoredObject> matches = new ArrayList<StoredObject>();
     private QueryObject queryObj;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.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/server/AtomLinkInfoProvider.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java Mon Apr 18 17:08:24 2011
@@ -47,7 +47,7 @@ import org.apache.chemistry.opencmis.inm
  */
 public class AtomLinkInfoProvider {
 
-    private StoreManager fStoreManager;
+    private final StoreManager fStoreManager;
 
     public AtomLinkInfoProvider(StoreManager storeManager) {
         fStoreManager = storeManager;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.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/server/BaseServiceValidatorImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.java Mon Apr 18 17:08:24 2011
@@ -19,7 +19,6 @@
 package org.apache.chemistry.opencmis.inmemory.server;
 
 import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
 import org.apache.chemistry.opencmis.commons.enums.UnfileObject;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.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/server/ExtensionSample.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java Mon Apr 18 17:08:24 2011
@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType
     "s", "i", "f"
 })
 public class ExtensionSample {
-    private String s;
-    private int i;
-    private double f;
+    private final String s;
+    private final int i;
+    private final double f;
     
     public ExtensionSample() {
         s = "This is an example for a CMIS extension.";

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.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/server/InMemoryDiscoveryServiceImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java Mon Apr 18 17:08:24 2011
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
 
 public class InMemoryDiscoveryServiceImpl extends InMemoryAbstractServiceImpl{
     
-    private static Log LOG = LogFactory.getLog(InMemoryDiscoveryServiceImpl.class);
+    private static final Log LOG = LogFactory.getLog(InMemoryDiscoveryServiceImpl.class);
 
     AtomLinkInfoProvider fAtomLinkProvider;
     InMemoryNavigationServiceImpl fNavigationService; // real implementation of

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.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/server/InMemoryNavigationServiceImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java Mon Apr 18 17:08:24 2011
@@ -63,7 +63,7 @@ import org.apache.commons.logging.LogFac
 
 public class InMemoryNavigationServiceImpl extends InMemoryAbstractServiceImpl {
 
-    private static Log LOG = LogFactory.getLog(InMemoryNavigationServiceImpl.class);
+    private static final Log LOG = LogFactory.getLog(InMemoryNavigationServiceImpl.class);
 
     AtomLinkInfoProvider fAtomLinkProvider;
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.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/server/InMemoryService.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java Mon Apr 18 17:08:24 2011
@@ -54,15 +54,15 @@ public class InMemoryService extends Abs
 
     private static final Log LOG = LogFactory.getLog(InMemoryService.class.getName());
 
-    private StoreManager storeManager; // singleton root of everything
+    private final StoreManager storeManager; // singleton root of everything
     private CallContext context;
 
-    private InMemoryRepositoryServiceImpl fRepSvc;
-    private InMemoryObjectServiceImpl fObjSvc;
-    private InMemoryNavigationServiceImpl fNavSvc;
-    private InMemoryVersioningServiceImpl fVerSvc;
-    private InMemoryDiscoveryServiceImpl fDisSvc;
-    private InMemoryMultiFilingServiceImpl fMultiSvc;
+    private final InMemoryRepositoryServiceImpl fRepSvc;
+    private final InMemoryObjectServiceImpl fObjSvc;
+    private final InMemoryNavigationServiceImpl fNavSvc;
+    private final InMemoryVersioningServiceImpl fVerSvc;
+    private final InMemoryDiscoveryServiceImpl fDisSvc;
+    private final InMemoryMultiFilingServiceImpl fMultiSvc;
 
     public StoreManager getStoreManager() {
         return storeManager;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/CmisServiceValidator.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/CmisServiceValidator.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/CmisServiceValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/CmisServiceValidator.java Mon Apr 18 17:08:24 2011
@@ -19,7 +19,6 @@
 package org.apache.chemistry.opencmis.inmemory.storedobj.api;
 
 import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
 import org.apache.chemistry.opencmis.commons.enums.UnfileObject;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.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/ContentStreamDataImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.java Mon Apr 18 17:08:24 2011
@@ -31,8 +31,6 @@ import java.util.List;
 import org.apache.chemistry.opencmis.commons.data.CmisExtensionElement;
 import org.apache.chemistry.opencmis.commons.data.ContentStream;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
-import org.apache.chemistry.opencmis.inmemory.ConfigConstants;
-import org.apache.chemistry.opencmis.inmemory.ConfigurationSettings;
 
 public class ContentStreamDataImpl implements ContentStream {
 
@@ -48,7 +46,7 @@ public class ContentStreamDataImpl imple
 
     private long fStreamLimitLength;
 
-    private long sizeLimitKB;
+    private final long sizeLimitKB;
 
     public ContentStreamDataImpl(long maxAllowedContentSizeKB) {
         sizeLimitKB = maxAllowedContentSizeKB;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentImpl.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/DocumentImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentImpl.java Mon Apr 18 17:08:24 2011
@@ -45,7 +45,7 @@ public class DocumentImpl extends Abstra
     private ContentStreamDataImpl fContent;
 
     private static final Log LOG = LogFactory.getLog(AbstractSingleFilingImpl.class.getName());
-    private Long MAX_CONTENT_SIZE_KB = ConfigurationSettings.getConfigurationValueAsLong(ConfigConstants.MAX_CONTENT_SIZE_KB);
+    private final Long MAX_CONTENT_SIZE_KB = ConfigurationSettings.getConfigurationValueAsLong(ConfigConstants.MAX_CONTENT_SIZE_KB);
     
     DocumentImpl(ObjectStoreImpl objStore) { // visibility should be package
         super(objStore);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.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/DocumentVersionImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java Mon Apr 18 17:08:24 2011
@@ -43,10 +43,10 @@ import org.apache.chemistry.opencmis.inm
  */
 public class DocumentVersionImpl extends StoredObjectImpl implements DocumentVersion {
 
-    private Long MAX_CONTENT_SIZE_KB = ConfigurationSettings.getConfigurationValueAsLong(ConfigConstants.MAX_CONTENT_SIZE_KB);
+    private final Long MAX_CONTENT_SIZE_KB = ConfigurationSettings.getConfigurationValueAsLong(ConfigConstants.MAX_CONTENT_SIZE_KB);
 
     private ContentStreamDataImpl fContent;
-    private VersionedDocument fContainer; // the document this version belongs
+    private final VersionedDocument fContainer; // the document this version belongs
     // to
     private String fComment; // checkin comment
     boolean fIsMajor;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryServiceValidatorImpl.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/InMemoryServiceValidatorImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryServiceValidatorImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryServiceValidatorImpl.java Mon Apr 18 17:08:24 2011
@@ -18,16 +18,8 @@
  */
 package org.apache.chemistry.opencmis.inmemory.storedobj.impl;
 
-import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
-import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
-import org.apache.chemistry.opencmis.commons.server.CallContext;
-import org.apache.chemistry.opencmis.commons.spi.Holder;
 import org.apache.chemistry.opencmis.inmemory.server.BaseServiceValidatorImpl;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoreManager;
-import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoredObject;
 
 public class InMemoryServiceValidatorImpl extends BaseServiceValidatorImpl {
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.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/ObjectStoreImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java Mon Apr 18 17:08:24 2011
@@ -72,9 +72,9 @@ public class ObjectStoreImpl implements 
     /**
      * a concurrent HashMap as core element to hold all objects in the repository
      */
-    private Map<String, StoredObject> fStoredObjectMap = new ConcurrentHashMap<String, StoredObject>();
+    private final Map<String, StoredObject> fStoredObjectMap = new ConcurrentHashMap<String, StoredObject>();
     
-    private Lock fLock = new ReentrantLock();
+    private final Lock fLock = new ReentrantLock();
     
     final String fRepositoryId;
     FolderImpl fRootFolder = null;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.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/StoreManagerFactory.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.java Mon Apr 18 17:08:24 2011
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
  */
 
 public class StoreManagerFactory {
-    private static Log log = LogFactory.getLog(StoreManagerFactory.class);
+    private static final Log log = LogFactory.getLog(StoreManagerFactory.class);
 
     public static StoreManager createInstance(String className) {
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Mon Apr 18 17:08:24 2011
@@ -64,7 +64,7 @@ import org.apache.commons.logging.LogFac
  */
 public class StoreManagerImpl implements StoreManager {
 
-    private static Log LOG = LogFactory.getLog(StoreManagerImpl.class);
+    private static final Log LOG = LogFactory.getLog(StoreManagerImpl.class);
     
     protected BindingsObjectFactory fObjectFactory;
     protected RepositoryInfo fRepositoryInfo;
@@ -73,12 +73,12 @@ public class StoreManagerImpl implements
     /**
      * map from repository id to a type manager
      */
-    private Map<String, TypeManagerImpl> fMapRepositoryToTypeManager = new HashMap<String, TypeManagerImpl>();
+    private final Map<String, TypeManagerImpl> fMapRepositoryToTypeManager = new HashMap<String, TypeManagerImpl>();
 
     /**
      * map from repository id to a object store
      */
-    private Map<String, ObjectStore> fMapRepositoryToObjectStore = new HashMap<String, ObjectStore>();
+    private final Map<String, ObjectStore> fMapRepositoryToObjectStore = new HashMap<String, ObjectStore>();
 
     public ObjectStoreImpl getStore(String repositoryId) {
         return (ObjectStoreImpl) fMapRepositoryToObjectStore.get(repositoryId);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.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/VersionedDocumentImpl.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java Mon Apr 18 17:08:24 2011
@@ -37,7 +37,7 @@ public class VersionedDocumentImpl exten
 
     private boolean fIsCheckedOut;
     private String fCheckedOutUser;
-    private List<DocumentVersion> fVersions;
+    private final List<DocumentVersion> fVersions;
 
     public VersionedDocumentImpl(ObjectStoreImpl objStore) {
         super(objStore);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DefaultTypeSystemCreator.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/types/DefaultTypeSystemCreator.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DefaultTypeSystemCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DefaultTypeSystemCreator.java Mon Apr 18 17:08:24 2011
@@ -40,7 +40,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.inmemory.TypeCreator;
 
 public class DefaultTypeSystemCreator implements TypeCreator {
-    static public List<TypeDefinition> singletonTypes = buildTypesList();
+    public static List<TypeDefinition> singletonTypes = buildTypesList();
     public static final String COMPLEX_TYPE = "ComplexType";
     public static final String TOPLEVEL_TYPE = "DocumentTopLevel";
     public static final String VERSIONED_TYPE = "VersionableType";
@@ -59,7 +59,7 @@ public class DefaultTypeSystemCreator im
         return singletonTypes;
     }
 
-    static public TypeDefinition getTypeById(String typeId) {
+    public static TypeDefinition getTypeById(String typeId) {
         for (TypeDefinition typeDef : singletonTypes)
             if (typeDef.getId().equals(typeId))
                 return typeDef;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.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/types/DocumentTypeCreationHelper.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java Mon Apr 18 17:08:24 2011
@@ -36,19 +36,19 @@ import org.apache.chemistry.opencmis.com
 
 public class DocumentTypeCreationHelper {
 
-    static private List<TypeDefinition> defaultTypes = createCmisDefaultTypes();
+    private static final List<TypeDefinition> defaultTypes = createCmisDefaultTypes();
 
-    static public List<TypeDefinition> createMapWithDefaultTypes() {
+    public static List<TypeDefinition> createMapWithDefaultTypes() {
         List<TypeDefinition> typesList = new LinkedList<TypeDefinition>();
         typesList.addAll(defaultTypes);
         return typesList;
     }
 
-    static public final List<TypeDefinition> getDefaultTypes() {
+    public static final List<TypeDefinition> getDefaultTypes() {
         return defaultTypes;
     }
 
-    static private List<TypeDefinition> createCmisDefaultTypes() {
+    private static List<TypeDefinition> createCmisDefaultTypes() {
         List<TypeDefinition> typesList = new LinkedList<TypeDefinition>();
 
         // create root types:
@@ -72,7 +72,7 @@ public class DocumentTypeCreationHelper 
      * 
      * @return typesMap map filled with created types
      */
-    static public List<TypeDefinition> createDefaultTypes() {
+    public static List<TypeDefinition> createDefaultTypes() {
         List<TypeDefinition> typesList = createCmisDefaultTypes();
 
         return typesList;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.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/types/InMemoryDocumentTypeDefinition.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java Mon Apr 18 17:08:24 2011
@@ -37,7 +37,7 @@ import org.apache.chemistry.opencmis.inm
 public class InMemoryDocumentTypeDefinition extends DocumentTypeDefinitionImpl {
 
     private static final long serialVersionUID = 1L;
-    private static InMemoryDocumentTypeDefinition DOCUMENT_TYPE = new InMemoryDocumentTypeDefinition();
+    private static final InMemoryDocumentTypeDefinition DOCUMENT_TYPE = new InMemoryDocumentTypeDefinition();
 
     public static InMemoryDocumentTypeDefinition getRootDocumentType() {
         return DOCUMENT_TYPE;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.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/types/InMemoryFolderTypeDefinition.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java Mon Apr 18 17:08:24 2011
@@ -31,7 +31,7 @@ import org.apache.chemistry.opencmis.inm
 public class InMemoryFolderTypeDefinition extends FolderTypeDefinitionImpl {
 
     private static final long serialVersionUID = 1L;
-    private static InMemoryFolderTypeDefinition FOLDER_TYPE = new InMemoryFolderTypeDefinition();
+    private static final InMemoryFolderTypeDefinition FOLDER_TYPE = new InMemoryFolderTypeDefinition();
 
     public static InMemoryFolderTypeDefinition getRootFolderType() {
         return FOLDER_TYPE;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.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/types/InMemoryPolicyTypeDefinition.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java Mon Apr 18 17:08:24 2011
@@ -31,7 +31,7 @@ import org.apache.chemistry.opencmis.inm
 public class InMemoryPolicyTypeDefinition extends PolicyTypeDefinitionImpl {
 
     private static final long serialVersionUID = 1L;
-    private static InMemoryPolicyTypeDefinition POLICY_TYPE = new InMemoryPolicyTypeDefinition();
+    private static final InMemoryPolicyTypeDefinition POLICY_TYPE = new InMemoryPolicyTypeDefinition();
 
     public static InMemoryPolicyTypeDefinition getRootPolicyType() {
         return POLICY_TYPE;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.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/types/InMemoryRelationshipTypeDefinition.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java Mon Apr 18 17:08:24 2011
@@ -31,7 +31,7 @@ import org.apache.chemistry.opencmis.inm
 public class InMemoryRelationshipTypeDefinition extends RelationshipTypeDefinitionImpl {
 
     private static final long serialVersionUID = 1L;
-    private static InMemoryRelationshipTypeDefinition RELATIONSHIP_TYPE = new InMemoryRelationshipTypeDefinition();
+    private static final InMemoryRelationshipTypeDefinition RELATIONSHIP_TYPE = new InMemoryRelationshipTypeDefinition();
 
     public static InMemoryRelationshipTypeDefinition getRootRelationshipType() {
         return RELATIONSHIP_TYPE;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.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/types/PropertyCreationHelper.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java Mon Apr 18 17:08:24 2011
@@ -70,7 +70,7 @@ import org.apache.commons.logging.LogFac
  */
 
 public class PropertyCreationHelper {
-    private static Log log = LogFactory.getLog(PropertyCreationHelper.class);
+    private static final Log log = LogFactory.getLog(PropertyCreationHelper.class);
 
     public static PropertyBooleanDefinitionImpl createBooleanDefinition(String id, String displayName) {
         PropertyBooleanDefinitionImpl prop = new PropertyBooleanDefinitionImpl();

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java Mon Apr 18 17:08:24 2011
@@ -64,7 +64,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class AbstractServiceTst /* extends TestCase */{
-    private static Log LOG = LogFactory.getLog(AbstractServiceTst.class);
+    private static final Log LOG = LogFactory.getLog(AbstractServiceTst.class);
     protected static final String REPOSITORY_ID = "UnitTestRepository";
     protected BindingsObjectFactory fFactory = new BindingsObjectFactoryImpl();
     protected String fRootFolderId;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java?rev=1094656&r1=1094655&r2=1094656&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java Mon Apr 18 17:08:24 2011
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 public class DiscoveryServiceTest extends AbstractServiceTst {
 
-    private static Log log = LogFactory.getLog(DiscoveryServiceTest.class);
+    private static final Log log = LogFactory.getLog(DiscoveryServiceTest.class);
     private static final String TEST_FOLDER_TYPE_ID = ObjectServiceTest.TEST_FOLDER_TYPE_ID;
     private static final String TEST_DOCUMENT_TYPE_ID = ObjectServiceTest.TEST_DOCUMENT_TYPE_ID;
     private static final String TEST_FOLDER_STRING_PROP_ID = ObjectServiceTest.TEST_FOLDER_STRING_PROP_ID;