Author: fmui
Date: Thu Jun 17 14:51:16 2010
New Revision: 955620
URL: http://svn.apache.org/viewvc?rev=955620&view=rev
Log:
- fixed CMIS-219: edit-media link was missing for documents without content
- enabled FIT test
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractWriteObjectIT.java
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.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/atompub/AtomPubUtils.java?rev=955620&r1=955619&r2=955620&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java
Thu Jun 17 14:51:16 2010
@@ -321,8 +321,8 @@ public final class AtomPubUtils {
entry.writeEditLink(cvUrl.toString());
}
- if (contentSrc != null) {
- entry.writeEditMediaLink(contentSrc, info.getContentType());
+ if (info.getBaseType() == BaseTypeId.CMIS_DOCUMENT) {
+ entry.writeEditMediaLink(compileUrl(baseUrl, RESOURCE_CONTENT,
info.getId()), info.getContentType());
}
if (info.getWorkingCopyId() != null) {
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractWriteObjectIT.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/AbstractWriteObjectIT.java?rev=955620&r1=955619&r2=955620&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractWriteObjectIT.java
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractWriteObjectIT.java
Thu Jun 17 14:51:16 2010
@@ -211,7 +211,6 @@ public abstract class AbstractWriteObjec
return sbuf.toString();
}
- @Ignore
@Test
public void createDocumentAndSetContent() throws IOException {
ObjectId parentId =
this.session.createObjectId(this.fixture.getTestRootId());