Author: fguillaume
Date: Mon Aug 3 00:06:38 2009
New Revision: 800169
URL: http://svn.apache.org/viewvc?rev=800169&view=rev
Log:
CMIS-44: remove constrained root folder name
Modified:
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
Modified:
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java?rev=800169&r1=800168&r2=800169&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
Mon Aug 3 00:06:38 2009
@@ -40,11 +40,10 @@
public abstract class BaseRepository implements Repository, RepositoryInfo,
RepositoryCapabilities {
- // from the spec
- public static final String ROOT_FOLDER_NAME = "CMIS_Root_Folder";
-
public static final String ROOT_TYPE_ID = "chemistry:root";
+ public static final String ROOT_FOLDER_NAME = "";
+
public static final SimpleType ROOT_TYPE = new SimpleType(ROOT_TYPE_ID,
BaseType.FOLDER.getId(), ROOT_TYPE_ID, null, ROOT_TYPE_ID,
"Root Folder Type", BaseType.FOLDER, "", false, false, false,
Modified:
incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java?rev=800169&r1=800168&r2=800169&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
Mon Aug 3 00:06:38 2009
@@ -133,7 +133,7 @@
Folder root = conn.getRootFolder();
assertNotNull(root);
assertEquals(repo.getRootFolderId().getId(), root.getId());
- assertEquals("CMIS_Root_Folder", root.getName());
+ assertEquals("", root.getName());
assertEquals(0, root.getChildren().size());
assertNull(root.getParent());
}
@@ -253,7 +253,7 @@
res = conn.query("SELECT * FROM doc", false);
assertEquals(1, res.size());
res = conn.query(
- "SELECT * FROM cmis:folder WHERE cmis:Name =
'CMIS_Root_Folder'",
+ "SELECT * FROM cmis:folder WHERE cmis:Name = ''",
false);
assertEquals(1, res.size());
res = conn.query("SELECT * FROM doc WHERE cmis:ObjectId = 'nosuchid'",
Modified:
incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java?rev=800169&r1=800168&r2=800169&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
Mon Aug 3 00:06:38 2009
@@ -50,6 +50,8 @@
public static final String ROOT_TYPE_ID = "chemistry:root"; // not in spec
+ public static final String ROOT_FOLDER_NAME = ""; // not in spec
+
public Repository repository;
public Connection conn;
@@ -108,7 +110,7 @@
assertNotNull(rootType);
assertEquals(ROOT_TYPE_ID, rootType.getId());
assertEquals(ROOT_TYPE_ID, root.getTypeId());
- assertEquals("CMIS_Root_Folder", root.getName()); // from the spec
+ assertEquals(ROOT_FOLDER_NAME, root.getName());
assertEquals(null, root.getParent());
Map<String, Property> props = root.getProperties();
assertNotNull(props);