chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1371646 [1/2] - in /chemistry/opencmis/trunk: chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apa...
Date Fri, 10 Aug 2012 10:48:41 GMT
Author: fmui
Date: Fri Aug 10 10:48:40 2012
New Revision: 1371646

URL: http://svn.apache.org/viewvc?rev=1371646&view=rev
Log:
code clean up
Browser Binding: support for properties extensions

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/SimpleCmisBindingFactory.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/AbstractMapCacheLevel.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ContentTypeCacheLevelImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/LruCacheLevelImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/MapCacheLevelImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/VersioningServiceImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConstants.java
    chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/filter/ProxyFilter.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CmisRepositoryContextListener.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareServiceFactory.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CmisServiceWrapper.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-client/src/main/java/org/apache/chemistry/opencmis/client/main/ObjGenApp.java
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/versioning/CheckedOutTest.java
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientHelper.java
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/checks/SwingReport.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/SimpleCmisBindingFactory.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/SimpleCmisBindingFactory.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/SimpleCmisBindingFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/client/SimpleCmisBindingFactory.java Fri Aug 10 10:48:40 2012
@@ -50,10 +50,13 @@ public class SimpleCmisBindingFactory {
         switch (bindingType) {
         case WEBSERVICES:
             binding = BINDING_FACTORY.createCmisWebServicesBinding(parameters);
+            break;
         case BROWSER:
             binding = BINDING_FACTORY.createCmisBrowserBinding(parameters);
+            break;
         default:
             binding = BINDING_FACTORY.createCmisAtomPubBinding(parameters);
+            break;
         }
 
         return binding;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/AbstractMapCacheLevel.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/AbstractMapCacheLevel.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/AbstractMapCacheLevel.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/AbstractMapCacheLevel.java Fri Aug 10 10:48:40 2012
@@ -24,9 +24,6 @@ import org.apache.chemistry.opencmis.cli
 
 /**
  * Abstract Map cache.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public abstract class AbstractMapCacheLevel implements CacheLevel {
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java Fri Aug 10 10:48:40 2012
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
  */
 public class CacheImpl implements Cache {
 
-    private static final Logger log = LoggerFactory.getLogger(CacheImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheImpl.class);
 
     private static final long serialVersionUID = 1L;
 
@@ -196,8 +196,8 @@ public class CacheImpl implements Cache 
 
             cacheLevel.put(value, keys[keys.length - 1]);
 
-            if (log.isTraceEnabled()) {
-                log.trace(name + ": put [" + getFormattedKeys(keys) + "] = " + value);
+            if (LOG.isTraceEnabled()) {
+                LOG.trace(name + ": put [" + getFormattedKeys(keys) + "] = " + value);
             }
         } finally {
             lock.writeLock().unlock();
@@ -228,8 +228,8 @@ public class CacheImpl implements Cache 
 
             cacheLevel.remove(keys[keys.length - 1]);
 
-            if (log.isTraceEnabled()) {
-                log.trace(name + ": removed [" + getFormattedKeys(keys) + "]");
+            if (LOG.isTraceEnabled()) {
+                LOG.trace(name + ": removed [" + getFormattedKeys(keys) + "]");
             }
         } finally {
             lock.writeLock().unlock();

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ContentTypeCacheLevelImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ContentTypeCacheLevelImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ContentTypeCacheLevelImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/ContentTypeCacheLevelImpl.java Fri Aug 10 10:48:40 2012
@@ -33,6 +33,7 @@ public class ContentTypeCacheLevelImpl e
      * Constructor.
      */
     public ContentTypeCacheLevelImpl() {
+        super();
         enableKeyFallback(null);
     }
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/LruCacheLevelImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/LruCacheLevelImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/LruCacheLevelImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/LruCacheLevelImpl.java Fri Aug 10 10:48:40 2012
@@ -23,9 +23,6 @@ import java.util.Map;
 
 /**
  * LRU cache.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public class LruCacheLevelImpl extends AbstractMapCacheLevel {
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/MapCacheLevelImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/MapCacheLevelImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/MapCacheLevelImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/MapCacheLevelImpl.java Fri Aug 10 10:48:40 2012
@@ -23,9 +23,6 @@ import java.util.Map;
 
 /**
  * Map cache.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public class MapCacheLevelImpl extends AbstractMapCacheLevel {
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java Fri Aug 10 10:48:40 2012
@@ -68,7 +68,7 @@ public class CmisBindingImpl implements 
      * @param authenticationProvider
      *            an authentication provider instance
      */
-    public CmisBindingImpl(Map<String, String> sessionParameters, AuthenticationProvider authenticationProvider) {
+    public CmisBindingImpl(final Map<String, String> sessionParameters, AuthenticationProvider authenticationProvider) {
         // some checks first
         if (sessionParameters == null) {
             throw new IllegalArgumentException("Session parameters must be set!");

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java Fri Aug 10 10:48:40 2012
@@ -41,9 +41,9 @@ public class NTLMAuthenticationProvider 
     private static final long serialVersionUID = 1L;
 
     // java.net.Authenticator is static, so this can be static too
-    private static final OpenCMISAuthenticator authenticator = new OpenCMISAuthenticator();
+    private static final OpenCMISAuthenticator AUTHENTICATOR = new OpenCMISAuthenticator();
     static {
-        Authenticator.setDefault(authenticator);
+        Authenticator.setDefault(AUTHENTICATOR);
     }
 
     @Override
@@ -54,7 +54,7 @@ public class NTLMAuthenticationProvider 
 
         // if no user is set, reset the authenticator
         if (user == null) {
-            authenticator.reset();
+            AUTHENTICATOR.reset();
             return null;
         }
 
@@ -63,7 +63,7 @@ public class NTLMAuthenticationProvider 
         }
 
         // set user and password
-        authenticator.setPasswordAuthentication(user, password);
+        AUTHENTICATOR.setPasswordAuthentication(user, password);
 
         // OpenCMIS is not in charge of the authentication
         // -> no HTTP header to set

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java Fri Aug 10 10:48:40 2012
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class CmisAtomPubSpi implements CmisSpi {
 
-    private static final Logger log = LoggerFactory.getLogger(CmisAtomPubSpi.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CmisAtomPubSpi.class);
 
     private final BindingSession session;
 
@@ -55,8 +55,8 @@ public class CmisAtomPubSpi implements C
      * Constructor.
      */
     public CmisAtomPubSpi(BindingSession session) {
-        if (log.isDebugEnabled()) {
-            log.debug("Initializing AtomPub SPI...");
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Initializing AtomPub SPI...");
         }
 
         this.session = session;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java Fri Aug 10 10:48:40 2012
@@ -276,9 +276,9 @@ public class ObjectServiceImpl extends A
 
         if (getSuccinct()) {
             TypeCache typeCache = new ClientTypeCacheImpl(repositoryId, this);
-            return JSONConverter.convertSuccinctProperties(json, typeCache);
+            return JSONConverter.convertSuccinctProperties(json, null, typeCache);
         } else {
-            return JSONConverter.convertProperties(json);
+            return JSONConverter.convertProperties(json, null);
         }
     }
 
@@ -348,7 +348,7 @@ public class ObjectServiceImpl extends A
 
         TypeCache typeCache = new ClientTypeCacheImpl(repositoryId, this);
 
-        ObjectData newObj = JSONConverter.convertObject(json,typeCache);
+        ObjectData newObj = JSONConverter.convertObject(json, typeCache);
 
         objectId.setValue(newObj == null ? null : newObj.getId());
 
@@ -385,7 +385,7 @@ public class ObjectServiceImpl extends A
 
         TypeCache typeCache = new ClientTypeCacheImpl(repositoryId, this);
 
-        ObjectData newObj = JSONConverter.convertObject(json,typeCache);
+        ObjectData newObj = JSONConverter.convertObject(json, typeCache);
 
         objectId.setValue(newObj == null ? null : newObj.getId());
     }
@@ -459,7 +459,7 @@ public class ObjectServiceImpl extends A
 
         TypeCache typeCache = new ClientTypeCacheImpl(repositoryId, this);
 
-        ObjectData newObj = JSONConverter.convertObject(json,typeCache);
+        ObjectData newObj = JSONConverter.convertObject(json, typeCache);
 
         objectId.setValue(newObj == null ? null : newObj.getId());
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/VersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/VersioningServiceImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/VersioningServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/VersioningServiceImpl.java Fri Aug 10 10:48:40 2012
@@ -172,9 +172,9 @@ public class VersioningServiceImpl exten
 
         if (getSuccinct()) {
             TypeCache typeCache = new ClientTypeCacheImpl(repositoryId, this);
-            return JSONConverter.convertSuccinctProperties(json, typeCache);
+            return JSONConverter.convertSuccinctProperties(json, null, typeCache);
         } else {
-            return JSONConverter.convertProperties(json);
+            return JSONConverter.convertProperties(json, null);
         }
     }
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java Fri Aug 10 10:48:40 2012
@@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.com
 /**
  * Helper methods for binding handling.
  */
-public class CmisBindingHelper {
+public final class CmisBindingHelper {
 
     private CmisBindingHelper() {
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java Fri Aug 10 10:48:40 2012
@@ -38,7 +38,7 @@ import org.apache.chemistry.opencmis.com
 /**
  * QueryStatement implementation.
  */
-public class QueryStatementImpl implements QueryStatement {
+public class QueryStatementImpl implements QueryStatement, Cloneable {
 
     private final Session session;
     private final String statement;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java Fri Aug 10 10:48:40 2012
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
 
 public class ItemIterableTest {
 
-    private static final Logger log = LoggerFactory.getLogger(ItemIterableTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ItemIterableTest.class);
     static {
         Properties p = new Properties();
         try {
@@ -59,7 +59,7 @@ public class ItemIterableTest {
                 boolean hasMoreItems = true;
                 List<String> page = new ArrayList<String>();
 
-                ItemIterableTest.log.info("(" + skipCount + "|" + this.maxNumItems + ") ");
+                ItemIterableTest.LOG.info("(" + skipCount + "|" + this.maxNumItems + ") ");
 
                 int from = (int) skipCount;
                 int to = (int) (skipCount + this.maxNumItems);
@@ -172,7 +172,7 @@ public class ItemIterableTest {
 
     @Test
     public void totalNumItems() {
-        ItemIterableTest.log.info("totalNumItems");
+        ItemIterableTest.LOG.info("totalNumItems");
 
         int pageSize = 5;
         ItemIterable<String> p = this.getIterable(this.data10, pageSize);
@@ -188,7 +188,7 @@ public class ItemIterableTest {
 
     @Test
     public void hasMoreItems() {
-        ItemIterableTest.log.info("totalHasMoreItems");
+        ItemIterableTest.LOG.info("totalHasMoreItems");
 
         int pageSize = 5;
         ItemIterable<String> p = this.getIterable(this.data10, pageSize);
@@ -204,7 +204,7 @@ public class ItemIterableTest {
 
     @Test
     public void pageNumItems() {
-        ItemIterableTest.log.info("totalPageNumItems");
+        ItemIterableTest.LOG.info("totalPageNumItems");
 
         int pageSize = 7;
         ItemIterable<String> p = this.getIterable(this.data10, pageSize);
@@ -219,7 +219,7 @@ public class ItemIterableTest {
     }
 
     private void loopSubPage(String[] data, int skipCount, int maxItems, int pageSize) {
-        ItemIterableTest.log.info("loopSubPage (" + skipCount + ", " + maxItems + ", " + pageSize + ")");
+        ItemIterableTest.LOG.info("loopSubPage (" + skipCount + ", " + maxItems + ", " + pageSize + ")");
         String msg = "";
 
         ItemIterable<String> p = this.getIterable(data, pageSize);
@@ -236,12 +236,12 @@ public class ItemIterableTest {
             msg += (s + " ");
             count++;
         }
-        ItemIterableTest.log.info(msg);
+        ItemIterableTest.LOG.info(msg);
         assertTrue(count <= pageSize);
     }
 
     private void loopSkip(String[] data, int skipCount, int pageSize) {
-        ItemIterableTest.log.info("loopSkip (" + skipCount + ", " + pageSize + ")");
+        ItemIterableTest.LOG.info("loopSkip (" + skipCount + ", " + pageSize + ")");
         String msg = "";
 
         ItemIterable<String> p = this.getIterable(data, pageSize);
@@ -256,12 +256,12 @@ public class ItemIterableTest {
             msg += (s + " ");
             count++;
         }
-        ItemIterableTest.log.info(msg);
+        ItemIterableTest.LOG.info(msg);
         assertEquals(data.length - skipCount, count);
     }
 
     private void loopAll(String[] data, int pageSize) {
-        ItemIterableTest.log.info("loopAll (" + pageSize + ")");
+        ItemIterableTest.LOG.info("loopAll (" + pageSize + ")");
         String msg = "";
 
         ItemIterable<String> p = this.getIterable(data, pageSize);
@@ -274,12 +274,12 @@ public class ItemIterableTest {
             msg += (s + " ");
             count++;
         }
-        ItemIterableTest.log.info(msg);
+        ItemIterableTest.LOG.info(msg);
         assertEquals(data.length, count);
     }
 
     private void loopPage(String[] data, int skipCount, int pageSize) {
-        ItemIterableTest.log.info("loopPage (" + skipCount + ", " + pageSize + ")");
+        ItemIterableTest.LOG.info("loopPage (" + skipCount + ", " + pageSize + ")");
         String msg = "";
 
         ItemIterable<String> p = this.getIterable(data, pageSize);
@@ -294,7 +294,7 @@ public class ItemIterableTest {
             msg += (s + " ");
             count++;
         }
-        ItemIterableTest.log.info(msg);
+        ItemIterableTest.LOG.info(msg);
         assertEquals(Math.min(data.length - skipCount, pageSize), count);
     }
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConstants.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/JSONConstants.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConstants.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConstants.java Fri Aug 10 10:48:40 2012
@@ -26,7 +26,7 @@ import org.apache.chemistry.opencmis.com
 /**
  * JSON object constants.
  */
-public class JSONConstants {
+public final class JSONConstants {
 
     public static final String ERROR_EXCEPTION = "exception";
     public static final String ERROR_MESSAGE = "message";
@@ -139,6 +139,7 @@ public class JSONConstants {
 
     public static final String JSON_OBJECT_PROPERTIES = "properties";
     public static final String JSON_OBJECT_SUCCINCT_PROPERTIES = "succinctProperties";
+    public static final String JSON_OBJECT_PROPERTIES_EXTENSION = "propertiesExtension";
     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";
@@ -152,6 +153,7 @@ public class JSONConstants {
     static {
         OBJECT_KEYS.add(JSON_OBJECT_PROPERTIES);
         OBJECT_KEYS.add(JSON_OBJECT_SUCCINCT_PROPERTIES);
+        OBJECT_KEYS.add(JSON_OBJECT_PROPERTIES_EXTENSION);
         OBJECT_KEYS.add(JSON_OBJECT_ALLOWABLE_ACTIONS);
         OBJECT_KEYS.add(JSON_OBJECT_RELATIONSHIPS);
         OBJECT_KEYS.add(JSON_OBJECT_CHANGE_EVENT_INFO);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java Fri Aug 10 10:48:40 2012
@@ -150,7 +150,7 @@ import org.apache.chemistry.opencmis.com
 /**
  * OpenCMIS objects to JSON converter.
  */
-public class JSONConverter {
+public final class JSONConverter {
 
     /**
      * Private constructor.
@@ -161,7 +161,8 @@ public class JSONConverter {
     /**
      * Converts a repository info object.
      */
-    public static JSONObject convert(RepositoryInfo repositoryInfo, String repositoryUrl, String rootUrl) {
+    public static JSONObject convert(final RepositoryInfo repositoryInfo, final String repositoryUrl,
+            final String rootUrl) {
         if (repositoryInfo == null) {
             return null;
         }
@@ -204,7 +205,7 @@ public class JSONConverter {
     /**
      * Converts a capabilities object.
      */
-    public static JSONObject convert(RepositoryCapabilities capabilities) {
+    public static JSONObject convert(final RepositoryCapabilities capabilities) {
         if (capabilities == null) {
             return null;
         }
@@ -235,7 +236,7 @@ public class JSONConverter {
     /**
      * Converts an ACL capabilities object.
      */
-    public static JSONObject convert(AclCapabilities capabilities) {
+    public static JSONObject convert(final AclCapabilities capabilities) {
         if (capabilities == null) {
             return null;
         }
@@ -288,7 +289,7 @@ public class JSONConverter {
         return result;
     }
 
-    public static RepositoryInfo convertRepositoryInfo(Map<String, Object> json) {
+    public static RepositoryInfo convertRepositoryInfo(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -331,7 +332,7 @@ public class JSONConverter {
         return result;
     }
 
-    public static RepositoryCapabilities convertRepositoryCapabilities(Map<String, Object> json) {
+    public static RepositoryCapabilities convertRepositoryCapabilities(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -361,7 +362,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static AclCapabilities convertAclCapabilities(Map<String, Object> json) {
+    public static AclCapabilities convertAclCapabilities(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -433,7 +434,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static TypeDefinition convertTypeDefinition(Map<String, Object> json) {
+    public static TypeDefinition convertTypeDefinition(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -525,7 +526,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static PropertyDefinition<?> convertPropertyDefinition(Map<String, Object> json) {
+    public static PropertyDefinition<?> convertPropertyDefinition(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -637,7 +638,7 @@ public class JSONConverter {
      * Converts choices.
      */
     @SuppressWarnings({ "rawtypes" })
-    private static List<Choice<String>> convertChoicesString(Object choices) {
+    private static List<Choice<String>> convertChoicesString(final Object choices) {
         if (!(choices instanceof List)) {
             return null;
         }
@@ -674,7 +675,7 @@ public class JSONConverter {
      * Converts choices.
      */
     @SuppressWarnings({ "rawtypes" })
-    private static List<Choice<Boolean>> convertChoicesBoolean(Object choices) {
+    private static List<Choice<Boolean>> convertChoicesBoolean(final Object choices) {
         if (!(choices instanceof List)) {
             return null;
         }
@@ -711,7 +712,7 @@ public class JSONConverter {
      * Converts choices.
      */
     @SuppressWarnings({ "rawtypes" })
-    private static List<Choice<BigInteger>> convertChoicesInteger(Object choices) {
+    private static List<Choice<BigInteger>> convertChoicesInteger(final Object choices) {
         if (!(choices instanceof List)) {
             return null;
         }
@@ -748,7 +749,7 @@ public class JSONConverter {
      * Converts choices.
      */
     @SuppressWarnings({ "rawtypes" })
-    private static List<Choice<BigDecimal>> convertChoicesDecimal(Object choices) {
+    private static List<Choice<BigDecimal>> convertChoicesDecimal(final Object choices) {
         if (!(choices instanceof List)) {
             return null;
         }
@@ -785,7 +786,7 @@ public class JSONConverter {
      * Converts choices.
      */
     @SuppressWarnings({ "rawtypes" })
-    private static List<Choice<GregorianCalendar>> convertChoicesDateTime(Object choices) {
+    private static List<Choice<GregorianCalendar>> convertChoicesDateTime(final Object choices) {
         if (!(choices instanceof List)) {
             return null;
         }
@@ -821,7 +822,8 @@ public class JSONConverter {
     /**
      * Converts an object.
      */
-    public static JSONObject convert(ObjectData object, TypeCache typeCache, boolean isQueryResult, boolean succinct) {
+    public static JSONObject convert(final ObjectData object, final TypeCache typeCache, final boolean isQueryResult,
+            final boolean succinct) {
         if (object == null) {
             return null;
         }
@@ -841,6 +843,12 @@ public class JSONConverter {
                     result.put(JSON_OBJECT_PROPERTIES, properties);
                 }
             }
+
+            JSONObject propertiesExtension = new JSONObject();
+            convertExtension(object.getProperties(), propertiesExtension);
+            if (!propertiesExtension.isEmpty()) {
+                result.put(JSON_OBJECT_PROPERTIES_EXTENSION, propertiesExtension);
+            }
         }
 
         // allowable actions
@@ -912,8 +920,8 @@ public class JSONConverter {
     /**
      * Converts a bag of properties.
      */
-    public static JSONObject convert(final Properties properties, String objectId, final TypeCache typeCache,
-            boolean isQueryResult, boolean succinct) {
+    public static JSONObject convert(final Properties properties, final String objectId, final TypeCache typeCache,
+            final boolean isQueryResult, final boolean succinct) {
         if (properties == null) {
             return null;
         }
@@ -946,8 +954,6 @@ public class JSONConverter {
             result.put(propId, convert(property, propDef, succinct));
         }
 
-        convertExtension(properties, result);
-
         return result;
     }
 
@@ -1041,7 +1047,7 @@ public class JSONConverter {
     /**
      * Converts allowable actions.
      */
-    public static JSONObject convert(AllowableActions allowableActions) {
+    public static JSONObject convert(final AllowableActions allowableActions) {
         if (allowableActions == null) {
             return null;
         }
@@ -1061,7 +1067,7 @@ public class JSONConverter {
     /**
      * Converts an ACL.
      */
-    public static JSONObject convert(Acl acl) {
+    public static JSONObject convert(final Acl acl) {
         if ((acl == null) || (acl.getAces() == null)) {
             return null;
         }
@@ -1098,7 +1104,7 @@ public class JSONConverter {
     /**
      * Converts a rendition.
      */
-    public static JSONObject convert(RenditionData rendition) {
+    public static JSONObject convert(final RenditionData rendition) {
         if (rendition == null) {
             return null;
         }
@@ -1122,7 +1128,8 @@ public class JSONConverter {
     /**
      * Converts a query object list.
      */
-    public static JSONObject convert(ObjectList list, TypeCache typeCache, boolean isQueryResult, boolean succinct) {
+    public static JSONObject convert(final ObjectList list, final TypeCache typeCache, final boolean isQueryResult,
+            final boolean succinct) {
         if (list == null) {
             return null;
         }
@@ -1156,7 +1163,8 @@ public class JSONConverter {
     /**
      * Converts an object in a folder list.
      */
-    public static JSONObject convert(ObjectInFolderData objectInFolder, TypeCache typeCache, boolean succinct) {
+    public static JSONObject convert(final ObjectInFolderData objectInFolder, final TypeCache typeCache,
+            final boolean succinct) {
         if ((objectInFolder == null) || (objectInFolder.getObject() == null)) {
             return null;
         }
@@ -1173,7 +1181,8 @@ public class JSONConverter {
     /**
      * Converts a folder list.
      */
-    public static JSONObject convert(ObjectInFolderList objectInFolderList, TypeCache typeCache, boolean succinct) {
+    public static JSONObject convert(final ObjectInFolderList objectInFolderList, final TypeCache typeCache,
+            final boolean succinct) {
         if (objectInFolderList == null) {
             return null;
         }
@@ -1201,7 +1210,8 @@ public class JSONConverter {
     /**
      * Converts a folder container.
      */
-    public static JSONObject convert(ObjectInFolderContainer container, TypeCache typeCache, boolean succinct) {
+    public static JSONObject convert(final ObjectInFolderContainer container, final TypeCache typeCache,
+            final boolean succinct) {
         if (container == null) {
             return null;
         }
@@ -1226,7 +1236,7 @@ public class JSONConverter {
     /**
      * Converts an object parent.
      */
-    public static JSONObject convert(ObjectParentData parent, TypeCache typeCache, boolean succinct) {
+    public static JSONObject convert(final ObjectParentData parent, final TypeCache typeCache, final boolean succinct) {
         if ((parent == null) || (parent.getObject() == null)) {
             return null;
         }
@@ -1245,7 +1255,7 @@ public class JSONConverter {
     /**
      * Converts a type definition.
      */
-    public static JSONObject convert(TypeDefinition type) {
+    public static JSONObject convert(final TypeDefinition type) {
         if (type == null) {
             return null;
         }
@@ -1298,7 +1308,7 @@ public class JSONConverter {
     /**
      * Converts a property type definition.
      */
-    public static JSONObject convert(PropertyDefinition<?> propertyDefinition) {
+    public static JSONObject convert(final PropertyDefinition<?> propertyDefinition) {
         if (propertyDefinition == null) {
             return null;
         }
@@ -1380,7 +1390,7 @@ public class JSONConverter {
     /**
      * Converts choices.
      */
-    private static <T> JSONArray convertChoices(List<Choice<T>> choices, Cardinality cardinality) {
+    private static <T> JSONArray convertChoices(final List<Choice<T>> choices, final Cardinality cardinality) {
         if (choices == null) {
             return null;
         }
@@ -1417,7 +1427,7 @@ public class JSONConverter {
     /**
      * Converts a type definition list.
      */
-    public static JSONObject convert(TypeDefinitionList list) {
+    public static JSONObject convert(final TypeDefinitionList list) {
         if (list == null) {
             return null;
         }
@@ -1446,7 +1456,7 @@ public class JSONConverter {
      * Converts a type definition list.
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static TypeDefinitionList convertTypeChildren(Map<String, Object> json) {
+    public static TypeDefinitionList convertTypeChildren(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -1476,7 +1486,7 @@ public class JSONConverter {
     /**
      * Converts a type definition container.
      */
-    public static JSONObject convert(TypeDefinitionContainer container) {
+    public static JSONObject convert(final TypeDefinitionContainer container) {
         if (container == null) {
             return null;
         }
@@ -1502,7 +1512,7 @@ public class JSONConverter {
      * Converts a type definition list.
      */
     @SuppressWarnings({ "unchecked" })
-    public static List<TypeDefinitionContainer> convertTypeDescendants(List<Object> json) {
+    public static List<TypeDefinitionContainer> convertTypeDescendants(final List<Object> json) {
         if (json == null) {
             return null;
         }
@@ -1539,7 +1549,7 @@ public class JSONConverter {
     /**
      * Converts an object.
      */
-    public static ObjectData convertObject(Map<String, Object> json, TypeCache typeCache) {
+    public static ObjectData convertObject(final Map<String, Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -1564,11 +1574,12 @@ public class JSONConverter {
 
         Map<String, Object> propMap = getMap(json.get(JSON_OBJECT_SUCCINCT_PROPERTIES));
         if (propMap != null) {
-            result.setProperties(convertSuccinctProperties(propMap, typeCache));
+            result.setProperties(convertSuccinctProperties(propMap, getMap(json.get(JSON_OBJECT_PROPERTIES_EXTENSION)),
+                    typeCache));
         }
         propMap = getMap(json.get(JSON_OBJECT_PROPERTIES));
         if (propMap != null) {
-            result.setProperties(convertProperties(propMap));
+            result.setProperties(convertProperties(propMap, getMap(json.get(JSON_OBJECT_PROPERTIES_EXTENSION))));
         }
 
         List<Object> jsonRelationships = getList(json.get(JSON_OBJECT_RELATIONSHIPS));
@@ -1588,7 +1599,7 @@ public class JSONConverter {
     /**
      * Converts an object.
      */
-    public static List<ObjectData> convertObjects(List<Object> json, TypeCache typeCache) {
+    public static List<ObjectData> convertObjects(final List<Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -1607,7 +1618,7 @@ public class JSONConverter {
     /**
      * Converts an ACL.
      */
-    public static Acl convertAcl(Map<String, Object> json, Boolean isExact) {
+    public static Acl convertAcl(final Map<String, Object> json, final Boolean isExact) {
         if (json == null) {
             return null;
         }
@@ -1667,7 +1678,7 @@ public class JSONConverter {
     /**
      * Converts allowable actions.
      */
-    public static AllowableActions convertAllowableActions(Map<String, Object> json) {
+    public static AllowableActions convertAllowableActions(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -1692,7 +1703,7 @@ public class JSONConverter {
     /**
      * Converts a list of policy ids.
      */
-    public static PolicyIdList convertPolicyIds(Map<String, Object> json) {
+    public static PolicyIdList convertPolicyIds(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -1721,7 +1732,7 @@ public class JSONConverter {
      * Converts properties.
      */
     @SuppressWarnings("unchecked")
-    public static Properties convertProperties(Map<String, Object> json) {
+    public static Properties convertProperties(final Map<String, Object> json, final Map<String, Object> extJson) {
         if (json == null) {
             return null;
         }
@@ -1907,7 +1918,9 @@ public class JSONConverter {
             }
         }
 
-        // TODO: properties extensions
+        if (extJson != null) {
+            convertExtension(extJson, result, Collections.<String> emptySet());
+        }
 
         return result;
     }
@@ -1916,7 +1929,8 @@ public class JSONConverter {
      * Converts properties.
      */
     @SuppressWarnings("unchecked")
-    public static Properties convertSuccinctProperties(Map<String, Object> json, TypeCache typeCache) {
+    public static Properties convertSuccinctProperties(final Map<String, Object> json,
+            final Map<String, Object> extJson, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2156,13 +2170,17 @@ public class JSONConverter {
             result.addProperty(property);
         }
 
+        if (extJson != null) {
+            convertExtension(extJson, result, Collections.<String> emptySet());
+        }
+
         return result;
     }
 
     /**
      * Converts a rendition.
      */
-    public static RenditionData convertRendition(Map<String, Object> json) {
+    public static RenditionData convertRendition(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -2186,7 +2204,7 @@ public class JSONConverter {
     /**
      * Converts a list of renditions.
      */
-    public static List<RenditionData> convertRenditions(List<Object> json) {
+    public static List<RenditionData> convertRenditions(final List<Object> json) {
         if (json == null) {
             return null;
         }
@@ -2206,7 +2224,7 @@ public class JSONConverter {
     /**
      * Converts a object list.
      */
-    public static ObjectInFolderList convertObjectInFolderList(Map<String, Object> json, TypeCache typeCache) {
+    public static ObjectInFolderList convertObjectInFolderList(final Map<String, Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2237,7 +2255,7 @@ public class JSONConverter {
     /**
      * Converts an object in a folder.
      */
-    public static ObjectInFolderData convertObjectInFolder(Map<String, Object> json, TypeCache typeCache) {
+    public static ObjectInFolderData convertObjectInFolder(final Map<String, Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2255,7 +2273,7 @@ public class JSONConverter {
     /**
      * Converts a descendants tree.
      */
-    public static List<ObjectInFolderContainer> convertDescendants(List<Object> json, TypeCache typeCache) {
+    public static List<ObjectInFolderContainer> convertDescendants(final List<Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2275,7 +2293,7 @@ public class JSONConverter {
     /**
      * Converts a descendant.
      */
-    public static ObjectInFolderContainer convertDescendant(Map<String, Object> json, TypeCache typeCache) {
+    public static ObjectInFolderContainer convertDescendant(final Map<String, Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2305,7 +2323,7 @@ public class JSONConverter {
     /**
      * Converts an object parents list.
      */
-    public static List<ObjectParentData> convertObjectParents(List<Object> json, TypeCache typeCache) {
+    public static List<ObjectParentData> convertObjectParents(final List<Object> json, final TypeCache typeCache) {
         if (json == null) {
             return null;
         }
@@ -2332,7 +2350,8 @@ public class JSONConverter {
     /**
      * Converts a object list.
      */
-    public static ObjectList convertObjectList(Map<String, Object> json, TypeCache typeCache, boolean isQueryResult) {
+    public static ObjectList convertObjectList(final Map<String, Object> json, final TypeCache typeCache,
+            final boolean isQueryResult) {
         if (json == null) {
             return null;
         }
@@ -2367,7 +2386,7 @@ public class JSONConverter {
     /**
      * Converts FailedToDelete ids.
      */
-    public static JSONObject convert(FailedToDeleteData ftd) {
+    public static JSONObject convert(final FailedToDeleteData ftd) {
         if (ftd == null) {
             return null;
         }
@@ -2391,7 +2410,7 @@ public class JSONConverter {
     /**
      * Converts FailedToDelete ids.
      */
-    public static FailedToDeleteData convertFailedToDelete(Map<String, Object> json) {
+    public static FailedToDeleteData convertFailedToDelete(final Map<String, Object> json) {
         if (json == null) {
             return null;
         }
@@ -2418,7 +2437,7 @@ public class JSONConverter {
 
     // -----------------------------------------------------------------
 
-    public static void convertExtension(ExtensionsData source, JSONObject target) {
+    public static void convertExtension(final ExtensionsData source, final JSONObject target) {
         if (source == null || source.getExtensions() == null) {
             return;
         }
@@ -2432,7 +2451,7 @@ public class JSONConverter {
         }
     }
 
-    private static JSONObject convertExtensionList(List<CmisExtensionElement> extensionList) {
+    private static JSONObject convertExtensionList(final List<CmisExtensionElement> extensionList) {
         if (extensionList == null) {
             return null;
         }
@@ -2451,7 +2470,8 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static void convertExtension(Map<String, Object> source, ExtensionsData target, Set<String> cmisKeys) {
+    public static void convertExtension(final Map<String, Object> source, final ExtensionsData target,
+            final Set<String> cmisKeys) {
         if (source == null) {
             return;
         }
@@ -2483,7 +2503,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static List<CmisExtensionElement> convertExtension(Map<String, Object> map) {
+    public static List<CmisExtensionElement> convertExtension(final Map<String, Object> map) {
         if (map == null) {
             return null;
         }
@@ -2507,7 +2527,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static List<CmisExtensionElement> convertExtension(List<Object> list) {
+    public static List<CmisExtensionElement> convertExtension(final List<Object> list) {
         if (list == null) {
             return null;
         }
@@ -2535,7 +2555,7 @@ public class JSONConverter {
 
     // -----------------------------------------------------------------
 
-    public static String getJSONStringValue(Object obj) {
+    public static String getJSONStringValue(final Object obj) {
         if (obj == null) {
             return null;
         }
@@ -2543,7 +2563,7 @@ public class JSONConverter {
         return obj.toString();
     }
 
-    public static Object getJSONValue(Object value) {
+    public static Object getJSONValue(final Object value) {
         if (value instanceof GregorianCalendar) {
             return ((GregorianCalendar) value).getTimeInMillis();
         }
@@ -2551,7 +2571,7 @@ public class JSONConverter {
         return value;
     }
 
-    public static Object getCMISValue(Object value, PropertyType propertyType) {
+    public static Object getCMISValue(final Object value, final PropertyType propertyType) {
         if (value == null) {
             return null;
         }
@@ -2592,7 +2612,7 @@ public class JSONConverter {
         throw new CmisRuntimeException("Unkown property type!");
     }
 
-    public static JSONArray getJSONArrayFromList(List<?> list) {
+    public static JSONArray getJSONArrayFromList(final List<?> list) {
         if (list == null) {
             return null;
         }
@@ -2603,7 +2623,7 @@ public class JSONConverter {
         return result;
     }
 
-    public static String getJSONPropertyDataType(PropertyData<?> property) {
+    public static String getJSONPropertyDataType(final PropertyData<?> property) {
         if (property instanceof PropertyBoolean) {
             return PropertyType.BOOLEAN.value();
         } else if (property instanceof PropertyId) {
@@ -2632,7 +2652,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static Map<String, Object> getMap(Object o) {
+    public static Map<String, Object> getMap(final Object o) {
         if (o == null) {
             return null;
         }
@@ -2646,7 +2666,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static List<Object> getList(Object o) {
+    public static List<Object> getList(final Object o) {
         if (o == null) {
             return null;
         }
@@ -2659,12 +2679,12 @@ public class JSONConverter {
                 + (o instanceof List ? "JSON object" : o.getClass().getSimpleName()) + ": " + o.toString());
     }
 
-    public static String getString(Map<String, Object> json, String key) {
+    public static String getString(final Map<String, Object> json, final String key) {
         Object obj = json.get(key);
         return obj == null ? null : obj.toString();
     }
 
-    public static Boolean getBoolean(Map<String, Object> json, String key) {
+    public static Boolean getBoolean(final Map<String, Object> json, final String key) {
         Object obj = json.get(key);
 
         if (obj instanceof Boolean) {
@@ -2674,7 +2694,7 @@ public class JSONConverter {
         return null;
     }
 
-    public static BigInteger getInteger(Map<String, Object> json, String key) {
+    public static BigInteger getInteger(final Map<String, Object> json, final String key) {
         Object obj = json.get(key);
 
         if (obj instanceof BigInteger) {
@@ -2684,7 +2704,7 @@ public class JSONConverter {
         return null;
     }
 
-    public static BigDecimal getDecimal(Map<String, Object> json, String key) {
+    public static BigDecimal getDecimal(final Map<String, Object> json, final String key) {
         Object obj = json.get(key);
 
         if (obj instanceof BigDecimal) {
@@ -2694,7 +2714,7 @@ public class JSONConverter {
         return null;
     }
 
-    public static GregorianCalendar getDateTime(Map<String, Object> json, String key) {
+    public static GregorianCalendar getDateTime(final Map<String, Object> json, final String key) {
         Object obj = json.get(key);
 
         if (obj instanceof Number) {
@@ -2707,7 +2727,7 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Enum<T>> T getEnum(Map<String, Object> json, String key, Class<T> clazz) {
+    public static <T extends Enum<T>> T getEnum(final Map<String, Object> json, final String key, final Class<T> clazz) {
         String value = getString(json, key);
         if (value == null) {
             return null;
@@ -2726,7 +2746,8 @@ public class JSONConverter {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Enum<T>> T getIntEnum(Map<String, Object> json, String key, Class<T> clazz) {
+    public static <T extends Enum<T>> T getIntEnum(final Map<String, Object> json, final String key,
+            final Class<T> clazz) {
         BigInteger value = getInteger(json, key);
         if (value == null) {
             return null;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/filter/ProxyFilter.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/filter/ProxyFilter.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/filter/ProxyFilter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/filter/ProxyFilter.java Fri Aug 10 10:48:40 2012
@@ -51,7 +51,7 @@ public class ProxyFilter implements Filt
         }
     }
 
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+    public void doFilter(ServletRequest request, ServletResponse response, final FilterChain chain) throws IOException,
             ServletException {
 
         // check for trusted proxy

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CmisRepositoryContextListener.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/CmisRepositoryContextListener.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CmisRepositoryContextListener.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CmisRepositoryContextListener.java Fri Aug 10 10:48:40 2012
@@ -39,7 +39,7 @@ public class CmisRepositoryContextListen
 
     public static final String SERVICES_FACTORY = "org.apache.chemistry.opencmis.servicesfactory";
 
-    private static final Logger log = LoggerFactory.getLogger(CmisRepositoryContextListener.class.getName());
+    private static final Logger LOG = LoggerFactory.getLogger(CmisRepositoryContextListener.class.getName());
 
     private static final String CONFIG_INIT_PARAM = "org.apache.chemistry.opencmis.REPOSITORY_CONFIG_FILE";
     private static final String CONFIG_FILENAME = "/repository.properties";
@@ -75,7 +75,7 @@ public class CmisRepositoryContextListen
         InputStream stream = this.getClass().getResourceAsStream(filename);
 
         if (stream == null) {
-            log.warn("Cannot find configuration!");
+            LOG.warn("Cannot find configuration!");
             return null;
         }
 
@@ -83,7 +83,7 @@ public class CmisRepositoryContextListen
         try {
             props.load(stream);
         } catch (IOException e) {
-            log.warn("Cannot load configuration: " + e, e);
+            LOG.warn("Cannot load configuration: " + e, e);
             return null;
         } finally {
             try {
@@ -95,7 +95,7 @@ public class CmisRepositoryContextListen
         // get 'class' property
         String className = props.getProperty(PROPERTY_CLASS);
         if (className == null) {
-            log.warn("Configuration doesn't contain the property 'class'!");
+            LOG.warn("Configuration doesn't contain the property 'class'!");
             return null;
         }
 
@@ -104,12 +104,12 @@ public class CmisRepositoryContextListen
         try {
             object = Class.forName(className).newInstance();
         } catch (Exception e) {
-            log.warn("Could not create a services factory instance: " + e, e);
+            LOG.warn("Could not create a services factory instance: " + e, e);
             return null;
         }
 
         if (!(object instanceof CmisServiceFactory)) {
-            log.warn("The provided class is not an instance of CmisServiceFactory!");
+            LOG.warn("The provided class is not an instance of CmisServiceFactory!");
         }
 
         CmisServiceFactory factory = (CmisServiceFactory) object;
@@ -125,7 +125,7 @@ public class CmisRepositoryContextListen
 
         factory.init(parameters);
 
-        log.info("Initialized Services Factory: " + factory.getClass().getName());
+        LOG.info("Initialized Services Factory: " + factory.getClass().getName());
 
         return factory;
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.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/MultipartParserTest.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java Fri Aug 10 10:48:40 2012
@@ -303,9 +303,9 @@ public class MultipartParserTest {
 
         assertEquals(count, counter);
         assertEquals(counter - (hasContent ? 1 : 0), parameters.size());
-        assertEquals(values.size(), parameters.size());
 
         if (values != null) {
+            assertEquals(values.size(), parameters.size());
             for (Map.Entry<String, String> e : values.entrySet()) {
                 assertEquals(e.getValue(), parameters.get(e.getKey()));
             }

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -145,7 +145,7 @@ public class FileShareRepository {
 
     private static final int BUFFER_SIZE = 64 * 1024;
 
-    private static final Logger log = LoggerFactory.getLogger(FileShareRepository.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FileShareRepository.class);
 
     /** Repository id */
     private final String repositoryId;
@@ -1943,7 +1943,7 @@ public class FileShareRepository {
     private static GregorianCalendar millisToCalendar(long millis) {
         GregorianCalendar result = new GregorianCalendar();
         result.setTimeZone(TimeZone.getTimeZone("GMT"));
-        result.setTimeInMillis((long) (Math.ceil(millis / 1000) * 1000));
+        result.setTimeInMillis((long) (Math.ceil((double) millis / 1000) * 1000));
 
         return result;
     }
@@ -2128,7 +2128,7 @@ public class FileShareRepository {
     }
 
     private void warn(String msg, Throwable t) {
-        log.warn("<" + repositoryId + "> " + msg, t);
+        LOG.warn("<" + repositoryId + "> " + msg, t);
     }
 
     private void debug(String msg) {
@@ -2136,6 +2136,6 @@ public class FileShareRepository {
     }
 
     private void debug(String msg, Throwable t) {
-        log.debug("<" + repositoryId + "> " + msg, t);
+        LOG.debug("<" + repositoryId + "> " + msg, t);
     }
 }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareServiceFactory.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/FileShareServiceFactory.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareServiceFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareServiceFactory.java Fri Aug 10 10:48:40 2012
@@ -54,7 +54,7 @@ public class FileShareServiceFactory ext
     private static final BigInteger DEFAULT_MAX_ITEMS_OBJECTS = BigInteger.valueOf(200);
     private static final BigInteger DEFAULT_DEPTH_OBJECTS = BigInteger.valueOf(10);
 
-    private static final Logger log = LoggerFactory.getLogger(FileShareServiceFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FileShareServiceFactory.class);
 
     private RepositoryMap repositoryMap;
     private TypeManager typeManager;
@@ -115,7 +115,7 @@ public class FileShareServiceFactory ext
 
                 repositoryMap.addLogin(username, password);
 
-                log.info("Added login '" + username + "'.");
+                LOG.info("Added login '" + username + "'.");
             } else if (key.startsWith(PREFIX_TYPE)) {
                 // load type definition
                 TypeDefinition type = loadType(replaceSystemProperties(parameters.get(key)));
@@ -153,7 +153,7 @@ public class FileShareServiceFactory ext
 
                     repositoryMap.addRepository(fsr);
 
-                    log.info("Added repository '" + fsr.getRepositoryId() + "': " + root);
+                    LOG.info("Added repository '" + fsr.getRepositoryId() + "': " + root);
                 }
             }
         }
@@ -217,7 +217,7 @@ public class FileShareServiceFactory ext
                     filename));
             result = Converter.convert(type.getValue());
         } catch (Exception e) {
-            log.info("Could not load type: '" + filename + "'", e);
+            LOG.info("Could not load type: '" + filename + "'", e);
         }
 
         return result;

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -66,9 +66,9 @@ public class TypeManager {
     public static final String RELATIONSHIP_TYPE_ID = BaseTypeId.CMIS_RELATIONSHIP.value();
     public static final String POLICY_TYPE_ID = BaseTypeId.CMIS_POLICY.value();
 
-    private static final String NAMESPACE = "http://opencmis.org/fileshare";
+    private static final String NAMESPACE = "http://chemistry.apache.org/opencmis/fileshare";
 
-    private static final Logger log = LoggerFactory.getLogger(TypeManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TypeManager.class);
 
     private Map<String, TypeDefinitionContainerImpl> types;
     private List<TypeDefinitionContainer> typesList;
@@ -354,7 +354,7 @@ public class TypeManager {
         // add it
         addTypeInteral(newType);
 
-        log.info("Added type '" + newType.getId() + "'.");
+        LOG.info("Added type '" + newType.getId() + "'.");
 
         return true;
     }

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -25,11 +25,9 @@ import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.data.Ace;
 import org.apache.chemistry.opencmis.commons.data.Acl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlEntryImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlListImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlPrincipalDataImpl;
 
-public class InMemoryAcl {
+public class InMemoryAcl implements Cloneable{
     
     private List<InMemoryAce> acl;
     private int id;

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -35,8 +35,6 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.data.ObjectData;
 import org.apache.chemistry.opencmis.commons.data.Properties;
 import org.apache.chemistry.opencmis.commons.data.PropertyData;
-import org.apache.chemistry.opencmis.commons.data.PropertyDecimal;
-import org.apache.chemistry.opencmis.commons.data.PropertyInteger;
 import org.apache.chemistry.opencmis.commons.definitions.Choice;
 import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
@@ -219,6 +217,7 @@ public class PropertyCreationHelper {
             if (td == null) {
                 log.warn("getPropertiesFromObject(), cannot get type definition, a type with id " + typeId
                         + " is unknown");
+                return null;
             } else {
                 String baseTypeId = td.getBaseTypeId().value();
                 properties.put(PropertyIds.BASE_TYPE_ID,
@@ -300,7 +299,6 @@ public class PropertyCreationHelper {
             }
         }
         // add functions:
-        BindingsObjectFactory objFactory = new BindingsObjectFactoryImpl();
         for (Entry<String, String> funcEntry : requestedFuncs.entrySet()) {
         	String queryName;
         	if (funcEntry.getValue().equals("SCORE")) {

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.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/AclTest.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java Fri Aug 10 10:48:40 2012
@@ -56,19 +56,17 @@ public class AclTest {
 
     @Test
     public void testCreateAce() {
-        InMemoryAce ace;
         try {
-            ace = new InMemoryAce(null, Permission.NONE);
+            new InMemoryAce(null, Permission.NONE);
             fail("create an ACE with null principalId should fail.");
         } catch (RuntimeException e) {            
         }
 
         try {
-            ace = new InMemoryAce("xxx", null);
+            new InMemoryAce("xxx", null);
             fail("create an ACE with null permission should fail.");
         } catch (RuntimeException e) {            
         }
-
     }
     
     @Test

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CmisServiceWrapper.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/CmisServiceWrapper.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CmisServiceWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/CmisServiceWrapper.java Fri Aug 10 10:48:40 2012
@@ -63,7 +63,7 @@ public class CmisServiceWrapper<T extend
 
     public static final BigInteger MINUS_ONE = BigInteger.valueOf(-1);
 
-    private static final Logger log = LoggerFactory.getLogger(CmisServiceWrapper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CmisServiceWrapper.class);
 
     private BigInteger defaultTypesMaxItems = null;
     private BigInteger defaultTypesDepth = MINUS_ONE;
@@ -134,7 +134,7 @@ public class CmisServiceWrapper<T extend
         } else {
             // should not happen if the connector works correctly
             // it's alarming enough to log the exception
-            log.warn(e.toString(), e);
+            LOG.warn(e.toString(), e);
 
             return new CmisRuntimeException(e.getMessage(), e);
         }

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -29,8 +29,6 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.data.Acl;
 import org.apache.chemistry.opencmis.commons.data.Properties;
 import org.apache.chemistry.opencmis.commons.data.PropertyData;
-import org.apache.chemistry.opencmis.commons.data.PropertyDecimal;
-import org.apache.chemistry.opencmis.commons.data.PropertyInteger;
 import org.apache.chemistry.opencmis.commons.definitions.Choice;
 import org.apache.chemistry.opencmis.commons.definitions.DocumentTypeDefinition;
 import org.apache.chemistry.opencmis.commons.definitions.PropertyDecimalDefinition;

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=1371646&r1=1371645&r2=1371646&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 Fri Aug 10 10:48:40 2012
@@ -21,13 +21,11 @@ package org.apache.chemistry.opencmis.se
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Enumeration;
@@ -61,7 +59,7 @@ import org.slf4j.LoggerFactory;
 
 public class LoggingFilter implements Filter {
 
-    private static final Logger log = LoggerFactory.getLogger(LoggingFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingFilter.class);
     private static int REQUEST_NO = 0;
     private static final SimpleDateFormat FORMAT = new SimpleDateFormat("EEE MMM dd hh:mm:ss a z yyyy", Locale.US);
     private String logDir;
@@ -101,7 +99,7 @@ public class LoggingFilter implements Fi
 
     public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException,
             ServletException {
-        log.debug("Logging filter doFilter");
+        LOG.debug("Logging filter doFilter");
 
         if (resp instanceof HttpServletResponse && req instanceof HttpServletRequest) {
             LoggingRequestWrapper logReq = new LoggingRequestWrapper((HttpServletRequest)req);
@@ -130,7 +128,7 @@ public class LoggingFilter implements Fi
             }
             
             xmlRequest = sb.toString() + xmlRequest;
-            log.debug("Found request: " + requestFileName + ": " + xmlRequest);
+            LOG.debug("Found request: " + requestFileName + ": " + xmlRequest);
             writeTextToFile(requestFileName, xmlRequest);
             
 
@@ -157,7 +155,7 @@ public class LoggingFilter implements Fi
             }
                 
             xmlResponse = sb.toString() + xmlResponse;
-            log.debug("Found response: " + responseFileName  + ": " + xmlResponse);
+            LOG.debug("Found response: " + responseFileName  + ": " + xmlResponse);
             writeTextToFile(responseFileName, xmlResponse);
         } else {            
             chain.doFilter(req, resp);
@@ -219,7 +217,7 @@ public class LoggingFilter implements Fi
         if (endIndex < 0)
             endIndex = cType.length();
         String boundary = "--" + cType.substring(beginIndex, endIndex);
-        log.debug("Boundary = " + boundary);
+        LOG.debug("Boundary = " + boundary);
         BufferedReader in = new BufferedReader(new StringReader(messageBody));
         StringBuffer out = new StringBuffer();
         String line;
@@ -237,9 +235,12 @@ public class LoggingFilter implements Fi
                     xmlBodyBuffer.write(line.getBytes(), 0, line.length());                   
                     while (inXmlOrJsonBody)  {
                         line = in.readLine();
+                        if(line == null) {
+                            break;
+                        }
                         boundaryFound = line.startsWith(boundary);
                         if (boundaryFound) {
-                            log.debug("Leaving XML body: " + line);
+                            LOG.debug("Leaving XML body: " + line);
                             inXmlOrJsonBody = false;
                             inXmlOrJsonPart = false;
                             if (isXml)
@@ -251,22 +252,22 @@ public class LoggingFilter implements Fi
                             xmlBodyBuffer.write(line.getBytes(), 0, line.length());
                     }               
                 } else { 
-                    log.debug("in XML part is: " + line);
+                    LOG.debug("in XML part is: " + line);
                     out.append(line).append("\n");
                 }
 
             } else {
-                log.debug("not in XML part: " + line);
+                LOG.debug("not in XML part: " + line);
                 out.append(line).append("\n");
                 boundaryFound = line.startsWith(boundary);
                 if (boundaryFound) {
-                    log.debug("Boundardy found!");
+                    LOG.debug("Boundardy found!");
                     inXmlOrJsonPart = true;
                 }
             }
         }
         in.close();        
-        log.debug("End parsing multipart.");
+        LOG.debug("End parsing multipart.");
         
         return out.toString();
     }
@@ -413,7 +414,7 @@ public class LoggingFilter implements Fi
                     writer = new PrintWriter(this.getOutputStream());
                 return writer;
             } catch (IOException e) {
-                log.error("Failed to get PrintWriter in LoggingFilter: "+ e);
+                LOG.error("Failed to get PrintWriter in LoggingFilter: "+ e);
                 e.printStackTrace();
                 return null;             
             }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-client/src/main/java/org/apache/chemistry/opencmis/client/main/ObjGenApp.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-client/src/main/java/org/apache/chemistry/opencmis/client/main/ObjGenApp.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-client/src/main/java/org/apache/chemistry/opencmis/client/main/ObjGenApp.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-client/src/main/java/org/apache/chemistry/opencmis/client/main/ObjGenApp.java Fri Aug 10 10:48:40 2012
@@ -184,7 +184,7 @@ public class ObjGenApp {
                 fContentKind = ObjectGenerator.CONTENT_KIND.StaticText;
             else
                 fContentKind = null;
-        } if (kind.equals("static/text"))
+        } else if (kind.equals("static/text"))
             fContentKind = ObjectGenerator.CONTENT_KIND.StaticText;
         else if (kind.equals("lorem/text"))
             fContentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumText;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java?rev=1371646&r1=1371645&r2=1371646&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java Fri Aug 10 10:48:40 2012
@@ -1672,9 +1672,7 @@ public abstract class AbstractSessionTes
                     if (parent == null) {
                         f = createResult(FAILURE, "One of childs parents is null! Id: " + child.getId());
                         addResult(results, assertIsTrue(parents.size() > 0, null, f));
-                    }
-
-                    if (folder.getId().equals(parent.getId())) {
+                    } else if (folder.getId().equals(parent.getId())) {
                         foundParent = true;
                         break;
                     }



Mime
View raw message