Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/NavigationService.java Sat Apr 17 18:13:10 2010 @@ -46,22 +46,19 @@ import org.apache.chemistry.opencmis.ser /** * CMIS Navigation Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.NavigationServicePort") public class NavigationService extends AbstractService implements NavigationServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public CmisObjectListType getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getCheckedOutDocs(context, repositoryId, folderId, filter, orderBy, includeAllowableActions, convert(IncludeRelationships.class, includeRelationships), @@ -76,9 +73,9 @@ public class NavigationService extends A Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getChildren(context, repositoryId, folderId, filter, orderBy, includeAllowableActions, convert(IncludeRelationships.class, includeRelationships), @@ -92,9 +89,9 @@ public class NavigationService extends A String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<CmisObjectInFolderContainerType> result = new ArrayList<CmisObjectInFolderContainerType>(); @@ -117,9 +114,9 @@ public class NavigationService extends A public CmisObjectType getFolderParent(String repositoryId, String folderId, String filter, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getFolderParent(context, repositoryId, folderId, filter, convert(extension), null)); } catch (Exception e) { @@ -131,9 +128,9 @@ public class NavigationService extends A String filter, Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<CmisObjectInFolderContainerType> result = new ArrayList<CmisObjectInFolderContainerType>(); @@ -157,9 +154,9 @@ public class NavigationService extends A Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includeRelativePathSegment, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisNavigationService service = factory.getNavigationService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<CmisObjectParentsType> result = new ArrayList<CmisObjectParentsType>();
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java Sat Apr 17 18:13:10 2010 @@ -59,24 +59,21 @@ import com.sun.xml.ws.developer.Streamin /** * CMIS Object Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @StreamingAttachment(parseEagerly = true, memoryThreshold = 4 * 1024 * 1204) @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.ObjectServicePort") public class ObjectService extends AbstractService implements ObjectServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public void createDocument(String repositoryId, CmisPropertiesType properties, String folderId, CmisContentStreamType contentStream, EnumVersioningState versioningState, List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -99,9 +96,9 @@ public class ObjectService extends Abstr CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -123,9 +120,9 @@ public class ObjectService extends Abstr List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -146,9 +143,9 @@ public class ObjectService extends Abstr List<String> policies, CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -169,9 +166,9 @@ public class ObjectService extends Abstr CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension, Holder<String> objectId) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -191,9 +188,9 @@ public class ObjectService extends Abstr public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); org.apache.chemistry.opencmis.commons.api.Holder<String> changeTokenHolder = convertHolder(changeToken); @@ -212,9 +209,9 @@ public class ObjectService extends Abstr public void deleteObject(String repositoryId, String objectId, Boolean allVersions, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -230,9 +227,9 @@ public class ObjectService extends Abstr EnumUnfileObject unfileObjects, Boolean continueOnFailure, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.deleteTree(context, repositoryId, folderId, allVersions, convert(UnfileObject.class, unfileObjects), continueOnFailure, convert(extension))); @@ -244,9 +241,9 @@ public class ObjectService extends Abstr public CmisAllowableActionsType getAllowableActions(String repositoryId, String objectId, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getAllowableActions(context, repositoryId, objectId, convert(extension))); } catch (Exception e) { @@ -257,9 +254,9 @@ public class ObjectService extends Abstr public CmisContentStreamType getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset, BigInteger length, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getContentStream(context, repositoryId, objectId, streamId, offset, length, convert(extension))); @@ -272,9 +269,9 @@ public class ObjectService extends Abstr Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getObject(context, repositoryId, objectId, filter, includeAllowableActions, convert( IncludeRelationships.class, includeRelationships), renditionFilter, includePolicyIds, includeAcl, @@ -288,9 +285,9 @@ public class ObjectService extends Abstr Boolean includeAllowableActions, EnumIncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getObjectByPath(context, repositoryId, path, filter, includeAllowableActions, convert(IncludeRelationships.class, includeRelationships), renditionFilter, includePolicyIds, @@ -303,9 +300,9 @@ public class ObjectService extends Abstr public CmisPropertiesType getProperties(String repositoryId, String objectId, String filter, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getProperties(context, repositoryId, objectId, filter, convert(extension))); } catch (Exception e) { @@ -316,9 +313,9 @@ public class ObjectService extends Abstr public List<CmisRenditionType> getRenditions(String repositoryId, String objectId, String renditionFilter, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<CmisRenditionType> result = new ArrayList<CmisRenditionType>(); @@ -340,9 +337,9 @@ public class ObjectService extends Abstr public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); ExtensionsData extData = convertExtensionHolder(extension); @@ -360,9 +357,9 @@ public class ObjectService extends Abstr Holder<String> changeToken, CmisContentStreamType contentStream, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); org.apache.chemistry.opencmis.commons.api.Holder<String> changeTokenHolder = convertHolder(changeToken); @@ -382,9 +379,9 @@ public class ObjectService extends Abstr public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken, CmisPropertiesType properties, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisObjectService service = factory.getObjectService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); org.apache.chemistry.opencmis.commons.api.Holder<String> changeTokenHolder = convertHolder(changeToken); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/PolicyService.java Sat Apr 17 18:13:10 2010 @@ -42,21 +42,18 @@ import org.apache.chemistry.opencmis.ser /** * CMIS Policy Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.PolicyServicePort") public class PolicyService extends AbstractService implements PolicyServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public void applyPolicy(String repositoryId, String policyId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisPolicyService service = factory.getPolicyService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -71,9 +68,9 @@ public class PolicyService extends Abstr public List<CmisObjectType> getAppliedPolicies(String repositoryId, String objectId, String filter, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisPolicyService service = factory.getPolicyService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<ObjectData> policies = service.getAppliedPolicies(context, repositoryId, objectId, filter, convert(extension), null); @@ -96,9 +93,9 @@ public class PolicyService extends Abstr public void removePolicy(String repositoryId, String policyId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisPolicyService service = factory.getPolicyService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RelationshipService.java Sat Apr 17 18:13:10 2010 @@ -38,23 +38,20 @@ import org.apache.chemistry.opencmis.ser /** * CMIS Relationship Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.RelationshipServicePort") public class RelationshipService extends AbstractService implements RelationshipServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public CmisObjectListType getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes, EnumRelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRelationshipService service = factory.getRelationshipService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getObjectRelationships(context, repositoryId, objectId, includeSubRelationshipTypes, convert(RelationshipDirection.class, relationshipDirection), typeId, filter, Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/RepositoryService.java Sat Apr 17 18:13:10 2010 @@ -44,20 +44,17 @@ import org.apache.chemistry.opencmis.ser /** * CMIS Repository Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.RepositoryServicePort") public class RepositoryService extends AbstractService implements RepositoryServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public List<CmisRepositoryEntryType> getRepositories(CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRepositoryService service = factory.getRepositoryService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, null); List<RepositoryInfo> infoDataList = service.getRepositoryInfos(context, convert(extension)); @@ -83,9 +80,9 @@ public class RepositoryService extends A public CmisRepositoryInfoType getRepositoryInfo(String repositoryId, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRepositoryService service = factory.getRepositoryService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getRepositoryInfo(context, repositoryId, convert(extension))); } catch (Exception e) { @@ -97,9 +94,9 @@ public class RepositoryService extends A Boolean includePropertyDefinitions, BigInteger maxItems, BigInteger skipCount, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRepositoryService service = factory.getRepositoryService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getTypeChildren(context, repositoryId, typeId, includePropertyDefinitions, maxItems, skipCount, convert(extension))); @@ -111,9 +108,9 @@ public class RepositoryService extends A public CmisTypeDefinitionType getTypeDefinition(String repositoryId, String typeId, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRepositoryService service = factory.getRepositoryService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getTypeDefinition(context, repositoryId, typeId, convert(extension))); } catch (Exception e) { @@ -124,9 +121,9 @@ public class RepositoryService extends A public List<CmisTypeContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth, Boolean includePropertyDefinitions, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisRepositoryService service = factory.getRepositoryService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<CmisTypeContainer> result = new ArrayList<CmisTypeContainer>(); convertTypeContainerList(service.getTypeDescendants(context, repositoryId, typeId, depth, Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java Sat Apr 17 18:13:10 2010 @@ -49,21 +49,18 @@ import org.apache.chemistry.opencmis.ser /** * CMIS Versioning Service. - * - * @author <a href="mailto:[email protected]";>Florian Müller</a> - * */ @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.VersioningServicePort") public class VersioningService extends AbstractService implements VersioningServicePort { @Resource - WebServiceContext fContext; + WebServiceContext wsContext; public void cancelCheckOut(String repositoryId, String objectId, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); ExtensionsData extData = convertExtensionHolder(extension); @@ -80,9 +77,9 @@ public class VersioningService extends A CmisAccessControlListType addAces, CmisAccessControlListType removeAces, Holder<CmisExtensionType> extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); ExtensionsData extData = convertExtensionHolder(extension); @@ -100,9 +97,9 @@ public class VersioningService extends A public void checkOut(String repositoryId, Holder<String> objectId, Holder<CmisExtensionType> extension, Holder<Boolean> contentCopied) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); org.apache.chemistry.opencmis.commons.api.Holder<String> objectIdHolder = convertHolder(objectId); org.apache.chemistry.opencmis.commons.api.Holder<Boolean> contentCopiedHolder = new org.apache.chemistry.opencmis.commons.api.Holder<Boolean>(); @@ -124,9 +121,9 @@ public class VersioningService extends A public List<CmisObjectType> getAllVersions(String repositoryId, String versionSeriesId, String filter, Boolean includeAllowableActions, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); List<ObjectData> versions = service.getAllVersions(context, repositoryId, versionSeriesId, filter, includeAllowableActions, convert(extension), null); @@ -151,9 +148,9 @@ public class VersioningService extends A String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getObjectOfLatestVersion(context, repositoryId, versionSeriesId, major, filter, includeAllowableActions, convert(IncludeRelationships.class, includeRelationships), @@ -166,9 +163,9 @@ public class VersioningService extends A public CmisPropertiesType getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId, Boolean major, String filter, CmisExtensionType extension) throws CmisException { try { - AbstractServicesFactory factory = getServicesFactory(fContext); + AbstractServicesFactory factory = getServicesFactory(wsContext); CmisVersioningService service = factory.getVersioningService(); - CallContext context = createContext(fContext); + CallContext context = createContext(wsContext, repositoryId); return convert(service.getPropertiesOfLatestVersion(context, repositoryId, versionSeriesId, major, filter, convert(extension))); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java Sat Apr 17 18:13:10 2010 @@ -14,6 +14,10 @@ public class DummyCallContext implements fParameter.put(LOCALE, "en"); } + public boolean isObjectInfoRequired() { + return false; + } + public String get(String key) { return fParameter.get(key); } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/CmisInMemorySpi.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/CmisInMemorySpi.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/CmisInMemorySpi.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/CmisInMemorySpi.java Sat Apr 17 18:13:10 2010 @@ -176,6 +176,9 @@ public class CmisInMemorySpi extends Cmi public void clearRepositoryCache(String repositoryId) { } + public void close() { + } + /** * Returns the repository info. */ Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/DummyCallContext.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/DummyCallContext.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/DummyCallContext.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/DummyCallContext.java Sat Apr 17 18:13:10 2010 @@ -14,6 +14,10 @@ public class DummyCallContext implements fParameter.put(LOCALE, "en"); } + public boolean isObjectInfoRequired() { + return false; + } + public String get(String key) { return fParameter.get(key); } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java Sat Apr 17 18:13:10 2010 @@ -171,10 +171,14 @@ public class ServiceFactory extends Abst return null; } + public boolean isObjectInfoRequired() { + return false; + } + public String getRepositoryId() { return null; } - + public String getLocale() { return null; } 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=935219&r1=935218&r2=935219&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 Sat Apr 17 18:13:10 2010 @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; +import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.api.Acl; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.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/MultiFilingTest.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java Sat Apr 17 18:13:10 2010 @@ -25,7 +25,6 @@ import static org.junit.Assert.assertTru import static org.junit.Assert.fail; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,7 +39,6 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException; import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException; -import org.apache.chemistry.opencmis.inmemory.VersioningTest.VersionTestTypeSystemCreator; import org.apache.chemistry.opencmis.inmemory.types.InMemoryFolderTypeDefinition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java Sat Apr 17 18:13:10 2010 @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.chemistry.opencmis.client.SessionFactoryImpl; import org.apache.chemistry.opencmis.client.api.Session; -import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; +import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.api.CmisBinding; import org.apache.chemistry.opencmis.commons.enums.BindingType; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java Sat Apr 17 18:13:10 2010 @@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.fi import java.util.ArrayList; import java.util.List; -import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; +import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.api.CmisBinding; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyDiscoverIT.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyDiscoverIT.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyDiscoverIT.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyDiscoverIT.java Sat Apr 17 18:13:10 2010 @@ -18,11 +18,6 @@ */ package org.apache.chemistry.opencmis.fit.runtime; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.chemistry.opencmis.client.api.QueryResult; //import org.apache.chemistry.opencmis.client.api.util.PagingList; import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges; import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery; import org.apache.commons.logging.Log; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyNavigationIT.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyNavigationIT.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyNavigationIT.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyNavigationIT.java Sat Apr 17 18:13:10 2010 @@ -22,10 +22,9 @@ import java.util.List; import junit.framework.Assert; -import org.apache.chemistry.opencmis.client.api.CmisObject; import org.apache.chemistry.opencmis.client.api.FileableCmisObject; import org.apache.chemistry.opencmis.client.api.Folder; -import org.apache.chemistry.opencmis.client.api.Tree; // import org.apache.chemistry.opencmis.client.api.util.PagingList; +import org.apache.chemistry.opencmis.client.api.Tree; import org.junit.Test; public class ReadOnlyNavigationIT extends AbstractSessionTest { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java Sat Apr 17 18:13:10 2010 @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; -import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; +import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.api.CmisBinding; import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java?rev=935219&r1=935218&r2=935219&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java Sat Apr 17 18:13:10 2010 @@ -31,7 +31,7 @@ import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; -import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; +import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.api.CmisBinding; import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
