You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by dc...@apache.org on 2010/03/02 18:46:52 UTC
svn commit: r918127 - in
/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub: ./
src/main/java/org/apache/chemistry/abdera/ext/
src/main/java/org/apache/chemistry/tck/atompub/
src/main/java/org/apache/chemistry/tck/atompub/client/ src/main/java/...
Author: dcaruana
Date: Tue Mar 2 17:46:52 2010
New Revision: 918127
URL: http://svn.apache.org/viewvc?rev=918127&view=rev
Log:
Add relationship tests to TCK
- support new TCK options for specifying the default types to create:
- chemistry.tck.type.folder
- chemistry.tck.type.document
- chemistry.tck.type.relationship
Added:
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java (with props)
Modified:
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/pom.xml
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISTypeDefinition.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKOptions.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKTest.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/fixture/CMISTestFixture.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/TCKTestSuite.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/custom/CMISCustomTypeTest.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/pom.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/pom.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/pom.xml Tue Mar 2 17:46:52 2010
@@ -189,6 +189,14 @@
<name>chemistry.tck.traceRequests</name>
<value>false</value>
</property>
+ <property>
+ <name>chemistry.tck.type.document</name>
+ <value>D:cmiscustom:document</value>
+ </property>
+ <property>
+ <name>chemistry.tck.type.relationship</name>
+ <value>R:cmiscustom:assoc</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -232,6 +240,14 @@
<name>chemistry.tck.traceRequests</name>
<value>false</value>
</property>
+ <property>
+ <name>chemistry.tck.type.document</name>
+ <value>D:cmiscustom:document</value>
+ </property>
+ <property>
+ <name>chemistry.tck.type.relationship</name>
+ <value>R:cmiscustom:assoc</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISTypeDefinition.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISTypeDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISTypeDefinition.java Tue Mar 2 17:46:52 2010
@@ -61,6 +61,15 @@
}
/**
+ * Determines whether objects of this type are creatable.
+ *
+ * @return <code>true</code> if objects of this type are creatable
+ */
+ public boolean getCreatable() {
+ return Boolean.parseBoolean(getFirstChild(CMISConstants.TYPE_CREATABLE).getText());
+ }
+
+ /**
* Gets a value that indicates whether the base type for this Object-Type is
* the Document, Folder, Relationship, or Policy base type.
*
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKOptions.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKOptions.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKOptions.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKOptions.java Tue Mar 2 17:46:52 2010
@@ -33,7 +33,11 @@
public final static String PROP_FAIL_ON_VALIDATION_ERROR = "chemistry.tck.failOnValidationError";
public final static String PROP_TRACE_REQUESTS = "chemistry.tck.traceRequests";
public final static String PROP_DELETE_TEST_FIXTURE = "chemistry.tck.deleteTestFixture";
+ public final static String PROP_TYPE_FOLDER = "chemistry.tck.type.folder";
+ public final static String PROP_TYPE_DOCUMENT = "chemistry.tck.type.document";
+ public final static String PROP_TYPE_RELATIONSHIP = "chemistry.tck.type.relationship";
+
private static final long serialVersionUID = 5805080271712377369L;
protected Properties properties;
@@ -97,6 +101,27 @@
return Boolean.valueOf(val);
}
+ /**
+ * @return folder type to create (default: cmis:folder)
+ */
+ public String getFolderType() {
+ return properties.getProperty(PROP_TYPE_FOLDER, "cmis:folder");
+ }
+
+ /**
+ * @return document type to create (default: cmis:document)
+ */
+ public String getDocumentType() {
+ return properties.getProperty(PROP_TYPE_DOCUMENT, "cmis:document");
+ }
+
+ /**
+ * @return relationship type to create (default: cmis:relationship)
+ */
+ public String getRelationshipType() {
+ return properties.getProperty(PROP_TYPE_RELATIONSHIP, "cmis:relationship");
+ }
+
public String getConnectionFactory() {
return null;
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKTest.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/TCKTest.java Tue Mar 2 17:46:52 2010
@@ -83,6 +83,12 @@
client.setFailOnValidationError(failOnValidationError);
boolean traceRequests = options.getTraceRequests();
client.setTrace(traceRequests);
+ String defaultFolderType = options.getFolderType();
+ client.setDefaultFolderType(defaultFolderType);
+ String defaultDocumentType = options.getDocumentType();
+ client.setDefaultDocumentType(defaultDocumentType);
+ String defaultRelationshipType = options.getRelationshipType();
+ client.setDefaultRelationshipType(defaultRelationshipType);
// construct model helper
model = new CMISAppModel();
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java Tue Mar 2 17:46:52 2010
@@ -85,6 +85,9 @@
private Service cmisService = null;
private CMISRepositoryInfo cmisRepositoryInfo = null;
+ private String defaultDocumentType = "cmis:document";
+ private String defaultFolderType = "cmis:folder";
+ private String defaultRelationshipType = "cmis:relationship";
public CMISClient(String userId, Connection connection, String serviceUrl, TCKMessageWriter messageWriter) {
this.userId = userId;
@@ -105,6 +108,18 @@
this.traceConnection = trace;
}
+ public void setDefaultDocumentType(String defaultDocumentType) {
+ this.defaultDocumentType = defaultDocumentType;
+ }
+
+ public void setDefaultFolderType(String defaultFolderType) {
+ this.defaultFolderType = defaultFolderType;
+ }
+
+ public void setDefaultRelationshipType(String defaultRelationshipType) {
+ this.defaultRelationshipType = defaultRelationshipType;
+ }
+
public String getUserId()
{
return this.userId;
@@ -345,13 +360,15 @@
return feed;
}
- public Entry createFolder(IRI parent, String name) throws Exception {
- return createFolder(parent, name, null);
+ public Entry createFolder(IRI parent, String type, String name) throws Exception {
+ return createFolder(parent, type, name, null);
}
- public Entry createFolder(IRI parent, String name, String atomEntryFile) throws Exception {
+ public Entry createFolder(IRI parent, String type, String name, String atomEntryFile) throws Exception {
+ type = (type == null) ? defaultFolderType : type;
String createFolder = templates.load(atomEntryFile == null ? "createfolder.atomentry.xml" : atomEntryFile);
createFolder = createFolder.replace("${NAME}", name);
+ createFolder = createFolder.replace("${TYPE}", type);
Request req = new PostRequest(parent.toString(), createFolder, CMISConstants.MIMETYPE_ENTRY);
Response res = executeRequest(req, 201);
Assert.assertNotNull(res);
@@ -367,28 +384,32 @@
return entry;
}
- public Entry createDocument(IRI parent, String name) throws Exception {
- return createDocument(parent, name, null);
+ public Entry createDocument(IRI parent, String type, String name) throws Exception {
+ return createDocument(parent, type, name, null);
}
- public Entry createDocument(IRI parent, String name, String atomEntryFile) throws Exception {
- return createDocument(parent, name, atomEntryFile, false);
+ public Entry createDocument(IRI parent, String type, String name, String atomEntryFile) throws Exception {
+ return createDocument(parent, type, name, atomEntryFile, false);
}
- public Entry createDocument(IRI parent, String name, String atomEntryFile, boolean expectNoContent)
+ public Entry createDocument(IRI parent, String type, String name, String atomEntryFile, boolean expectNoContent)
throws Exception {
- return createDocument(parent, name, atomEntryFile, expectNoContent, name, null, null);
+ return createDocument(parent, type, name, atomEntryFile, expectNoContent, name, null, null);
}
- public Entry createDocument(IRI parent, String name, String atomEntryFile, boolean expectNoContent, String content,
- String cmisType, String cmisContentPath) throws Exception {
+ public Entry createDocument(IRI parent, String type, String name, String atomEntryFile, boolean expectNoContent, String content,
+ String contentType, String contentPath) throws Exception {
+ type = (type == null) ? defaultDocumentType : type;
+
// If no preference is expressed, use the base64 template if binary
// content has been supplied or the basic atom entry template otherwise
String createFile = templates
- .load(atomEntryFile == null ? (cmisContentPath == null ? "createdocument.atomentry.xml"
+ .load(atomEntryFile == null ? (contentPath == null ? "createdocument.atomentry.xml"
: "createdocumentBase64.cmisatomentry.xml") : atomEntryFile);
createFile = createFile.replace("${NAME}", name);
+ createFile = createFile.replace("${TYPE}", type);
+ createFile = createFile.replace("${CONTENTTYPE}", contentType == null ? "text/plain" : contentType);
// determine if creating content via mediatype
Entry createEntry = appModel.parseEntry(new StringReader(createFile), null);
@@ -399,11 +420,9 @@
.encodeBase64(content.getBytes("UTF-8")), "8859_1"));
}
- createFile = createFile.replace("${CMISTYPE}", cmisType == null ? "text/plain" : cmisType);
-
byte[] contentBytes = null;
- if (cmisContentPath != null) {
- InputStream in = getClass().getResourceAsStream('/' + cmisContentPath);
+ if (contentPath != null) {
+ InputStream in = getClass().getResourceAsStream('/' + contentPath);
if (in != null) {
ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
int bytesRead;
@@ -444,6 +463,7 @@
}
public Entry createRelationship(IRI parent, String type, String targetId, String atomEntryFile) throws Exception {
+ type = (type == null) ? defaultRelationshipType : type;
String createFile = templates.load(atomEntryFile);
createFile = createFile.replace("${RELTYPE}", type);
createFile = createFile.replace("${TARGETID}", targetId);
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/fixture/CMISTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/fixture/CMISTestFixture.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/fixture/CMISTestFixture.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/fixture/CMISTestFixture.java Tue Mar 2 17:46:52 2010
@@ -58,7 +58,7 @@
IRI rootFolderHREF = client.getRootCollection(client.getWorkspace(service));
Assert.assertNotNull(rootFolderHREF);
String folderName = "CMISTCK " + getStartTime() + " - " + name;
- testCaseFolder = client.createFolder(rootFolderHREF, folderName);
+ testCaseFolder = client.createFolder(rootFolderHREF, null, folderName);
}
return testCaseFolder;
}
@@ -74,8 +74,7 @@
public Entry createTestDocument(String name, String template,
boolean expectNoContent) throws Exception {
Link children = client.getChildrenLink(getTestCaseFolder());
- return client.createDocument(children.getHref(), name, template,
- expectNoContent);
+ return client.createDocument(children.getHref(), null, name, template, expectNoContent);
}
public Entry createTestFolder(String name) throws Exception {
@@ -84,7 +83,7 @@
public Entry createTestFolder(String name, String template) throws Exception {
Link children = client.getChildrenLink(getTestCaseFolder());
- return client.createFolder(children.getHref(), name, template);
+ return client.createFolder(children.getHref(), null, name, template);
}
public EntryTree createTestTree(String name, int depth, int docCount, String folderTemplate, String docTemplate) throws Exception {
@@ -130,10 +129,10 @@
content = name;
break;
}
- docEntry.entry = client.createDocument(childrenLink.getHref(), docName, null, false, content, cmisType,
+ docEntry.entry = client.createDocument(childrenLink.getHref(), null, docName, null, false, content, cmisType,
cmisContentPath);
} else {
- docEntry.entry = client.createDocument(childrenLink.getHref(), docName, docTemplate);
+ docEntry.entry = client.createDocument(childrenLink.getHref(), null, docName, docTemplate);
}
docEntry.type = CMISConstants.TYPE_DOCUMENT;
folderEntry.children.add(docEntry);
@@ -142,7 +141,7 @@
// do deeper, if required
if (depth > 0) {
String folderName = name + " (child)";
- Entry subFolder = client.createFolder(childrenLink.getHref(), folderName, folderTemplate);
+ Entry subFolder = client.createFolder(childrenLink.getHref(), null, folderName, folderTemplate);
folderEntry.children.add(createTree(entry, subFolder, depth - 1, docCount, folderTemplate, docTemplate));
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/TCKTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/TCKTestSuite.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/TCKTestSuite.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/TCKTestSuite.java Tue Mar 2 17:46:52 2010
@@ -32,6 +32,7 @@
import org.apache.chemistry.tck.atompub.test.spec.MoveTest;
import org.apache.chemistry.tck.atompub.test.spec.QueryPagingTest;
import org.apache.chemistry.tck.atompub.test.spec.QueryTest;
+import org.apache.chemistry.tck.atompub.test.spec.RelationshipsTest;
import org.apache.chemistry.tck.atompub.test.spec.RepositoryServiceTest;
import org.apache.chemistry.tck.atompub.test.spec.TypeDefinitionTest;
import org.apache.chemistry.tck.atompub.test.spec.UpdateTest;
@@ -61,6 +62,7 @@
suite.addTestSuite(QueryPagingTest.class);
suite.addTestSuite(AllowableActionsTest.class);
suite.addTestSuite(VersionsTest.class);
+ suite.addTestSuite(RelationshipsTest.class);
suite.addTestSuite(AccessControlListTest.class);
suite.addTestSuite(ChangeLogTest.class);
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/custom/CMISCustomTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/custom/CMISCustomTypeTest.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/custom/CMISCustomTypeTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/custom/CMISCustomTypeTest.java Tue Mar 2 17:46:52 2010
@@ -53,7 +53,7 @@
Feed children = client.getFeed(childrenLink.getHref());
assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry folder = client.createFolder(children.getSelfLink().getHref(), "testCreateCustomFolder", "custom/createcustomfolder.atomentry.xml");
+ Entry folder = client.createFolder(children.getSelfLink().getHref(), null, "testCreateCustomFolder", "custom/createcustomfolder.atomentry.xml");
Feed feedFolderAfter = client.getFeed(childrenLink.getHref());
int entriesAfter = feedFolderAfter.getEntries().size();
assertEquals(entriesBefore + 1, entriesAfter);
@@ -72,7 +72,7 @@
Feed children = client.getFeed(childrenLink.getHref());
assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateCustomDocument", "custom/createcustomdocument.atomentry.xml");
+ Entry document = client.createDocument(children.getSelfLink().getHref(), null, "testCreateCustomDocument", "custom/createcustomdocument.atomentry.xml");
Feed feedFolderAfter = client.getFeed(childrenLink.getHref());
int entriesAfter = feedFolderAfter.getEntries().size();
assertEquals(entriesBefore + 1, entriesAfter);
@@ -97,7 +97,7 @@
Link childrenLink = client.getChildrenLink(testFolder);
// create document for update
- Entry document = client.createDocument(childrenLink.getHref(), "testUpdatePutCustomDocument", "custom/createcustomdocument.atomentry.xml");
+ Entry document = client.createDocument(childrenLink.getHref(), null, "testUpdatePutCustomDocument", "custom/createcustomdocument.atomentry.xml");
assertNotNull(document);
// update
@@ -137,7 +137,7 @@
int entriesBefore = children.getEntries().size();
// create document for delete
- Entry document = client.createDocument(childrenLink.getHref(), "testDeleteCustomDocument", "custom/createcustomdocument.atomentry.xml");
+ Entry document = client.createDocument(childrenLink.getHref(), null, "testDeleteCustomDocument", "custom/createcustomdocument.atomentry.xml");
Response documentRes = client.executeRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes);
@@ -169,17 +169,17 @@
// create documents to query
// Standard root document
- Entry document1 = client.createDocument(childrenLink.getHref(), "apple1");
+ Entry document1 = client.createDocument(childrenLink.getHref(), null, "apple1");
assertNotNull(document1);
CMISObject document1Object = document1.getExtension(CMISConstants.OBJECT);
assertNotNull(document1Object);
String doc2name = "name" + System.currentTimeMillis();
// Custom documents
- Entry document2 = client.createDocument(childrenLink.getHref(), doc2name, "custom/createcustomdocument.atomentry.xml");
+ Entry document2 = client.createDocument(childrenLink.getHref(), null, doc2name, "custom/createcustomdocument.atomentry.xml");
assertNotNull(document2);
CMISObject document2Object = document2.getExtension(CMISConstants.OBJECT);
assertNotNull(document2Object);
- Entry document3 = client.createDocument(childrenLink.getHref(), "banana1", "custom/createcustomdocument.atomentry.xml");
+ Entry document3 = client.createDocument(childrenLink.getHref(), null, "banana1", "custom/createcustomdocument.atomentry.xml");
assertNotNull(document3);
CMISObject document3Object = document3.getExtension(CMISConstants.OBJECT);
assertNotNull(document3Object);
@@ -247,129 +247,4 @@
}
}
- public void testCreateRelationship() throws Exception {
- Entry testFolder = fixture.getTestCaseFolder();
- Link childrenLink = client.getChildrenLink(testFolder);
- assertNotNull(childrenLink);
- Feed children = client.getFeed(childrenLink.getHref());
- assertNotNull(children);
- Entry source = client.createDocument(children.getSelfLink().getHref(), "testSource", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(source);
- Entry target = client.createDocument(children.getSelfLink().getHref(), "testTarget", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(target);
-
- // retrieve relationships feed on source
- Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
- assertNotNull(relsLink);
- Feed relsBefore = client.getFeed(relsLink.getHref());
- assertNotNull(relsBefore);
- assertEquals(0, relsBefore.getEntries().size());
-
- // create relationship between source and target documents
- CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
- assertNotNull(targetObject);
- String targetId = targetObject.getObjectId().getStringValue();
- assertNotNull(targetId);
- Entry rel = client.createRelationship(relsLink.getHref(), "R:cmiscustom:assoc", targetId);
- assertNotNull(rel);
-
- // check created relationship
- CMISObject sourceObject = source.getExtension(CMISConstants.OBJECT);
- assertNotNull(sourceObject);
- String sourceId = sourceObject.getObjectId().getStringValue();
- assertNotNull(sourceId);
- CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
- assertNotNull(relObject);
- assertEquals("R:cmiscustom:assoc", relObject.getObjectTypeId().getStringValue());
- assertEquals(sourceId, relObject.getSourceId().getStringValue());
- assertEquals(targetId, relObject.getTargetId().getStringValue());
- assertEquals(source.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
- assertEquals(target.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
-
- // check relationships for created item
- Map<String, String> args = new HashMap<String, String>();
- args.put(ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
- Feed relsAfter = client.getFeed(relsLink.getHref(), args);
- assertNotNull(relsAfter);
- assertEquals(1, relsAfter.getEntries().size());
- }
-
- public void testGetRelationship() throws Exception {
- Entry testFolder = fixture.getTestCaseFolder();
- Link childrenLink = client.getChildrenLink(testFolder);
- assertNotNull(childrenLink);
- Feed children = client.getFeed(childrenLink.getHref());
- assertNotNull(children);
- Entry source = client.createDocument(children.getSelfLink().getHref(), "testSource", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(source);
- Entry target = client.createDocument(children.getSelfLink().getHref(), "testTarget", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(target);
-
- // retrieve relationships feed on source
- Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
- assertNotNull(relsLink);
-
- // create relationship between source and target documents
- CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
- assertNotNull(targetObject);
- String targetId = targetObject.getObjectId().getStringValue();
- assertNotNull(targetId);
- Entry rel = client.createRelationship(relsLink.getHref(), "R:cmiscustom:assoc", targetId);
- assertNotNull(rel);
-
- // get created relationship
- Entry relEntry = client.getEntry(rel.getSelfLink().getHref());
- CMISObject relEntryObject = rel.getExtension(CMISConstants.OBJECT);
- CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
- assertNotNull(relObject);
- assertEquals(relObject.getObjectTypeId().getStringValue(), relEntryObject.getObjectTypeId().getStringValue());
- assertEquals(relObject.getSourceId().getStringValue(), relEntryObject.getSourceId().getStringValue());
- assertEquals(relObject.getTargetId().getStringValue(), relEntryObject.getTargetId().getStringValue());
- assertEquals(source.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
- assertEquals(target.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
- }
-
- public void testDeleteRelationship() throws Exception {
- Entry testFolder = fixture.getTestCaseFolder();
- Link childrenLink = client.getChildrenLink(testFolder);
- assertNotNull(childrenLink);
- Feed children = client.getFeed(childrenLink.getHref());
- assertNotNull(children);
- Entry source = client.createDocument(children.getSelfLink().getHref(), "testSource", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(source);
- Entry target = client.createDocument(children.getSelfLink().getHref(), "testTarget", "custom/createcustomdocument.atomentry.xml");
- assertNotNull(target);
-
- // retrieve relationships feed on source
- Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
- assertNotNull(relsLink);
- Feed relsBefore = client.getFeed(relsLink.getHref());
- assertNotNull(relsBefore);
- assertEquals(0, relsBefore.getEntries().size());
-
- // create relationship between source and target documents
- CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
- assertNotNull(targetObject);
- String targetId = targetObject.getObjectId().getStringValue();
- assertNotNull(targetId);
- Entry rel = client.createRelationship(relsLink.getHref(), "R:cmiscustom:assoc", targetId);
- assertNotNull(rel);
-
- // check relationships for created item
- Map<String, String> args = new HashMap<String, String>();
- args.put(ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
- Feed relsAfterCreate = client.getFeed(relsLink.getHref(), args);
- assertNotNull(relsAfterCreate);
- assertEquals(1, relsAfterCreate.getEntries().size());
-
- // delete relationship
- Response deleteRes = client.executeRequest(new DeleteRequest(rel.getSelfLink().getHref().toString()), 204);
- assertNotNull(deleteRes);
-
- // check relationships for deleted item
- Feed relsAfterDelete = client.getFeed(relsLink.getHref(), args);
- assertNotNull(relsAfterDelete);
- assertEquals(0, relsAfterDelete.getEntries().size());
- }
-
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java Tue Mar 2 17:46:52 2010
@@ -40,7 +40,7 @@
Feed children = client.getFeed(childrenLink.getHref());
Assert.assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry folder = client.createFolder(children.getSelfLink().getHref(), "testCreateFolder");
+ Entry folder = client.createFolder(children.getSelfLink().getHref(), null, "testCreateFolder");
Feed feedFolderAfter = client.getFeed(childrenLink.getHref());
int entriesAfter = feedFolderAfter.getEntries().size();
Assert.assertEquals(entriesBefore +1, entriesAfter);
@@ -57,7 +57,7 @@
Feed children = client.getFeed(childrenLink.getHref());
Assert.assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateDocumentCMISContent", "createdocumentBase64.cmisatomentry.xml");
+ Entry document = client.createDocument(children.getSelfLink().getHref(), null, "testCreateDocumentCMISContent", "createdocumentBase64.cmisatomentry.xml");
Response documentContentRes = client.executeRequest(new GetRequest(document.getContentSrc().toString()), 200);
String resContent = documentContentRes.getContentAsString();
Assert.assertEquals(document.getTitle(), resContent);
@@ -77,7 +77,7 @@
Feed children = client.getFeed(childrenLink.getHref());
Assert.assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateDocumentAtomContent");
+ Entry document = client.createDocument(children.getSelfLink().getHref(), null, "testCreateDocumentAtomContent");
Response documentContentRes = client.executeRequest(new GetRequest(document.getContentSrc().toString()), 200);
String resContent = documentContentRes.getContentAsString();
Assert.assertEquals(document.getTitle(), resContent);
@@ -97,7 +97,7 @@
Feed children = client.getFeed(childrenLink.getHref());
Assert.assertNotNull(children);
int entriesBefore = children.getEntries().size();
- Entry document = client.createDocument(children.getSelfLink().getHref(), "Iñtërnâtiônà lizætiøn - 1.html", "createatomentry.atomentry.xml");
+ Entry document = client.createDocument(children.getSelfLink().getHref(), null, "Iñtërnâtiônà lizætiøn - 1.html", "createatomentry.atomentry.xml");
Response documentContentRes = client.executeRequest(new GetRequest(document.getContentSrc().toString()), 200);
String resContent = documentContentRes.getContentAsString();
Assert.assertEquals(document.getTitle(), resContent);
Added: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java?rev=918127&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java Tue Mar 2 17:46:52 2010
@@ -0,0 +1,209 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Authors:
+ * David Caruana, Alfresco
+ * Gabriele Columbro, Alfresco
+ */
+package org.apache.chemistry.tck.atompub.test.spec;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Feed;
+import org.apache.abdera.model.Link;
+import org.apache.chemistry.abdera.ext.CMISConstants;
+import org.apache.chemistry.abdera.ext.CMISObject;
+import org.apache.chemistry.abdera.ext.CMISTypeDefinition;
+import org.apache.chemistry.abdera.ext.CMISUriTemplate;
+import org.apache.chemistry.tck.atompub.TCKSkipCapabilityException;
+import org.apache.chemistry.tck.atompub.TCKTest;
+import org.apache.chemistry.tck.atompub.http.DeleteRequest;
+import org.apache.chemistry.tck.atompub.http.Response;
+import org.junit.Assert;
+
+
+/**
+ * Type Definition Tests
+ *
+ */
+public class RelationshipsTest extends TCKTest {
+
+ public static final String ARG_INCLUDE_SUB_RELATIONSHIP_TYPES = "includeSubRelationshipTypes";
+
+
+ @Override
+ public void setUp() {
+ super.setUp();
+
+ try {
+ // ensure relationships are supported by CMIS provider
+ boolean relSupported = false;
+ IRI typesHREF = client.getTypesChildrenCollection(client.getWorkspace());
+ Feed types = client.getFeed(typesHREF);
+ Assert.assertNotNull(types);
+ for (Entry type : types.getEntries()) {
+ CMISTypeDefinition typeDef = type.getExtension(CMISConstants.TYPE_DEFINITION);
+ if (typeDef.getId().equals(CMISConstants.TYPE_RELATIONSHIP)) {
+ relSupported = true;
+ break;
+ }
+ }
+ if (!relSupported) {
+ throw new TCKSkipCapabilityException("relationships", "cmis:relationship type", "none");
+ }
+
+ // ensure specified relationship exists and is creatable
+ CMISUriTemplate typeByIdTemplate = client.getTypeByIdUriTemplate(client.getWorkspace());
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("id", options.getRelationshipType());
+ IRI typeByIdRequest = typeByIdTemplate.generateUri(variables);
+ Entry typeById = client.getEntry(typeByIdRequest);
+ CMISTypeDefinition relType = typeById.getExtension(CMISConstants.TYPE_DEFINITION);
+ assertNotNull(relType);
+ assertTrue(relType.getCreatable());
+ }
+ catch(Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+
+ public void testCreateRelationship() throws Exception {
+ Entry testFolder = fixture.getTestCaseFolder();
+ Link childrenLink = client.getChildrenLink(testFolder);
+ assertNotNull(childrenLink);
+ Feed children = client.getFeed(childrenLink.getHref());
+ assertNotNull(children);
+ Entry source = client.createDocument(children.getSelfLink().getHref(), null, "testSource");
+ assertNotNull(source);
+ Entry target = client.createDocument(children.getSelfLink().getHref(), null, "testTarget");
+ assertNotNull(target);
+
+ // retrieve relationships feed on source
+ Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
+ assertNotNull(relsLink);
+ Feed relsBefore = client.getFeed(relsLink.getHref());
+ assertNotNull(relsBefore);
+ assertEquals(0, relsBefore.getEntries().size());
+
+ // create relationship between source and target documents
+ CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
+ assertNotNull(targetObject);
+ String targetId = targetObject.getObjectId().getStringValue();
+ assertNotNull(targetId);
+ Entry rel = client.createRelationship(relsLink.getHref(), options.getRelationshipType(), targetId);
+ assertNotNull(rel);
+
+ // check created relationship
+ CMISObject sourceObject = source.getExtension(CMISConstants.OBJECT);
+ assertNotNull(sourceObject);
+ String sourceId = sourceObject.getObjectId().getStringValue();
+ assertNotNull(sourceId);
+ CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
+ assertNotNull(relObject);
+ assertEquals(options.getRelationshipType(), relObject.getObjectTypeId().getStringValue());
+ assertEquals(sourceId, relObject.getSourceId().getStringValue());
+ assertEquals(targetId, relObject.getTargetId().getStringValue());
+ assertEquals(source.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
+ assertEquals(target.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
+
+ // check relationships for created item
+ Map<String, String> args = new HashMap<String, String>();
+ args.put(ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
+ Feed relsAfter = client.getFeed(relsLink.getHref(), args);
+ assertNotNull(relsAfter);
+ assertEquals(1, relsAfter.getEntries().size());
+ }
+
+ public void testGetRelationship() throws Exception {
+ Entry testFolder = fixture.getTestCaseFolder();
+ Link childrenLink = client.getChildrenLink(testFolder);
+ assertNotNull(childrenLink);
+ Feed children = client.getFeed(childrenLink.getHref());
+ assertNotNull(children);
+ Entry source = client.createDocument(children.getSelfLink().getHref(), null, "testSource");
+ assertNotNull(source);
+ Entry target = client.createDocument(children.getSelfLink().getHref(), null, "testTarget");
+ assertNotNull(target);
+
+ // retrieve relationships feed on source
+ Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
+ assertNotNull(relsLink);
+
+ // create relationship between source and target documents
+ CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
+ assertNotNull(targetObject);
+ String targetId = targetObject.getObjectId().getStringValue();
+ assertNotNull(targetId);
+ Entry rel = client.createRelationship(relsLink.getHref(), options.getRelationshipType(), targetId);
+ assertNotNull(rel);
+
+ // get created relationship
+ Entry relEntry = client.getEntry(rel.getSelfLink().getHref());
+ CMISObject relEntryObject = rel.getExtension(CMISConstants.OBJECT);
+ CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
+ assertNotNull(relObject);
+ assertEquals(relObject.getObjectTypeId().getStringValue(), relEntryObject.getObjectTypeId().getStringValue());
+ assertEquals(relObject.getSourceId().getStringValue(), relEntryObject.getSourceId().getStringValue());
+ assertEquals(relObject.getTargetId().getStringValue(), relEntryObject.getTargetId().getStringValue());
+ assertEquals(source.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
+ assertEquals(target.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
+ }
+
+ public void testDeleteRelationship() throws Exception {
+ Entry testFolder = fixture.getTestCaseFolder();
+ Link childrenLink = client.getChildrenLink(testFolder);
+ assertNotNull(childrenLink);
+ Feed children = client.getFeed(childrenLink.getHref());
+ assertNotNull(children);
+ Entry source = client.createDocument(children.getSelfLink().getHref(), null, "testSource");
+ assertNotNull(source);
+ Entry target = client.createDocument(children.getSelfLink().getHref(), null, "testTarget");
+ assertNotNull(target);
+
+ // retrieve relationships feed on source
+ Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
+ assertNotNull(relsLink);
+ Feed relsBefore = client.getFeed(relsLink.getHref());
+ assertNotNull(relsBefore);
+ assertEquals(0, relsBefore.getEntries().size());
+
+ // create relationship between source and target documents
+ CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
+ assertNotNull(targetObject);
+ String targetId = targetObject.getObjectId().getStringValue();
+ assertNotNull(targetId);
+ Entry rel = client.createRelationship(relsLink.getHref(), options.getRelationshipType(), targetId);
+ assertNotNull(rel);
+
+ // check relationships for created item
+ Map<String, String> args = new HashMap<String, String>();
+ args.put(ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
+ Feed relsAfterCreate = client.getFeed(relsLink.getHref(), args);
+ assertNotNull(relsAfterCreate);
+ assertEquals(1, relsAfterCreate.getEntries().size());
+
+ // delete relationship
+ Response deleteRes = client.executeRequest(new DeleteRequest(rel.getSelfLink().getHref().toString()), 204);
+ assertNotNull(deleteRes);
+
+ // check relationships for deleted item
+ Feed relsAfterDelete = client.getFeed(relsLink.getHref(), args);
+ assertNotNull(relsAfterDelete);
+ assertEquals(0, relsAfterDelete.getEntries().size());
+ }
+
+}
Propchange: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/RelationshipsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java Tue Mar 2 17:46:52 2010
@@ -41,7 +41,7 @@
Entry document = fixture.createTestDocument("testUpdatePutCMISContent");
String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
if (mimetype != null) {
- Assert.assertEquals("text/html", mimetype);
+ Assert.assertEquals("text/plain", mimetype);
}
// TODO: check for content update allowable action
@@ -76,7 +76,7 @@
Entry document = fixture.createTestDocument("testUpdatePutAtomContent");
String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
if (mimetype != null) {
- Assert.assertEquals("text/html", mimetype);
+ Assert.assertEquals("text/plain", mimetype);
}
// TODO: check for content update allowable action
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml Tue Mar 2 17:46:52 2010
@@ -5,11 +5,11 @@
<updated>2009-01-01T00:00:00Z</updated>
<author>admin</author>
<summary>${NAME} (summary)</summary>
- <content type="text/html">${CONTENT}</content>
+ <content type="${CONTENTTYPE}">${CONTENT}</content>
<cmisra:object>
<cmis:properties>
<cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
- <cmis:value>cmis:document</cmis:value>
+ <cmis:value>${TYPE}</cmis:value>
</cmis:propertyId>
</cmis:properties>
</cmisra:object>
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml Tue Mar 2 17:46:52 2010
@@ -2,7 +2,7 @@
<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
<title>${NAME}</title>
<summary>${NAME} (summary)</summary>
- <content type="text/plain">
+ <content type="${CONTENTTYPE}">
VGhpcyBtZXRob2QgZm9sbG93cyB0aGUgQXRvbSBQdWJsaXNoaW5nIG1vZGVsIHdoZXJlIHRoZSBl
bnRyeSBkb2N1bWVudCwgYXRvbSBvciBjbWlzLCBpcyBwb3N0ZWQgdG8gdGhlIHJvb3Qgb3Igc3Bl
Y2lmaWMgZm9sZGVyIFVSSS4gIEZvciB1bmZpbGVkIGRvY3VtZW50cywgcG9zdCB0aGUgZG9jdW1l
@@ -16,7 +16,7 @@
<cmisra:object>
<cmis:properties>
<cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
- <cmis:value>cmis:document</cmis:value>
+ <cmis:value>${TYPE}</cmis:value>
</cmis:propertyId>
</cmis:properties>
</cmisra:object>
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml Tue Mar 2 17:46:52 2010
@@ -7,13 +7,13 @@
<summary>${NAME} (summary)</summary>
<content type="text">Must be ignored - overridden by cmisra:content</content>
<cmisra:content>
- <cmisra:mediatype>${CMISTYPE}</cmisra:mediatype>
+ <cmisra:mediatype>${CONTENTTYPE}</cmisra:mediatype>
<cmisra:base64>${CMISCONTENT}</cmisra:base64>
</cmisra:content>
<cmisra:object>
<cmis:properties>
<cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
- <cmis:value>cmis:document</cmis:value>
+ <cmis:value>${TYPE}</cmis:value>
</cmis:propertyId>
</cmis:properties>
</cmisra:object>
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml Tue Mar 2 17:46:52 2010
@@ -7,7 +7,7 @@
<cmisra:object>
<cmis:properties>
<cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
- <cmis:value>cmis:document</cmis:value>
+ <cmis:value>${TYPE}</cmis:value>
</cmis:propertyId>
</cmis:properties>
</cmisra:object>
Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml?rev=918127&r1=918126&r2=918127&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml Tue Mar 2 17:46:52 2010
@@ -9,7 +9,7 @@
<cmisra:object>
<cmis:properties>
<cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
- <cmis:value>cmis:folder</cmis:value>
+ <cmis:value>${TYPE}</cmis:value>
</cmis:propertyId>
</cmis:properties>
</cmisra:object>