chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r935568 - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/mai...
Date Mon, 19 Apr 2010 13:50:28 GMT
Author: fmui
Date: Mon Apr 19 13:50:27 2010
New Revision: 935568

URL: http://svn.apache.org/viewvc?rev=935568&view=rev
Log:
clean up and preparation for the local binding implementation

Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpi.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpiFactory.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/Session.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/SpiSessionParameter.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.atom.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.ws.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-atompub-example.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-webservices-example.properties

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
Mon Apr 19 13:50:27 2010
@@ -134,6 +134,20 @@ public final class CmisBindingFactory {
 		return new CmisBindingImpl(sessionParameters);
 	}
 
+	/**
+	 * Creates a default CMIS local binding instance.
+	 */
+	public CmisBinding createCmisLocalBinding(Map<String, String> sessionParameters) {
+		checkSessionParameters(sessionParameters, false);
+
+		sessionParameters.put(SessionParameter.BINDING_SPI_CLASS, BINDING_SPI_LOCAL);
+		addDefaultParameters(sessionParameters);
+
+		check(sessionParameters, SessionParameter.LOCAL_FACTORY);
+
+		return new CmisBindingImpl(sessionParameters);
+	}
+
 	// ---- internal ----
 
 	/**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java
Mon Apr 19 13:50:27 2010
@@ -27,9 +27,6 @@ import org.w3c.dom.Element;
 
 /**
  * Authentication provider class.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public abstract class AbstractAuthenticationProvider implements Serializable {
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpi.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpi.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpi.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpi.java
Mon Apr 19 13:50:27 2010
@@ -30,9 +30,6 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * CMIS SPI interface.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public interface CmisSpi {
 	/**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpiFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpiFactory.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpiFactory.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/CmisSpiFactory.java
Mon Apr 19 13:50:27 2010
@@ -24,9 +24,6 @@ package org.apache.chemistry.opencmis.cl
  * <p>
  * A class implementing this interface MUST provide a default constructor.
  * </p>
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public interface CmisSpiFactory {
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/Session.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/Session.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/Session.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/Session.java
Mon Apr 19 13:50:27 2010
@@ -22,9 +22,6 @@ import java.io.Serializable;
 
 /**
  * CMIS provider session interface.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public interface Session extends Serializable {
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
Mon Apr 19 13:50:27 2010
@@ -39,9 +39,6 @@ import org.w3c.dom.Element;
  * 
  * Adds a basic authentication HTTP header and a WS-Security UsernameToken SOAP
  * header.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public class StandardAuthenticationProvider extends AbstractAuthenticationProvider {
 

Modified: incubator/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/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
Mon Apr 19 13:50:27 2010
@@ -34,24 +34,23 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ * CMIS AtomPub SPI implementation.
  */
 public class CmisAtomPubSpi implements CmisSpiFactory, CmisSpi {
 
 	private static Log log = LogFactory.getLog(CmisAtomPubSpi.class);
 
-	private Session fSession;
+	private Session session;
 
-	private RepositoryService fRepositoryService;
-	private NavigationService fNavigationService;
-	private ObjectService fObjectService;
-	private VersioningService fVersioningService;
-	private DiscoveryService fDiscoveryService;
-	private MultiFilingService fMultiFilingService;
-	private RelationshipService fRelationshipService;
-	private PolicyService fPolicyService;
-	private AclService fACLService;
+	private RepositoryService repositoryService;
+	private NavigationService navigationService;
+	private ObjectService objectService;
+	private VersioningService versioningService;
+	private DiscoveryService discoveryService;
+	private MultiFilingService multiFilingService;
+	private RelationshipService relationshipService;
+	private PolicyService policyService;
+	private AclService aclService;
 
 	/**
 	 * Constructor.
@@ -64,63 +63,63 @@ public class CmisAtomPubSpi implements C
 			log.debug("Initializing AtomPub SPI...");
 		}
 
-		fSession = session;
+		this.session = session;
 
-		fRepositoryService = new RepositoryServiceImpl(fSession);
-		fNavigationService = new NavigationServiceImpl(fSession);
-		fObjectService = new ObjectServiceImpl(fSession);
-		fVersioningService = new VersioningServiceImpl(fSession);
-		fDiscoveryService = new DiscoveryServiceImpl(fSession);
-		fMultiFilingService = new MultiFilingServiceImpl(fSession);
-		fRelationshipService = new RelationshipServiceImpl(fSession);
-		fPolicyService = new PolicyServiceImpl(fSession);
-		fACLService = new AclServiceImpl(fSession);
+		repositoryService = new RepositoryServiceImpl(session);
+		navigationService = new NavigationServiceImpl(session);
+		objectService = new ObjectServiceImpl(session);
+		versioningService = new VersioningServiceImpl(session);
+		discoveryService = new DiscoveryServiceImpl(session);
+		multiFilingService = new MultiFilingServiceImpl(session);
+		relationshipService = new RelationshipServiceImpl(session);
+		policyService = new PolicyServiceImpl(session);
+		aclService = new AclServiceImpl(session);
 
 		return this;
 	}
 
 	public RepositoryService getRepositoryService() {
-		return fRepositoryService;
+		return repositoryService;
 	}
 
 	public NavigationService getNavigationService() {
-		return fNavigationService;
+		return navigationService;
 	}
 
 	public ObjectService getObjectService() {
-		return fObjectService;
+		return objectService;
 	}
 
 	public DiscoveryService getDiscoveryService() {
-		return fDiscoveryService;
+		return discoveryService;
 	}
 
 	public VersioningService getVersioningService() {
-		return fVersioningService;
+		return versioningService;
 	}
 
 	public MultiFilingService getMultiFilingService() {
-		return fMultiFilingService;
+		return multiFilingService;
 	}
 
 	public RelationshipService getRelationshipService() {
-		return fRelationshipService;
+		return relationshipService;
 	}
 
 	public PolicyService getPolicyService() {
-		return fPolicyService;
+		return policyService;
 	}
 
 	public AclService getAclService() {
-		return fACLService;
+		return aclService;
 	}
 
 	public void clearAllCaches() {
-		fSession.remove(SpiSessionParameter.LINK_CACHE);
+		session.remove(SpiSessionParameter.LINK_CACHE);
 	}
 
 	public void clearRepositoryCache(String repositoryId) {
-		LinkCache linkCache = (LinkCache) fSession.get(SpiSessionParameter.LINK_CACHE);
+		LinkCache linkCache = (LinkCache) session.get(SpiSessionParameter.LINK_CACHE);
 		if (linkCache != null) {
 			linkCache.clearRepository(repositoryId);
 		}

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/SpiSessionParameter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/SpiSessionParameter.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/SpiSessionParameter.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/SpiSessionParameter.java
Mon Apr 19 13:50:27 2010
@@ -24,7 +24,7 @@ package org.apache.chemistry.opencmis.cl
  */
 public final class SpiSessionParameter {
 
-	public static final String LINK_CACHE = "org.apache.chemistry.opencmis.provider.atompub.linkcache";
+	public static final String LINK_CACHE = "org.apache.chemistry.opencmis.binding.atompub.linkcache";
 
 	private SpiSessionParameter() {
 	}

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
Mon Apr 19 13:50:27 2010
@@ -3,6 +3,7 @@ package org.apache.chemistry.opencmis.cl
 import org.apache.chemistry.opencmis.client.bindings.spi.CmisSpi;
 import org.apache.chemistry.opencmis.client.bindings.spi.CmisSpiFactory;
 import org.apache.chemistry.opencmis.client.bindings.spi.Session;
+import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.api.AclService;
 import org.apache.chemistry.opencmis.commons.api.DiscoveryService;
 import org.apache.chemistry.opencmis.commons.api.MultiFilingService;
@@ -12,14 +13,30 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.RelationshipService;
 import org.apache.chemistry.opencmis.commons.api.RepositoryService;
 import org.apache.chemistry.opencmis.commons.api.VersioningService;
+import org.apache.chemistry.opencmis.commons.api.server.CmisServiceFactory;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisConnectionException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+/**
+ * * CMIS local SPI implementation.
+ */
 public class CmisLocalSpi implements CmisSpiFactory, CmisSpi {
 
 	private static Log log = LogFactory.getLog(CmisLocalSpi.class);
 
 	private Session session;
+	private CmisServiceFactory serviceFactory;
+
+	private RepositoryService repositoryService;
+	private NavigationService navigationService;
+	private ObjectService objectService;
+	private VersioningService versioningService;
+	private DiscoveryService discoveryService;
+	private MultiFilingService multiFilingService;
+	private RelationshipService relationshipService;
+	private PolicyService policyService;
+	private AclService aclService;
 
 	/**
 	 * Constructor.
@@ -34,63 +51,63 @@ public class CmisLocalSpi implements Cmi
 
 		this.session = session;
 
+		String serviceFactoryClassname = (String) session.get(SessionParameter.LOCAL_FACTORY);
+		if (serviceFactoryClassname == null) {
+			throw new CmisConnectionException("Factory class not set!");
+		}
+
+		try {
+			serviceFactory = (CmisServiceFactory) Class.forName(serviceFactoryClassname).newInstance();
+		} catch (Exception e) {
+			throw new CmisConnectionException("Factory cannot be created!", e);
+		}
+
 		return this;
 	}
 
-	public AclService getAclService() {
-		// TODO Auto-generated method stub
-		return null;
+	public RepositoryService getRepositoryService() {
+		return repositoryService;
 	}
 
-	public DiscoveryService getDiscoveryService() {
-		// TODO Auto-generated method stub
-		return null;
+	public NavigationService getNavigationService() {
+		return navigationService;
 	}
 
-	public MultiFilingService getMultiFilingService() {
-		// TODO Auto-generated method stub
-		return null;
+	public ObjectService getObjectService() {
+		return objectService;
 	}
 
-	public NavigationService getNavigationService() {
-		// TODO Auto-generated method stub
-		return null;
+	public DiscoveryService getDiscoveryService() {
+		return discoveryService;
 	}
 
-	public ObjectService getObjectService() {
-		// TODO Auto-generated method stub
-		return null;
+	public VersioningService getVersioningService() {
+		return versioningService;
 	}
 
-	public PolicyService getPolicyService() {
-		// TODO Auto-generated method stub
-		return null;
+	public MultiFilingService getMultiFilingService() {
+		return multiFilingService;
 	}
 
 	public RelationshipService getRelationshipService() {
-		// TODO Auto-generated method stub
-		return null;
+		return relationshipService;
 	}
 
-	public RepositoryService getRepositoryService() {
-		// TODO Auto-generated method stub
-		return null;
+	public PolicyService getPolicyService() {
+		return policyService;
 	}
 
-	public VersioningService getVersioningService() {
-		// TODO Auto-generated method stub
-		return null;
+	public AclService getAclService() {
+		return aclService;
 	}
 
 	public void clearAllCaches() {
-		// TODO Auto-generated method stub
 	}
 
 	public void clearRepositoryCache(String repositoryId) {
-		// TODO Auto-generated method stub
 	}
 
 	public void close() {
-		// TODO Auto-generated method stub
+		serviceFactory.destroy();
 	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
Mon Apr 19 13:50:27 2010
@@ -35,26 +35,20 @@ import org.apache.commons.logging.LogFac
 
 /**
  * CMIS Web Services SPI implementation.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public class CmisWebServicesSpi implements CmisSpiFactory, CmisSpi {
 
 	private static Log log = LogFactory.getLog(CmisWebServicesSpi.class);
 
-	private Session fSession;
-	private PortProvider fPortProvider;
-
-	private RepositoryService fRepositoryService;
-	private NavigationService fNavigationService;
-	private ObjectService fObjectService;
-	private VersioningService fVersioningService;
-	private DiscoveryService fDiscoveryService;
-	private MultiFilingService fMultiFilingService;
-	private RelationshipService fRelationshipService;
-	private PolicyService fPolicyService;
-	private AclService fACLService;
+	private RepositoryService repositoryService;
+	private NavigationService navigationService;
+	private ObjectService objectService;
+	private VersioningService versioningService;
+	private DiscoveryService discoveryService;
+	private MultiFilingService multiFilingService;
+	private RelationshipService relationshipService;
+	private PolicyService policyService;
+	private AclService aclService;
 
 	/**
 	 * Constructor.
@@ -62,68 +56,60 @@ public class CmisWebServicesSpi implemen
 	public CmisWebServicesSpi() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.opencmis.client.provider.spi.CMISSPIFactory#getSPIInstance
-	 * (org.apache.opencmis.client .provider .spi.Session)
-	 */
 	public CmisSpi getSpiInstance(Session session) {
 		if (log.isDebugEnabled()) {
 			log.debug("Initializing Web Services SPI...");
 		}
 
-		fSession = session;
-		fPortProvider = new PortProvider(fSession);
+		PortProvider portProvider = new PortProvider(session);
 
-		fRepositoryService = new RepositoryServiceImpl(fSession, fPortProvider);
-		fNavigationService = new NavigationServiceImpl(fSession, fPortProvider);
-		fObjectService = new ObjectServiceImpl(fSession, fPortProvider);
-		fVersioningService = new VersioningServiceImpl(fSession, fPortProvider);
-		fDiscoveryService = new DiscoveryServiceImpl(fSession, fPortProvider);
-		fMultiFilingService = new MultiFilingServiceImpl(fSession, fPortProvider);
-		fRelationshipService = new RelationshipServiceImpl(fSession, fPortProvider);
-		fPolicyService = new PolicyServiceImpl(fSession, fPortProvider);
-		fACLService = new AclServiceImpl(fSession, fPortProvider);
+		repositoryService = new RepositoryServiceImpl(session, portProvider);
+		navigationService = new NavigationServiceImpl(session, portProvider);
+		objectService = new ObjectServiceImpl(session, portProvider);
+		versioningService = new VersioningServiceImpl(session, portProvider);
+		discoveryService = new DiscoveryServiceImpl(session, portProvider);
+		multiFilingService = new MultiFilingServiceImpl(session, portProvider);
+		relationshipService = new RelationshipServiceImpl(session, portProvider);
+		policyService = new PolicyServiceImpl(session, portProvider);
+		aclService = new AclServiceImpl(session, portProvider);
 
 		return this;
 	}
 
 	public RepositoryService getRepositoryService() {
-		return fRepositoryService;
+		return repositoryService;
 	}
 
 	public NavigationService getNavigationService() {
-		return fNavigationService;
+		return navigationService;
 	}
 
 	public ObjectService getObjectService() {
-		return fObjectService;
+		return objectService;
 	}
 
 	public DiscoveryService getDiscoveryService() {
-		return fDiscoveryService;
+		return discoveryService;
 	}
 
 	public VersioningService getVersioningService() {
-		return fVersioningService;
+		return versioningService;
 	}
 
 	public MultiFilingService getMultiFilingService() {
-		return fMultiFilingService;
+		return multiFilingService;
 	}
 
 	public RelationshipService getRelationshipService() {
-		return fRelationshipService;
+		return relationshipService;
 	}
 
 	public PolicyService getPolicyService() {
-		return fPolicyService;
+		return policyService;
 	}
 
 	public AclService getAclService() {
-		return fACLService;
+		return aclService;
 	}
 
 	public void clearAllCaches() {

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
Mon Apr 19 13:50:27 2010
@@ -24,7 +24,7 @@ package org.apache.chemistry.opencmis.cl
  */
 public final class SpiSessionParameter {
 
-	public static final String PORTS = "org.apache.chemistry.opencmis.provider.webservices.ports";
+	public static final String PORTS = "org.apache.chemistry.opencmis.binding.webservices.ports";
 
 	private SpiSessionParameter() {
 	}

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java
Mon Apr 19 13:50:27 2010
@@ -20,9 +20,6 @@ package org.apache.chemistry.opencmis.co
 
 /**
  * Collection of session parameters.
- * 
- * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
  */
 public final class SessionParameter {
 
@@ -36,41 +33,46 @@ public final class SessionParameter {
 
 	// ---- provider parameter ----
 	/** Predefined binding types (see {@code BindingType}) */
-	public static final String BINDING_TYPE = "org.apache.chemistry.opencmis.provider.binding.type";
+	public static final String BINDING_TYPE = "org.apache.chemistry.opencmis.binding.spi.type";
 
 	/** Class name of the binding class. */
-	public static final String BINDING_SPI_CLASS = "org.apache.chemistry.opencmis.provider.binding.classname";
+	public static final String BINDING_SPI_CLASS = "org.apache.chemistry.opencmis.binding.spi.classname";
 
 	/** URL of the AtomPub service document. */
-	public static final String ATOMPUB_URL = "org.apache.chemistry.opencmis.provider.atompub.url";
-
-	public static final String WEBSERVICES_REPOSITORY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RepositoryService";
-	public static final String WEBSERVICES_NAVIGATION_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.NavigationService";
-	public static final String WEBSERVICES_OBJECT_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ObjectService";
-	public static final String WEBSERVICES_VERSIONING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.VersioningService";
-	public static final String WEBSERVICES_DISCOVERY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.DiscoveryService";
-	public static final String WEBSERVICES_RELATIONSHIP_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.RelationshipService";
-	public static final String WEBSERVICES_MULTIFILING_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.MultiFilingService";
-	public static final String WEBSERVICES_POLICY_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.PolicyService";
-	public static final String WEBSERVICES_ACL_SERVICE = "org.apache.chemistry.opencmis.provider.webservices.ACLService";
+	public static final String ATOMPUB_URL = "org.apache.chemistry.opencmis.binding.atompub.url";
 
+	/** WSDL URLs for Web Services. */
+	public static final String WEBSERVICES_REPOSITORY_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.RepositoryService";
+	public static final String WEBSERVICES_NAVIGATION_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.NavigationService";
+	public static final String WEBSERVICES_OBJECT_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.ObjectService";
+	public static final String WEBSERVICES_VERSIONING_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.VersioningService";
+	public static final String WEBSERVICES_DISCOVERY_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.DiscoveryService";
+	public static final String WEBSERVICES_RELATIONSHIP_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.RelationshipService";
+	public static final String WEBSERVICES_MULTIFILING_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.MultiFilingService";
+	public static final String WEBSERVICES_POLICY_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.PolicyService";
+	public static final String WEBSERVICES_ACL_SERVICE = "org.apache.chemistry.opencmis.binding.webservices.ACLService";
+
+	/** Factory class name for the local binding. */
+	public static final String LOCAL_FACTORY = "org.apache.chemistry.opencmis.binding.local.classname";
+	
 	/** Class name of the authentication provider. */
-	public static final String AUTHENTICATION_PROVIDER_CLASS = "org.apache.chemistry.opencmis.provider.auth.classname";
+	public static final String AUTHENTICATION_PROVIDER_CLASS = "org.apache.chemistry.opencmis.binding.auth.classname";
 
 	/**
 	 * Toggle for HTTP basic authentication. Evaluated by the standard
 	 * authentication provider.
 	 */
-	public static final String AUTH_HTTP_BASIC = "org.apache.chemistry.opencmis.provider.auth.http.basic";
+	public static final String AUTH_HTTP_BASIC = "org.apache.chemistry.opencmis.binding.auth.http.basic";
+	
 	/**
 	 * Toggle for WS-Security UsernameToken authentication. Evaluated by the
 	 * standard authentication provider.
 	 */
-	public static final String AUTH_SOAP_USERNAMETOKEN = "org.apache.chemistry.opencmis.provider.auth.soap.usernametoken";
+	public static final String AUTH_SOAP_USERNAMETOKEN = "org.apache.chemistry.opencmis.binding.auth.soap.usernametoken";
 
-	public static final String CACHE_SIZE_REPOSITORIES = "org.apache.chemistry.opencmis.provider.cache.repositories.size";
-	public static final String CACHE_SIZE_TYPES = "org.apache.chemistry.opencmis.provider.cache.types.size";
-	public static final String CACHE_SIZE_OBJECTS = "org.apache.chemistry.opencmis.provider.cache.objects.size";
+	public static final String CACHE_SIZE_REPOSITORIES = "org.apache.chemistry.opencmis.binding.cache.repositories.size";
+	public static final String CACHE_SIZE_TYPES = "org.apache.chemistry.opencmis.binding.cache.types.size";
+	public static final String CACHE_SIZE_OBJECTS = "org.apache.chemistry.opencmis.binding.cache.objects.size";
 
 	// --- session control ---
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.atom.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.atom.properties?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.atom.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.atom.properties
Mon Apr 19 13:50:27 2010
@@ -1,9 +1,9 @@
 org.apache.chemistry.opencmis.user=test
 org.apache.chemistry.opencmis.password=test
 
-org.apache.chemistry.opencmis.provider.binding.type=atompub
+org.apache.chemistry.opencmis.binding.spi.type=atompub
 
-org.apache.chemistry.opencmis.provider.atompub.url=http://localhost:19080/opencmis/atom
+org.apache.chemistry.opencmis.binding.atompub.url=http://localhost:19080/opencmis/atom
 
 org.apache.chemistry.opencmis.locale.iso639=de 
 org.apache.chemistry.opencmis.locale.iso3166= 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.ws.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.ws.properties?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.ws.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/inmemory.ws.properties
Mon Apr 19 13:50:27 2010
@@ -1,17 +1,17 @@
 org.apache.chemistry.opencmis.user=test
 org.apache.chemistry.opencmis.password=test
 
-org.apache.chemistry.opencmis.provider.binding.type=webservices
+org.apache.chemistry.opencmis.binding.spi.type=webservices
 
-org.apache.chemistry.opencmis.provider.webservices.RepositoryService=http://localhost:19080/opencmis/services/RepositoryService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.NavigationService=http://localhost:19080/opencmis/services/NavigationService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.ObjectService=http://localhost:19080/opencmis/services/ObjectService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.VersioningService=http://localhost:19080/opencmis/services/VersioningService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.DiscoveryService=http://localhost:19080/opencmis/services/DiscoveryService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.RelationshipService=http://localhost:19080/opencmis/services/RelationshipService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.MultiFilingService=http://localhost:19080/opencmis/services/MultiFilingService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.PolicyService=http://localhost:19080/opencmis/services/PolicyService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.ACLService=http://localhost:19080/opencmis/services/ACLService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.RepositoryService=http://localhost:19080/opencmis/services/RepositoryService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.NavigationService=http://localhost:19080/opencmis/services/NavigationService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.ObjectService=http://localhost:19080/opencmis/services/ObjectService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.VersioningService=http://localhost:19080/opencmis/services/VersioningService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.DiscoveryService=http://localhost:19080/opencmis/services/DiscoveryService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.RelationshipService=http://localhost:19080/opencmis/services/RelationshipService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.MultiFilingService=http://localhost:19080/opencmis/services/MultiFilingService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.PolicyService=http://localhost:19080/opencmis/services/PolicyService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.ACLService=http://localhost:19080/opencmis/services/ACLService?wsdl
 
 org.apache.chemistry.opencmis.locale.iso639=de 
 org.apache.chemistry.opencmis.locale.iso3166= 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-atompub-example.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-atompub-example.properties?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-atompub-example.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-atompub-example.properties
Mon Apr 19 13:50:27 2010
@@ -16,4 +16,4 @@
 org.apache.chemistry.opencmis.user=test
 org.apache.chemistry.opencmis.password=test
 
-org.apache.chemistry.opencmis.provider.atompub.url=http://localhost/cmis/atom
+org.apache.chemistry.opencmis.binding.atompub.url=http://localhost/cmis/atom

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-webservices-example.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-webservices-example.properties?rev=935568&r1=935567&r2=935568&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-webservices-example.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/resources/commander-webservices-example.properties
Mon Apr 19 13:50:27 2010
@@ -16,12 +16,12 @@
 org.apache.chemistry.opencmis.user=test
 org.apache.chemistry.opencmis.password=test
 
-org.apache.chemistry.opencmis.provider.webservices.RepositoryService=http://localhost/cmis/RepositoryService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.NavigationService=http://localhost/cmis/NavigationService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.ObjectService=http://localhost/cmis/ObjectService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.VersioningService=http://localhost/cmis/VersioningService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.DiscoveryService=http://localhost/cmis/DiscoveryService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.RelationshipService=http://localhost/cmis/RelationshipService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.MultiFilingService=http://localhost/cmis/MultiFiligService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.PolicyService=http://localhost/cmis/PolicyService?wsdl
-org.apache.chemistry.opencmis.provider.webservices.ACLService=http://localhost/cmis/ACLService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.RepositoryService=http://localhost/cmis/RepositoryService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.NavigationService=http://localhost/cmis/NavigationService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.ObjectService=http://localhost/cmis/ObjectService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.VersioningService=http://localhost/cmis/VersioningService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.DiscoveryService=http://localhost/cmis/DiscoveryService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.RelationshipService=http://localhost/cmis/RelationshipService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.MultiFilingService=http://localhost/cmis/MultiFiligService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.PolicyService=http://localhost/cmis/PolicyService?wsdl
+org.apache.chemistry.opencmis.binding.webservices.ACLService=http://localhost/cmis/ACLService?wsdl



Mime
View raw message