You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2010/04/28 04:48:43 UTC

svn commit: r938756 - in /incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src: main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ test/java/org/apache/chemistry/opencmis/inmemory/

Author: jens
Date: Wed Apr 28 02:48:43 2010
New Revision: 938756

URL: http://svn.apache.org/viewvc?rev=938756&view=rev
Log:
remove obsolete classes

Removed:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/
Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java

Modified: incubator/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/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java?rev=938756&r1=938755&r2=938756&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java Wed Apr 28 02:48:43 2010
@@ -37,8 +37,6 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.BindingsObjectFactoryImpl;
 import org.apache.chemistry.opencmis.inmemory.RepositoryServiceTest.UnitTestRepositoryInfo;
-import org.apache.chemistry.opencmis.inmemory.clientprovider.CmisInMemoryProvider;
-import org.apache.chemistry.opencmis.inmemory.clientprovider.DummyCallContext;
 import org.apache.chemistry.opencmis.inmemory.server.InMemoryServiceFactoryImpl;
 import org.apache.chemistry.opencmis.inmemory.storedobj.impl.ContentStreamDataImpl;
 import org.apache.commons.logging.Log;
@@ -58,7 +56,6 @@ public class AbstractServiceTst /* exten
     protected DiscoveryService fDiscSvc;
     protected DummyCallContext fTestCallContext;
     private String fTypeCreatorClassName;
-    protected boolean fUseClientProviderInterface;
 
     public AbstractServiceTst() {
         // The in-memory server unit tests can either be run directly against
@@ -69,8 +66,6 @@ public class AbstractServiceTst /* exten
         // The default is using the direct implementation. Subclasses may
         // override this behavior.
 
-        fUseClientProviderInterface = true;
-
         // Init with default types, can be overridden by subclasses:
         fTypeCreatorClassName = UnitTestTypeSystemCreator.class.getName();
     }
@@ -101,10 +96,7 @@ public class AbstractServiceTst /* exten
         // initialized.
         // RuntimeContext.attachCfg(fTestCallContext);
 
-        if (fUseClientProviderInterface)
-            initializeUsingLocalBinding(parameters);
-        else
-            initializeDirect(parameters);
+        initializeUsingLocalBinding(parameters);
 
         assertNotNull(fRepSvc);
         assertNotNull(fObjSvc);
@@ -327,26 +319,7 @@ public class AbstractServiceTst /* exten
         assertEquals(objectId, pd.getFirstValue());
     }
 
-    /**
-     * Instantiates the services by using directly the service implementations.
-     *
-     * @param parameters
-     *            configuration parameters for client provider interface and
-     *            in-memory provider
-     */
-    private void initializeDirect(Map<String, String> parameters) {
-        LOG.info("Initialize unit test using directly the InMemory-classes.");
-
-        CmisInMemoryProvider inMemSpi = new CmisInMemoryProvider(parameters);
-        fRepSvc = inMemSpi.getRepositoryService();
-        fObjSvc = inMemSpi.getObjectService();
-        fNavSvc = inMemSpi.getNavigationService();
-        fVerSvc = inMemSpi.getVersioningService();
-        fMultiSvc = inMemSpi.getMultiFilingService();
-        fDiscSvc = inMemSpi.getDiscoveryService();
-    }
-
-    /**
+     /**
      * Instantiates the services by using the client provider interface.
      *
      * @param parameters