chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dcaru...@apache.org
Subject svn commit: r934881 [7/12] - in /incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src: main/java/org/apache/chemistry/opencmis/client/bindings/cache/ main/java/org/apache/chemistry/opencmis/client/bindings...
Date Fri, 16 Apr 2010 14:02:40 GMT
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.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/VersioningServiceImpl.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java Fri Apr 16 14:02:38 2010
@@ -57,313 +57,306 @@ import org.apache.chemistry.opencmis.com
  */
 public class VersioningServiceImpl extends AbstractAtomPubService implements VersioningService {
 
-  /**
-   * Constructor.
-   */
-  public VersioningServiceImpl(Session session) {
-    setSession(session);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.VersioningService#checkOut(java.lang.String,
-   * org.apache.opencmis.client.provider.Holder, org.apache.opencmis.client.provider.ExtensionsData,
-   * org.apache.opencmis.client.provider.Holder)
-   */
-  public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension,
-      Holder<Boolean> contentCopied) {
-    if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) {
-      throw new CmisInvalidArgumentException("Object id must be set!");
-    }
-
-    // find the link
-    String link = loadCollection(repositoryId, Constants.COLLECTION_CHECKEDOUT);
-
-    if (link == null) {
-      throw new CmisObjectNotFoundException(
-          "Unknown repository or checkedout collection not supported!");
-    }
-
-    UrlBuilder url = new UrlBuilder(link);
-
-    // set up object and writer
-    final AtomEntryWriter entryWriter = new AtomEntryWriter(createIdObject(objectId.getValue()));
-
-    // post move request
-    HttpUtils.Response resp = post(url, Constants.MEDIATYPE_ENTRY, new HttpUtils.Output() {
-      public void write(OutputStream out) throws Exception {
-        entryWriter.write(out);
-      }
-    });
-
-    // parse the response
-    AtomEntry entry = parse(resp.getStream(), AtomEntry.class);
-
-    objectId.setValue(entry.getId());
-
-    lockLinks();
-    try {
-      // clean up cache
-      removeLinks(repositoryId, entry.getId());
-
-      // walk through the entry
-      for (AtomElement element : entry.getElements()) {
-        if (element.getObject() instanceof AtomLink) {
-          addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
-        }
-      }
-    }
-    finally {
-      unlockLinks();
-    }
-
-    if (contentCopied != null) {
-      contentCopied.setValue(null);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.VersioningService#cancelCheckOut(java.lang.String,
-   * java.lang.String, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) {
-    // find the link
-    String link = loadLink(repositoryId, objectId, Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
-
-    if (link == null) {
-      throwLinkException(repositoryId, objectId, Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
-    }
-
-    delete(new UrlBuilder(link));
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.VersioningService#checkIn(java.lang.String,
-   * org.apache.opencmis.client.provider.Holder, java.lang.Boolean,
-   * org.apache.opencmis.client.provider.PropertiesData,
-   * org.apache.opencmis.client.provider.ContentStreamData, java.lang.String, java.util.List,
-   * org.apache.opencmis.client.provider.AccessControlList,
-   * org.apache.opencmis.client.provider.AccessControlList,
-   * org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public void checkIn(String repositoryId, Holder<String> objectId, Boolean major,
-      Properties properties, ContentStream contentStream, String checkinComment,
-      List<String> policies, Acl addAces, Acl removeAces,
-      ExtensionsData extension) {
-    // we need an object id
-    if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) {
-      throw new CmisInvalidArgumentException("Object id must be set!");
-    }
-
-    // find the link
-    String link = loadLink(repositoryId, objectId.getValue(), Constants.REL_SELF,
-        Constants.MEDIATYPE_ENTRY);
-
-    if (link == null) {
-      throwLinkException(repositoryId, objectId.getValue(), Constants.REL_SELF,
-          Constants.MEDIATYPE_ENTRY);
-    }
-
-    UrlBuilder url = new UrlBuilder(link);
-    url.addParameter(Constants.PARAM_CHECKIN_COMMENT, checkinComment);
-    url.addParameter(Constants.PARAM_MAJOR, major);
-    url.addParameter(Constants.PARAM_CHECK_IN, "true");
-
-    // set up object and writer
-    CmisObjectType object = new CmisObjectType();
-    object.setProperties(convert(properties));
-    object.setPolicyIds(convertPolicyIds(policies));
-
-    if (object.getProperties() == null) {
-      object.setProperties(new CmisPropertiesType());
-    }
-
-    String mediaType = null;
-    InputStream stream = null;
-
-    if (contentStream != null) {
-      mediaType = contentStream.getMimeType();
-      stream = contentStream.getStream();
-    }
-
-    final AtomEntryWriter entryWriter = new AtomEntryWriter(object, mediaType, stream);
-
-    // update
-    HttpUtils.Response resp = put(url, Constants.MEDIATYPE_ENTRY, new HttpUtils.Output() {
-      public void write(OutputStream out) throws Exception {
-        entryWriter.write(out);
-      }
-    });
-
-    // parse new entry
-    AtomEntry entry = parse(resp.getStream(), AtomEntry.class);
-
-    // we expect a CMIS entry
-    if (entry.getId() == null) {
-      throw new CmisConnectionException("Received Atom entry is not a CMIS entry!");
-    }
-
-    // set object id
-    objectId.setValue(entry.getId());
-
-    Acl originalAces = null;
-
-    lockLinks();
-    try {
-      // clean up cache
-      removeLinks(repositoryId, entry.getId());
-
-      // walk through the entry
-      for (AtomElement element : entry.getElements()) {
-        if (element.getObject() instanceof AtomLink) {
-          addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
-        }
-        else if (element.getObject() instanceof CmisObjectType) {
-          // extract current ACL
-          object = (CmisObjectType) element.getObject();
-          originalAces = convert(object.getAcl(), object.isExactACL());
-        }
-      }
-    }
-    finally {
-      unlockLinks();
-    }
-
-    // handle ACL modifications
-    if ((originalAces != null) && (isAclMergeRequired(addAces, removeAces))) {
-      // merge and update ACL
-      Acl newACL = mergeAcls(originalAces, addAces, removeAces);
-      if (newACL != null) {
-        updateAcl(repositoryId, entry.getId(), newACL, null);
-      }
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.commons.provider.VersioningService#getAllVersions(java.lang.String,
-   * java.lang.String, java.lang.String, java.lang.Boolean,
-   * org.apache.opencmis.commons.api.ExtensionsData)
-   */
-  public List<ObjectData> getAllVersions(String repositoryId, String versionSeriesId,
-      String filter, Boolean includeAllowableActions, ExtensionsData extension) {
-    throw new CmisNotSupportedException("Not supported by Atom binding! "
-        + "Use 'getAllVersions(String repositoryId, String objectId, String versionSeriesId, "
-        + "String filter, Boolean includeAllowableActions, ExtensionsData extension)' instead!'");
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.VersioningService#getAllVersions(java.lang.String,
-   * java.lang.String, java.lang.String, java.lang.Boolean,
-   * org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public List<ObjectData> getAllVersions(String repositoryId, String objectId,
-      String versionSeriesId, String filter, Boolean includeAllowableActions,
-      ExtensionsData extension) {
-    List<ObjectData> result = new ArrayList<ObjectData>();
-
-    // find the link
-    String link = loadLink(repositoryId, objectId, Constants.REL_VERSIONHISTORY,
-        Constants.MEDIATYPE_FEED);
-
-    if (link == null) {
-      throwLinkException(repositoryId, objectId, Constants.REL_VERSIONHISTORY,
-          Constants.MEDIATYPE_FEED);
-    }
-
-    UrlBuilder url = new UrlBuilder(link);
-    url.addParameter(Constants.PARAM_FILTER, filter);
-    url.addParameter(Constants.PARAM_ALLOWABLE_ACTIONS, includeAllowableActions);
-
-    // read and parse
-    HttpUtils.Response resp = read(url);
-    AtomFeed feed = parse(resp.getStream(), AtomFeed.class);
-
-    // get the versions
-    if (!feed.getEntries().isEmpty()) {
-      for (AtomEntry entry : feed.getEntries()) {
-        ObjectData version = null;
-
-        lockLinks();
-        try {
-          // clean up cache
-          removeLinks(repositoryId, entry.getId());
-
-          // walk through the entry
-          for (AtomElement element : entry.getElements()) {
-            if (element.getObject() instanceof AtomLink) {
-              addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
-            }
-            else if (element.getObject() instanceof CmisObjectType) {
-              version = convert((CmisObjectType) element.getObject());
-            }
-          }
-        }
-        finally {
-          unlockLinks();
-        }
-
-        if (version != null) {
-          result.add(version);
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.apache.opencmis.client.provider.VersioningService#getObjectOfLatestVersion(java.lang.String
-   * , java.lang.String, java.lang.Boolean, java.lang.String, java.lang.Boolean,
-   * org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String, java.lang.Boolean,
-   * java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public ObjectData getObjectOfLatestVersion(String repositoryId, String versionSeriesId,
-      Boolean major, String filter, Boolean includeAllowableActions,
-      IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
-      Boolean includeACL, ExtensionsData extension) {
-
-    ReturnVersion returnVersion = ReturnVersion.LATEST;
-    if ((major != null) && (major.booleanValue())) {
-      returnVersion = ReturnVersion.LASTESTMAJOR;
-    }
-
-    return getObjectInternal(repositoryId, IdentifierType.ID, versionSeriesId, returnVersion,
-        filter, includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds,
-        includeACL, extension);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.apache.opencmis.client.provider.VersioningService#getPropertiesOfLatestVersion(java.lang
-   * .String, java.lang.String, java.lang.Boolean, java.lang.String,
-   * org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public Properties getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId,
-      Boolean major, String filter, ExtensionsData extension) {
-
-    ReturnVersion returnVersion = ReturnVersion.LATEST;
-    if ((major != null) && (major.booleanValue())) {
-      returnVersion = ReturnVersion.LASTESTMAJOR;
-    }
-
-    ObjectData object = getObjectInternal(repositoryId, IdentifierType.ID, versionSeriesId,
-        returnVersion, filter, Boolean.FALSE, IncludeRelationships.NONE, "cmis:none",
-        Boolean.FALSE, Boolean.FALSE, extension);
+	/**
+	 * Constructor.
+	 */
+	public VersioningServiceImpl(Session session) {
+		setSession(session);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.VersioningService#checkOut(java.lang
+	 * .String, org.apache.opencmis.client.provider.Holder,
+	 * org.apache.opencmis.client.provider.ExtensionsData,
+	 * org.apache.opencmis.client.provider.Holder)
+	 */
+	public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension,
+			Holder<Boolean> contentCopied) {
+		if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) {
+			throw new CmisInvalidArgumentException("Object id must be set!");
+		}
+
+		// find the link
+		String link = loadCollection(repositoryId, Constants.COLLECTION_CHECKEDOUT);
+
+		if (link == null) {
+			throw new CmisObjectNotFoundException("Unknown repository or checkedout collection not supported!");
+		}
+
+		UrlBuilder url = new UrlBuilder(link);
+
+		// set up object and writer
+		final AtomEntryWriter entryWriter = new AtomEntryWriter(createIdObject(objectId.getValue()));
+
+		// post move request
+		HttpUtils.Response resp = post(url, Constants.MEDIATYPE_ENTRY, new HttpUtils.Output() {
+			public void write(OutputStream out) throws Exception {
+				entryWriter.write(out);
+			}
+		});
+
+		// parse the response
+		AtomEntry entry = parse(resp.getStream(), AtomEntry.class);
+
+		objectId.setValue(entry.getId());
+
+		lockLinks();
+		try {
+			// clean up cache
+			removeLinks(repositoryId, entry.getId());
+
+			// walk through the entry
+			for (AtomElement element : entry.getElements()) {
+				if (element.getObject() instanceof AtomLink) {
+					addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
+				}
+			}
+		} finally {
+			unlockLinks();
+		}
+
+		if (contentCopied != null) {
+			contentCopied.setValue(null);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.VersioningService#cancelCheckOut(
+	 * java.lang.String, java.lang.String,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) {
+		// find the link
+		String link = loadLink(repositoryId, objectId, Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
+
+		if (link == null) {
+			throwLinkException(repositoryId, objectId, Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
+		}
+
+		delete(new UrlBuilder(link));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.VersioningService#checkIn(java.lang
+	 * .String, org.apache.opencmis.client.provider.Holder, java.lang.Boolean,
+	 * org.apache.opencmis.client.provider.PropertiesData,
+	 * org.apache.opencmis.client.provider.ContentStreamData, java.lang.String,
+	 * java.util.List, org.apache.opencmis.client.provider.AccessControlList,
+	 * org.apache.opencmis.client.provider.AccessControlList,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, Properties properties,
+			ContentStream contentStream, String checkinComment, List<String> policies, Acl addAces, Acl removeAces,
+			ExtensionsData extension) {
+		// we need an object id
+		if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) {
+			throw new CmisInvalidArgumentException("Object id must be set!");
+		}
+
+		// find the link
+		String link = loadLink(repositoryId, objectId.getValue(), Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
+
+		if (link == null) {
+			throwLinkException(repositoryId, objectId.getValue(), Constants.REL_SELF, Constants.MEDIATYPE_ENTRY);
+		}
+
+		UrlBuilder url = new UrlBuilder(link);
+		url.addParameter(Constants.PARAM_CHECKIN_COMMENT, checkinComment);
+		url.addParameter(Constants.PARAM_MAJOR, major);
+		url.addParameter(Constants.PARAM_CHECK_IN, "true");
+
+		// set up object and writer
+		CmisObjectType object = new CmisObjectType();
+		object.setProperties(convert(properties));
+		object.setPolicyIds(convertPolicyIds(policies));
+
+		if (object.getProperties() == null) {
+			object.setProperties(new CmisPropertiesType());
+		}
+
+		String mediaType = null;
+		InputStream stream = null;
+
+		if (contentStream != null) {
+			mediaType = contentStream.getMimeType();
+			stream = contentStream.getStream();
+		}
+
+		final AtomEntryWriter entryWriter = new AtomEntryWriter(object, mediaType, stream);
+
+		// update
+		HttpUtils.Response resp = put(url, Constants.MEDIATYPE_ENTRY, new HttpUtils.Output() {
+			public void write(OutputStream out) throws Exception {
+				entryWriter.write(out);
+			}
+		});
+
+		// parse new entry
+		AtomEntry entry = parse(resp.getStream(), AtomEntry.class);
+
+		// we expect a CMIS entry
+		if (entry.getId() == null) {
+			throw new CmisConnectionException("Received Atom entry is not a CMIS entry!");
+		}
+
+		// set object id
+		objectId.setValue(entry.getId());
+
+		Acl originalAces = null;
+
+		lockLinks();
+		try {
+			// clean up cache
+			removeLinks(repositoryId, entry.getId());
+
+			// walk through the entry
+			for (AtomElement element : entry.getElements()) {
+				if (element.getObject() instanceof AtomLink) {
+					addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
+				} else if (element.getObject() instanceof CmisObjectType) {
+					// extract current ACL
+					object = (CmisObjectType) element.getObject();
+					originalAces = convert(object.getAcl(), object.isExactACL());
+				}
+			}
+		} finally {
+			unlockLinks();
+		}
+
+		// handle ACL modifications
+		if ((originalAces != null) && (isAclMergeRequired(addAces, removeAces))) {
+			// merge and update ACL
+			Acl newACL = mergeAcls(originalAces, addAces, removeAces);
+			if (newACL != null) {
+				updateAcl(repositoryId, entry.getId(), newACL, null);
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.commons.provider.VersioningService#getAllVersions
+	 * (java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean,
+	 * org.apache.opencmis.commons.api.ExtensionsData)
+	 */
+	public List<ObjectData> getAllVersions(String repositoryId, String versionSeriesId, String filter,
+			Boolean includeAllowableActions, ExtensionsData extension) {
+		throw new CmisNotSupportedException("Not supported by Atom binding! "
+				+ "Use 'getAllVersions(String repositoryId, String objectId, String versionSeriesId, "
+				+ "String filter, Boolean includeAllowableActions, ExtensionsData extension)' instead!'");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.VersioningService#getAllVersions(
+	 * java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter,
+			Boolean includeAllowableActions, ExtensionsData extension) {
+		List<ObjectData> result = new ArrayList<ObjectData>();
+
+		// find the link
+		String link = loadLink(repositoryId, objectId, Constants.REL_VERSIONHISTORY, Constants.MEDIATYPE_FEED);
+
+		if (link == null) {
+			throwLinkException(repositoryId, objectId, Constants.REL_VERSIONHISTORY, Constants.MEDIATYPE_FEED);
+		}
+
+		UrlBuilder url = new UrlBuilder(link);
+		url.addParameter(Constants.PARAM_FILTER, filter);
+		url.addParameter(Constants.PARAM_ALLOWABLE_ACTIONS, includeAllowableActions);
+
+		// read and parse
+		HttpUtils.Response resp = read(url);
+		AtomFeed feed = parse(resp.getStream(), AtomFeed.class);
+
+		// get the versions
+		if (!feed.getEntries().isEmpty()) {
+			for (AtomEntry entry : feed.getEntries()) {
+				ObjectData version = null;
+
+				lockLinks();
+				try {
+					// clean up cache
+					removeLinks(repositoryId, entry.getId());
+
+					// walk through the entry
+					for (AtomElement element : entry.getElements()) {
+						if (element.getObject() instanceof AtomLink) {
+							addLink(repositoryId, entry.getId(), (AtomLink) element.getObject());
+						} else if (element.getObject() instanceof CmisObjectType) {
+							version = convert((CmisObjectType) element.getObject());
+						}
+					}
+				} finally {
+					unlockLinks();
+				}
+
+				if (version != null) {
+					result.add(version);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.apache.opencmis.client.provider.VersioningService#
+	 * getObjectOfLatestVersion(java.lang.String , java.lang.String,
+	 * java.lang.Boolean, java.lang.String, java.lang.Boolean,
+	 * org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String,
+	 * java.lang.Boolean, java.lang.Boolean,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public ObjectData getObjectOfLatestVersion(String repositoryId, String versionSeriesId, Boolean major,
+			String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
+			String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) {
+
+		ReturnVersion returnVersion = ReturnVersion.LATEST;
+		if ((major != null) && (major.booleanValue())) {
+			returnVersion = ReturnVersion.LASTESTMAJOR;
+		}
+
+		return getObjectInternal(repositoryId, IdentifierType.ID, versionSeriesId, returnVersion, filter,
+				includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeACL, extension);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.apache.opencmis.client.provider.VersioningService#
+	 * getPropertiesOfLatestVersion(java.lang .String, java.lang.String,
+	 * java.lang.Boolean, java.lang.String,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public Properties getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId, Boolean major,
+			String filter, ExtensionsData extension) {
+
+		ReturnVersion returnVersion = ReturnVersion.LATEST;
+		if ((major != null) && (major.booleanValue())) {
+			returnVersion = ReturnVersion.LASTESTMAJOR;
+		}
 
-    return object.getProperties();
-  }
+		ObjectData object = getObjectInternal(repositoryId, IdentifierType.ID, versionSeriesId, returnVersion, filter,
+				Boolean.FALSE, IncludeRelationships.NONE, "cmis:none", Boolean.FALSE, Boolean.FALSE, extension);
+
+		return object.getProperties();
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.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/objects/AtomAcl.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java Fri Apr 16 14:02:38 2010
@@ -26,34 +26,36 @@ import org.apache.chemistry.opencmis.com
  */
 public class AtomAcl extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private CmisAccessControlListType fACL;
+	private CmisAccessControlListType fACL;
 
-  public AtomAcl() {
-    super();
-  }
-
-  public AtomAcl(CmisAccessControlListType acl) {
-    this();
-    setACL(acl);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "ACL";
-  }
-
-  public CmisAccessControlListType getACL() {
-    return fACL;
-  }
-
-  public void setACL(CmisAccessControlListType acl) {
-    fACL = acl;
-  }
+	public AtomAcl() {
+		super();
+	}
+
+	public AtomAcl(CmisAccessControlListType acl) {
+		this();
+		setACL(acl);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "ACL";
+	}
+
+	public CmisAccessControlListType getACL() {
+		return fACL;
+	}
+
+	public void setACL(CmisAccessControlListType acl) {
+		fACL = acl;
+	}
 }
\ No newline at end of file

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.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/objects/AtomAllowableActions.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java Fri Apr 16 14:02:38 2010
@@ -26,34 +26,36 @@ import org.apache.chemistry.opencmis.com
  */
 public class AtomAllowableActions extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private CmisAllowableActionsType fAllowableActions;
+	private CmisAllowableActionsType fAllowableActions;
 
-  public AtomAllowableActions() {
-    super();
-  }
-
-  public AtomAllowableActions(CmisAllowableActionsType allowableActions) {
-    this();
-    setAllowableActions(allowableActions);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "Allowable Actions";
-  }
-
-  public CmisAllowableActionsType getAllowableActions() {
-    return fAllowableActions;
-  }
-
-  public void setAllowableActions(CmisAllowableActionsType allowableActions) {
-    fAllowableActions = allowableActions;
-  }
+	public AtomAllowableActions() {
+		super();
+	}
+
+	public AtomAllowableActions(CmisAllowableActionsType allowableActions) {
+		this();
+		setAllowableActions(allowableActions);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "Allowable Actions";
+	}
+
+	public CmisAllowableActionsType getAllowableActions() {
+		return fAllowableActions;
+	}
+
+	public void setAllowableActions(CmisAllowableActionsType allowableActions) {
+		fAllowableActions = allowableActions;
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomBase.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/objects/AtomBase.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomBase.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomBase.java Fri Apr 16 14:02:38 2010
@@ -28,22 +28,22 @@ import java.util.List;
  */
 public abstract class AtomBase implements Serializable {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private List<AtomElement> fElements = new ArrayList<AtomElement>();
+	private List<AtomElement> fElements = new ArrayList<AtomElement>();
 
-  public AtomBase() {
-  }
+	public AtomBase() {
+	}
 
-  public abstract String getType();
+	public abstract String getType();
 
-  public List<AtomElement> getElements() {
-    return fElements;
-  }
+	public List<AtomElement> getElements() {
+		return fElements;
+	}
 
-  public void addElement(AtomElement element) {
-    if (element != null) {
-      fElements.add(element);
-    }
-  }
+	public void addElement(AtomElement element) {
+		if (element != null) {
+			fElements.add(element);
+		}
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomElement.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/objects/AtomElement.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomElement.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomElement.java Fri Apr 16 14:02:38 2010
@@ -28,26 +28,26 @@ import javax.xml.namespace.QName;
  */
 public class AtomElement implements Serializable {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private QName fName;
-  private Object fObject;
+	private QName fName;
+	private Object fObject;
 
-  public AtomElement(QName name, Object object) {
-    fName = name;
-    fObject = object;
-  }
-
-  public QName getName() {
-    return fName;
-  }
-
-  public Object getObject() {
-    return fObject;
-  }
-
-  @Override
-  public String toString() {
-    return fName + ": " + fObject;
-  }
+	public AtomElement(QName name, Object object) {
+		fName = name;
+		fObject = object;
+	}
+
+	public QName getName() {
+		return fName;
+	}
+
+	public Object getObject() {
+		return fObject;
+	}
+
+	@Override
+	public String toString() {
+		return fName + ": " + fObject;
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomEntry.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/objects/AtomEntry.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomEntry.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomEntry.java Fri Apr 16 14:02:38 2010
@@ -24,34 +24,36 @@ package org.apache.chemistry.opencmis.cl
  */
 public class AtomEntry extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private String fId;
+	private String fId;
 
-  public AtomEntry() {
-    super();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "Atom Entry";
-  }
-
-  public String getId() {
-    return fId;
-  }
-
-  public void setId(String id) {
-    fId = id;
-  }
-
-  @Override
-  public String toString() {
-    return "Entry \"" + fId + "\": " + getElements();
-  }
+	public AtomEntry() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "Atom Entry";
+	}
+
+	public String getId() {
+		return fId;
+	}
+
+	public void setId(String id) {
+		fId = id;
+	}
+
+	@Override
+	public String toString() {
+		return "Entry \"" + fId + "\": " + getElements();
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomFeed.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/objects/AtomFeed.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomFeed.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomFeed.java Fri Apr 16 14:02:38 2010
@@ -27,35 +27,37 @@ import java.util.List;
  */
 public class AtomFeed extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private List<AtomEntry> fEntries = new ArrayList<AtomEntry>();
+	private List<AtomEntry> fEntries = new ArrayList<AtomEntry>();
 
-  public AtomFeed() {
-  }
+	public AtomFeed() {
+	}
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "Atom Feed";
-  }
-
-  public List<AtomEntry> getEntries() {
-    return fEntries;
-  }
-
-  public void addEntry(AtomEntry entry) {
-    if (entry != null) {
-      fEntries.add(entry);
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "Feed : " + getElements() + " " + fEntries;
-  }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "Atom Feed";
+	}
+
+	public List<AtomEntry> getEntries() {
+		return fEntries;
+	}
+
+	public void addEntry(AtomEntry entry) {
+		if (entry != null) {
+			fEntries.add(entry);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "Feed : " + getElements() + " " + fEntries;
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomLink.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/objects/AtomLink.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomLink.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomLink.java Fri Apr 16 14:02:38 2010
@@ -26,41 +26,41 @@ import java.io.Serializable;
  */
 public class AtomLink implements Serializable {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private String fRel;
-  private String fType;
-  private String fHref;
-
-  public AtomLink() {
-  }
-
-  public String getRel() {
-    return fRel;
-  }
-
-  public void setRel(String rel) {
-    fRel = rel;
-  }
-
-  public String getType() {
-    return fType;
-  }
-
-  public void setType(String type) {
-    fType = type;
-  }
-
-  public String getHref() {
-    return fHref;
-  }
-
-  public void setHref(String href) {
-    fHref = href;
-  }
-
-  @Override
-  public String toString() {
-    return "Link: rel=\"" + fRel + "\" type=\"" + fType + "\" href=\"" + fHref + "\"";
-  }
+	private String fRel;
+	private String fType;
+	private String fHref;
+
+	public AtomLink() {
+	}
+
+	public String getRel() {
+		return fRel;
+	}
+
+	public void setRel(String rel) {
+		fRel = rel;
+	}
+
+	public String getType() {
+		return fType;
+	}
+
+	public void setType(String type) {
+		fType = type;
+	}
+
+	public String getHref() {
+		return fHref;
+	}
+
+	public void setHref(String href) {
+		fHref = href;
+	}
+
+	@Override
+	public String toString() {
+		return "Link: rel=\"" + fRel + "\" type=\"" + fType + "\" href=\"" + fHref + "\"";
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/RepositoryWorkspace.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/objects/RepositoryWorkspace.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/RepositoryWorkspace.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/RepositoryWorkspace.java Fri Apr 16 14:02:38 2010
@@ -24,34 +24,35 @@ package org.apache.chemistry.opencmis.cl
  */
 public class RepositoryWorkspace extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private String fId;
+	private String fId;
 
-  public RepositoryWorkspace() {
-  }
+	public RepositoryWorkspace() {
+	}
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "Repository Workspace";
-  }
-
-  
-  public String getId() {
-    return fId;
-  }
-
-  public void setId(String id) {
-    fId = id;
-  }
-
-  @Override
-  public String toString() {
-    return "Workspace \"" + fId + "\": " + getElements();
-  }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "Repository Workspace";
+	}
+
+	public String getId() {
+		return fId;
+	}
+
+	public void setId(String id) {
+		fId = id;
+	}
+
+	@Override
+	public String toString() {
+		return "Workspace \"" + fId + "\": " + getElements();
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/ServiceDoc.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/objects/ServiceDoc.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/ServiceDoc.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/ServiceDoc.java Fri Apr 16 14:02:38 2010
@@ -27,35 +27,37 @@ import java.util.List;
  */
 public class ServiceDoc extends AtomBase {
 
-  private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-  private List<RepositoryWorkspace> fWorkspaces = new ArrayList<RepositoryWorkspace>();
+	private List<RepositoryWorkspace> fWorkspaces = new ArrayList<RepositoryWorkspace>();
 
-  public ServiceDoc() {
-  }
+	public ServiceDoc() {
+	}
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType()
-   */
-  @Override
-  public String getType() {
-    return "Service Document";
-  }
-
-  public List<RepositoryWorkspace> getWorkspaces() {
-    return fWorkspaces;
-  }
-
-  public void addWorkspace(RepositoryWorkspace ws) {
-    if (ws != null) {
-      fWorkspaces.add(ws);
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "Service Doc: " + fWorkspaces;
-  }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.atompub.objects.AtomBase#getType
+	 * ()
+	 */
+	@Override
+	public String getType() {
+		return "Service Document";
+	}
+
+	public List<RepositoryWorkspace> getWorkspaces() {
+		return fWorkspaces;
+	}
+
+	public void addWorkspace(RepositoryWorkspace ws) {
+		if (ws != null) {
+			fWorkspaces.add(ws);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "Service Doc: " + fWorkspaces;
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractWebServicesService.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/AbstractWebServicesService.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractWebServicesService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractWebServicesService.java Fri Apr 16 14:02:38 2010
@@ -45,63 +45,62 @@ import org.apache.chemistry.opencmis.com
  */
 public abstract class AbstractWebServicesService {
 
-  private Session fSession;
+	private Session fSession;
 
-  /**
-   * Sets the current session.
-   */
-  protected void setSession(Session session) {
-    fSession = session;
-  }
-
-  /**
-   * Gets the current session.
-   */
-  protected Session getSession() {
-    return fSession;
-  }
-
-  /**
-   * Converts a Web Services Exception into a CMIS Client exception.
-   */
-  protected CmisBaseException convertException(CmisException ex) {
-    if ((ex == null) || (ex.getFaultInfo() == null)) {
-      return new CmisRuntimeException("CmisException has no fault!");
-    }
-
-    String msg = ex.getFaultInfo().getMessage();
-    BigInteger code = ex.getFaultInfo().getCode();
-
-    switch (ex.getFaultInfo().getType()) {
-    case CONSTRAINT:
-      return new CmisConstraintException(msg, code);
-    case CONTENT_ALREADY_EXISTS:
-      return new CmisContentAlreadyExistsException(msg, code);
-    case FILTER_NOT_VALID:
-      return new CmisFilterNotValidException(msg, code);
-    case INVALID_ARGUMENT:
-      return new CmisInvalidArgumentException(msg, code);
-    case NAME_CONSTRAINT_VIOLATION:
-      return new CmisNameConstraintViolationException(msg, code);
-    case NOT_SUPPORTED:
-      return new CmisNotSupportedException(msg, code);
-    case OBJECT_NOT_FOUND:
-      return new CmisObjectNotFoundException(msg, code);
-    case PERMISSION_DENIED:
-      return new CmisPermissionDeniedException(msg, code);
-    case RUNTIME:
-      return new CmisRuntimeException(msg, code);
-    case STORAGE:
-      return new CmisStorageException(msg, code);
-    case STREAM_NOT_SUPPORTED:
-      return new CmisStreamNotSupportedException(msg, code);
-    case UPDATE_CONFLICT:
-      return new CmisUpdateConflictException(msg, code);
-    case VERSIONING:
-      return new CmisVersioningException(msg, code);
-    }
-
-    return new CmisRuntimeException("Unknown exception[" + ex.getFaultInfo().getType().value()
-        + "]: " + msg);
-  }
+	/**
+	 * Sets the current session.
+	 */
+	protected void setSession(Session session) {
+		fSession = session;
+	}
+
+	/**
+	 * Gets the current session.
+	 */
+	protected Session getSession() {
+		return fSession;
+	}
+
+	/**
+	 * Converts a Web Services Exception into a CMIS Client exception.
+	 */
+	protected CmisBaseException convertException(CmisException ex) {
+		if ((ex == null) || (ex.getFaultInfo() == null)) {
+			return new CmisRuntimeException("CmisException has no fault!");
+		}
+
+		String msg = ex.getFaultInfo().getMessage();
+		BigInteger code = ex.getFaultInfo().getCode();
+
+		switch (ex.getFaultInfo().getType()) {
+		case CONSTRAINT:
+			return new CmisConstraintException(msg, code);
+		case CONTENT_ALREADY_EXISTS:
+			return new CmisContentAlreadyExistsException(msg, code);
+		case FILTER_NOT_VALID:
+			return new CmisFilterNotValidException(msg, code);
+		case INVALID_ARGUMENT:
+			return new CmisInvalidArgumentException(msg, code);
+		case NAME_CONSTRAINT_VIOLATION:
+			return new CmisNameConstraintViolationException(msg, code);
+		case NOT_SUPPORTED:
+			return new CmisNotSupportedException(msg, code);
+		case OBJECT_NOT_FOUND:
+			return new CmisObjectNotFoundException(msg, code);
+		case PERMISSION_DENIED:
+			return new CmisPermissionDeniedException(msg, code);
+		case RUNTIME:
+			return new CmisRuntimeException(msg, code);
+		case STORAGE:
+			return new CmisStorageException(msg, code);
+		case STREAM_NOT_SUPPORTED:
+			return new CmisStreamNotSupportedException(msg, code);
+		case UPDATE_CONFLICT:
+			return new CmisUpdateConflictException(msg, code);
+		case VERSIONING:
+			return new CmisVersioningException(msg, code);
+		}
+
+		return new CmisRuntimeException("Unknown exception[" + ex.getFaultInfo().getType().value() + "]: " + msg);
+	}
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.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/AclServiceImpl.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java Fri Apr 16 14:02:38 2010
@@ -38,58 +38,57 @@ import org.apache.chemistry.opencmis.com
  */
 public class AclServiceImpl extends AbstractWebServicesService implements AclService {
 
-  private final PortProvider fPortProvider;
+	private final PortProvider fPortProvider;
 
-  /**
-   * Constructor.
-   */
-  public AclServiceImpl(Session session, PortProvider portProvider) {
-    setSession(session);
-    fPortProvider = portProvider;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.ACLService#applyACL(java.lang.String, java.lang.String,
-   * org.apache.opencmis.client.provider.AccessControlList, org.apache.opencmis.client.provider.AccessControlList,
-   * org.apache.opencmis.commons.enums.ACLPropagation, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public Acl applyAcl(String repositoryId, String objectId,
-      Acl addACEs, Acl removeACEs, AclPropagation aclPropagation,
-      ExtensionsData extension) {
-    ACLServicePort port = fPortProvider.getACLServicePort();
-
-    try {
-      return convert(port.applyACL(repositoryId, objectId, convert(addACEs), convert(removeACEs),
-          convert(EnumACLPropagation.class, aclPropagation), convert(extension)));
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.ACLService#getACL(java.lang.String, java.lang.String,
-   * java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public Acl getAcl(String repositoryId, String objectId,
-      Boolean onlyBasicPermissions, ExtensionsData extension) {
-    ACLServicePort port = fPortProvider.getACLServicePort();
-
-    try {
-      return convert(port.getACL(repositoryId, objectId, onlyBasicPermissions, convert(extension)));
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
+	/**
+	 * Constructor.
+	 */
+	public AclServiceImpl(Session session, PortProvider portProvider) {
+		setSession(session);
+		fPortProvider = portProvider;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.ACLService#applyACL(java.lang.String,
+	 * java.lang.String, org.apache.opencmis.client.provider.AccessControlList,
+	 * org.apache.opencmis.client.provider.AccessControlList,
+	 * org.apache.opencmis.commons.enums.ACLPropagation,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public Acl applyAcl(String repositoryId, String objectId, Acl addACEs, Acl removeACEs,
+			AclPropagation aclPropagation, ExtensionsData extension) {
+		ACLServicePort port = fPortProvider.getACLServicePort();
+
+		try {
+			return convert(port.applyACL(repositoryId, objectId, convert(addACEs), convert(removeACEs), convert(
+					EnumACLPropagation.class, aclPropagation), convert(extension)));
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.ACLService#getACL(java.lang.String,
+	 * java.lang.String, java.lang.Boolean,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) {
+		ACLServicePort port = fPortProvider.getACLServicePort();
+
+		try {
+			return convert(port.getACL(repositoryId, objectId, onlyBasicPermissions, convert(extension)));
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
 }

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=934881&r1=934880&r2=934881&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 Fri Apr 16 14:02:38 2010
@@ -41,150 +41,158 @@ import org.apache.commons.logging.LogFac
  */
 public class CmisWebServicesSpi implements CmisSpiFactory, CmisSpi {
 
-  private static Log log = LogFactory.getLog(CmisWebServicesSpi.class);
+	private static Log log = LogFactory.getLog(CmisWebServicesSpi.class);
 
-  private Session fSession;
-  private PortProvider fPortProvider;
+	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;
-
-  /**
-   * Constructor.
-   */
-  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);
-
-    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);
-
-    return this;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getRepositoryService()
-   */
-  public RepositoryService getRepositoryService() {
-    return fRepositoryService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getNavigationService()
-   */
-  public NavigationService getNavigationService() {
-    return fNavigationService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getObjectService()
-   */
-  public ObjectService getObjectService() {
-    return fObjectService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getDiscoveryService()
-   */
-  public DiscoveryService getDiscoveryService() {
-    return fDiscoveryService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getVersioningService()
-   */
-  public VersioningService getVersioningService() {
-    return fVersioningService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getMultiFilingService()
-   */
-  public MultiFilingService getMultiFilingService() {
-    return fMultiFilingService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getRelationshipService()
-   */
-  public RelationshipService getRelationshipService() {
-    return fRelationshipService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getPolicyService()
-   */
-  public PolicyService getPolicyService() {
-    return fPolicyService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#getACLService()
-   */
-  public AclService getAclService() {
-    return fACLService;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#clearAllCaches()
-   */
-  public void clearAllCaches() {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.spi.CMISSPI#clearRepositoryCache(java.lang.String)
-   */
-  public void clearRepositoryCache(String repositoryId) {
-  }
+	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;
+
+	/**
+	 * Constructor.
+	 */
+	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);
+
+		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);
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getRepositoryService()
+	 */
+	public RepositoryService getRepositoryService() {
+		return fRepositoryService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getNavigationService()
+	 */
+	public NavigationService getNavigationService() {
+		return fNavigationService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.opencmis.client.provider.spi.CMISSPI#getObjectService()
+	 */
+	public ObjectService getObjectService() {
+		return fObjectService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getDiscoveryService()
+	 */
+	public DiscoveryService getDiscoveryService() {
+		return fDiscoveryService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getVersioningService()
+	 */
+	public VersioningService getVersioningService() {
+		return fVersioningService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getMultiFilingService()
+	 */
+	public MultiFilingService getMultiFilingService() {
+		return fMultiFilingService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#getRelationshipService()
+	 */
+	public RelationshipService getRelationshipService() {
+		return fRelationshipService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.opencmis.client.provider.spi.CMISSPI#getPolicyService()
+	 */
+	public PolicyService getPolicyService() {
+		return fPolicyService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.opencmis.client.provider.spi.CMISSPI#getACLService()
+	 */
+	public AclService getAclService() {
+		return fACLService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.opencmis.client.provider.spi.CMISSPI#clearAllCaches()
+	 */
+	public void clearAllCaches() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.spi.CMISSPI#clearRepositoryCache(
+	 * java.lang.String)
+	 */
+	public void clearRepositoryCache(String repositoryId) {
+	}
 
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.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/DiscoveryServiceImpl.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java Fri Apr 16 14:02:38 2010
@@ -44,72 +44,71 @@ import org.apache.chemistry.opencmis.com
  */
 public class DiscoveryServiceImpl extends AbstractWebServicesService implements DiscoveryService {
 
-  private final PortProvider fPortProvider;
+	private final PortProvider fPortProvider;
 
-  /**
-   * Constructor.
-   */
-  public DiscoveryServiceImpl(Session session, PortProvider portProvider) {
-    setSession(session);
-    fPortProvider = portProvider;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.DiscoveryService#getContentChanges(java.lang.String,
-   * org.apache.opencmis.client.provider.Holder, java.lang.Boolean, java.lang.String,
-   * java.lang.Boolean, java.lang.Boolean, java.math.BigInteger,
-   * org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken,
-      Boolean includeProperties, String filter, Boolean includePolicyIds, Boolean includeACL,
-      BigInteger maxItems, ExtensionsData extension) {
-    DiscoveryServicePort port = fPortProvider.getDiscoveryServicePort();
-
-    try {
-      javax.xml.ws.Holder<String> portChangeLokToken = convertHolder(changeLogToken);
-      javax.xml.ws.Holder<CmisObjectListType> portObjects = new javax.xml.ws.Holder<CmisObjectListType>();
-
-      port.getContentChanges(repositoryId, portChangeLokToken, includeProperties, filter,
-          includePolicyIds, includeACL, maxItems, convert(extension), portObjects);
-
-      setHolderValue(portChangeLokToken, changeLogToken);
-
-      return convert(portObjects.value);
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.DiscoveryService#query(java.lang.String,
-   * java.lang.String, java.lang.Boolean, java.lang.Boolean,
-   * org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String, java.math.BigInteger,
-   * java.math.BigInteger, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions,
-      Boolean includeAllowableActions, IncludeRelationships includeRelationships,
-      String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
-    DiscoveryServicePort port = fPortProvider.getDiscoveryServicePort();
-
-    try {
-      return convert(port.query(repositoryId, statement, searchAllVersions,
-          includeAllowableActions, convert(EnumIncludeRelationships.class, includeRelationships),
-          renditionFilter, maxItems, skipCount, convert(extension)));
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
+	/**
+	 * Constructor.
+	 */
+	public DiscoveryServiceImpl(Session session, PortProvider portProvider) {
+		setSession(session);
+		fPortProvider = portProvider;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.DiscoveryService#getContentChanges
+	 * (java.lang.String, org.apache.opencmis.client.provider.Holder,
+	 * java.lang.Boolean, java.lang.String, java.lang.Boolean,
+	 * java.lang.Boolean, java.math.BigInteger,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties,
+			String filter, Boolean includePolicyIds, Boolean includeACL, BigInteger maxItems, ExtensionsData extension) {
+		DiscoveryServicePort port = fPortProvider.getDiscoveryServicePort();
+
+		try {
+			javax.xml.ws.Holder<String> portChangeLokToken = convertHolder(changeLogToken);
+			javax.xml.ws.Holder<CmisObjectListType> portObjects = new javax.xml.ws.Holder<CmisObjectListType>();
+
+			port.getContentChanges(repositoryId, portChangeLokToken, includeProperties, filter, includePolicyIds,
+					includeACL, maxItems, convert(extension), portObjects);
+
+			setHolderValue(portChangeLokToken, changeLogToken);
+
+			return convert(portObjects.value);
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.DiscoveryService#query(java.lang.
+	 * String, java.lang.String, java.lang.Boolean, java.lang.Boolean,
+	 * org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String,
+	 * java.math.BigInteger, java.math.BigInteger,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions,
+			Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
+			BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
+		DiscoveryServicePort port = fPortProvider.getDiscoveryServicePort();
+
+		try {
+			return convert(port.query(repositoryId, statement, searchAllVersions, includeAllowableActions, convert(
+					EnumIncludeRelationships.class, includeRelationships), renditionFilter, maxItems, skipCount,
+					convert(extension)));
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
 
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.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/MultiFilingServiceImpl.java?rev=934881&r1=934880&r2=934881&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java Fri Apr 16 14:02:38 2010
@@ -35,68 +35,65 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class MultiFilingServiceImpl extends AbstractWebServicesService implements
-    MultiFilingService {
+public class MultiFilingServiceImpl extends AbstractWebServicesService implements MultiFilingService {
 
-  private final PortProvider fPortProvider;
+	private final PortProvider fPortProvider;
 
-  /**
-   * Constructor.
-   */
-  public MultiFilingServiceImpl(Session session, PortProvider portProvider) {
-    setSession(session);
-    fPortProvider = portProvider;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.MultiFilingService#addObjectToFolder(java.lang.String,
-   * java.lang.String, java.lang.String, java.lang.Boolean,
-   * org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public void addObjectToFolder(String repositoryId, String objectId, String folderId,
-      Boolean allVersions, ExtensionsData extension) {
-    MultiFilingServicePort port = fPortProvider.getMultiFilingServicePort();
-
-    try {
-      javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension);
-
-      port.addObjectToFolder(repositoryId, objectId, folderId, allVersions, portExtension);
-
-      setExtensionValues(portExtension, extension);
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.opencmis.client.provider.MultiFilingService#removeObjectFromFolder(java.lang.String,
-   * java.lang.String, java.lang.String, org.apache.opencmis.client.provider.ExtensionsData)
-   */
-  public void removeObjectFromFolder(String repositoryId, String objectId, String folderId,
-      ExtensionsData extension) {
-    MultiFilingServicePort port = fPortProvider.getMultiFilingServicePort();
-
-    try {
-      javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension);
-
-      port.removeObjectFromFolder(repositoryId, objectId, folderId, portExtension);
-
-      setExtensionValues(portExtension, extension);
-    }
-    catch (CmisException e) {
-      throw convertException(e);
-    }
-    catch (Exception e) {
-      throw new CmisRuntimeException("Error: " + e.getMessage(), e);
-    }
-  }
+	/**
+	 * Constructor.
+	 */
+	public MultiFilingServiceImpl(Session session, PortProvider portProvider) {
+		setSession(session);
+		fPortProvider = portProvider;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.MultiFilingService#addObjectToFolder
+	 * (java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions,
+			ExtensionsData extension) {
+		MultiFilingServicePort port = fPortProvider.getMultiFilingServicePort();
+
+		try {
+			javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension);
+
+			port.addObjectToFolder(repositoryId, objectId, folderId, allVersions, portExtension);
+
+			setExtensionValues(portExtension, extension);
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.apache.opencmis.client.provider.MultiFilingService#removeObjectFromFolder
+	 * (java.lang.String, java.lang.String, java.lang.String,
+	 * org.apache.opencmis.client.provider.ExtensionsData)
+	 */
+	public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) {
+		MultiFilingServicePort port = fPortProvider.getMultiFilingServicePort();
+
+		try {
+			javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension);
+
+			port.removeObjectFromFolder(repositoryId, objectId, folderId, portExtension);
+
+			setExtensionValues(portExtension, extension);
+		} catch (CmisException e) {
+			throw convertException(e);
+		} catch (Exception e) {
+			throw new CmisRuntimeException("Error: " + e.getMessage(), e);
+		}
+	}
 
 }



Mime
View raw message