Author: jens
Date: Wed Jun 12 06:54:32 2013
New Revision: 1492081
URL: http://svn.apache.org/r1492081
Log:
InMemory fix bug: Ensure generation of query names according to spec [CMIS-668]
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryItemTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemorySecondaryTypeDefinition.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/TypeUtil.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -95,7 +95,7 @@ public class InMemoryDocumentTypeDefinit
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(true);
setIsControllablePolicy(false);
setIsCreatable(true);
@@ -117,4 +117,5 @@ public class InMemoryDocumentTypeDefinit
setContentStreamAllowed(ContentStreamAllowed.ALLOWED);
setIsVersionable(false);
}
+
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -90,7 +90,7 @@ public class InMemoryFolderTypeDefinitio
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(true);
setIsControllablePolicy(false);
setIsCreatable(true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryItemTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryItemTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryItemTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryItemTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -89,7 +89,7 @@ public class InMemoryItemTypeDefinition
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(true);
setIsControllablePolicy(false);
setIsCreatable(true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -90,7 +90,7 @@ public class InMemoryPolicyTypeDefinitio
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(false);
setIsControllablePolicy(false);
setIsCreatable(true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -92,7 +92,7 @@ public class InMemoryRelationshipTypeDef
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(false);
setIsControllablePolicy(false);
setIsCreatable(true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemorySecondaryTypeDefinition.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemorySecondaryTypeDefinition.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemorySecondaryTypeDefinition.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemorySecondaryTypeDefinition.java
Wed Jun 12 06:54:32 2013
@@ -86,7 +86,7 @@ public class InMemorySecondaryTypeDefini
setDescription("Description of " + getDisplayName() + " Type");
setLocalName(id);
setLocalNamespace(null);
- setQueryName(id);
+ setQueryName(TypeUtil.getQueryNameFromId(id));
setIsControllableAcl(true);
setIsControllablePolicy(false);
setIsCreatable(false);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/TypeUtil.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/TypeUtil.java?rev=1492081&r1=1492080&r2=1492081&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/TypeUtil.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/TypeUtil.java
Wed Jun 12 06:54:32 2013
@@ -176,6 +176,20 @@ public final class TypeUtil {
td.initialize(td);
return null;
}
+
+ public static String getQueryNameFromId(String id) {
+ StringBuffer sb = new StringBuffer(id.length());
+ for (int i = 0; i < id.length(); i++) {
+ char c = id.charAt(i);
+ if (c == '.' || c == ' ' || c == ',' || c == '\'' || c
== '"'
+ || c == '\\' || c == '(' || c == ')') {
+ sb.append('_');
+ } else {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
private static void
initializeAbstractPropertyDefinition(PropertyDefinition<?> pdSrc,
AbstractPropertyDefinition<?> pdTarget) {
pdTarget.setCardinality(pdSrc.getCardinality());
