svn commit: r1063239 - in /incubator/chemistry/opencmis-browser-binding/trunk: pom.xml src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java

[fmui]

Author: fmui
Date: Tue Jan 25 11:48:39 2011
New Revision: 1063239

URL: http://svn.apache.org/viewvc?rev=1063239&view=rev
Log:
- bumped it up to OpenCMIS 0.3
- fixed a few enum rendering issues

Modified:
    incubator/chemistry/opencmis-browser-binding/trunk/pom.xml
    
incubator/chemistry/opencmis-browser-binding/trunk/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java

Modified: incubator/chemistry/opencmis-browser-binding/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/opencmis-browser-binding/trunk/pom.xml?rev=1063239&r1=1063238&r2=1063239&view=diff
==============================================================================
--- incubator/chemistry/opencmis-browser-binding/trunk/pom.xml (original)
+++ incubator/chemistry/opencmis-browser-binding/trunk/pom.xml Tue Jan 25 
11:48:39 2011
@@ -19,7 +19,7 @@
     </parent>
 
     <groupId>org.apache.chemistry.opencmis</groupId>
-    <version>0.1.0-incubating-SNAPSHOT</version>
+    <version>0.3.0-incubating-SNAPSHOT</version>
     <artifactId>chemistry-opencmis-binding-browser</artifactId>
     <name>OpenCMIS Browser Binding</name>
     <packaging>war</packaging>
@@ -74,24 +74,24 @@
         <dependency>
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-server-inmemory</artifactId>
-            <version>0.2.0-incubating-SNAPSHOT</version>
+            <version>0.3.0-incubating-SNAPSHOT</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-server-bindings</artifactId>
-            <version>0.2.0-incubating-SNAPSHOT</version>
+            <version>0.3.0-incubating-SNAPSHOT</version>
             <classifier>classes</classifier> 
         </dependency>
         <dependency>
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-commons-api</artifactId>
-            <version>0.2.0-incubating-SNAPSHOT</version>
+            <version>0.3.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.chemistry.opencmis</groupId>
             <artifactId>chemistry-opencmis-commons-impl</artifactId>
-            <version>0.2.0-incubating-SNAPSHOT</version>
+            <version>0.3.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>

Modified: 
incubator/chemistry/opencmis-browser-binding/trunk/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/opencmis-browser-binding/trunk/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java?rev=1063239&r1=1063238&r2=1063239&view=diff
==============================================================================
--- 
incubator/chemistry/opencmis-browser-binding/trunk/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java
 (original)
+++ 
incubator/chemistry/opencmis-browser-binding/trunk/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/json/JSONConverter.java
 Tue Jan 25 11:48:39 2011
@@ -130,9 +130,9 @@ public class JSONConverter extends JSONC
         JSONObject result = new JSONObject();
 
         result.put(JSON_CAP_CONTENT_STREAM_UPDATES,
-                
getJSONStringValue(capabilities.getContentStreamUpdatesCapability()));
-        result.put(JSON_CAP_CHANGES, 
getJSONStringValue(capabilities.getChangesCapability()));
-        result.put(JSON_CAP_RENDITIONS, 
getJSONStringValue(capabilities.getRenditionsCapability()));
+                
getJSONStringValue(capabilities.getContentStreamUpdatesCapability().value()));
+        result.put(JSON_CAP_CHANGES, 
getJSONStringValue(capabilities.getChangesCapability().value()));
+        result.put(JSON_CAP_RENDITIONS, 
getJSONStringValue(capabilities.getRenditionsCapability().value()));
         result.put(JSON_CAP_GET_DESCENDANTS, 
capabilities.isGetDescendantsSupported());
         result.put(JSON_CAP_GET_FOLDER_TREE, 
capabilities.isGetFolderTreeSupported());
         result.put(JSON_CAP_MULTIFILING, 
capabilities.isMultifilingSupported());
@@ -141,9 +141,9 @@ public class JSONConverter extends JSONC
         result.put(JSON_CAP_PWC_SEARCHABLE, 
capabilities.isPwcSearchableSupported());
         result.put(JSON_CAP_PWC_UPDATABLE, 
capabilities.isPwcUpdatableSupported());
         result.put(JSON_CAP_ALL_VERSIONS_SEARCHABLE, 
capabilities.isAllVersionsSearchableSupported());
-        result.put(JSON_CAP_QUERY, 
getJSONStringValue(capabilities.getQueryCapability()));
-        result.put(JSON_CAP_JOIN, 
getJSONStringValue(capabilities.getJoinCapability()));
-        result.put(JSON_CAP_ACL, 
getJSONStringValue(capabilities.getAclCapability()));
+        result.put(JSON_CAP_QUERY, 
getJSONStringValue(capabilities.getQueryCapability().value()));
+        result.put(JSON_CAP_JOIN, 
getJSONStringValue(capabilities.getJoinCapability().value()));
+        result.put(JSON_CAP_ACL, 
getJSONStringValue(capabilities.getAclCapability().value()));
 
         return result;
     }
@@ -159,8 +159,8 @@ public class JSONConverter extends JSONC
 
         JSONObject result = new JSONObject();
 
-        result.put(JSON_ACLCAP_SUPPORTED_PERMISSIONS, 
getJSONStringValue(capabilities.getSupportedPermissions()));
-        result.put(JSON_ACLCAP_ACL_PROPAGATION, 
getJSONStringValue(capabilities.getAclPropagation()));
+        result.put(JSON_ACLCAP_SUPPORTED_PERMISSIONS, 
getJSONStringValue(capabilities.getSupportedPermissions().value()));
+        result.put(JSON_ACLCAP_ACL_PROPAGATION, 
getJSONStringValue(capabilities.getAclPropagation().value()));
 
         // permissions
         if (capabilities.getPermissions() != null) {
@@ -256,7 +256,7 @@ public class JSONConverter extends JSONC
             JSONObject changeEventInfo = new JSONObject();
 
             ChangeEventInfo cei = object.getChangeEventInfo();
-            changeEventInfo.put(JSON_CHANGE_EVENT_TYPE, 
getJSONStringValue(cei.getChangeType()));
+            changeEventInfo.put(JSON_CHANGE_EVENT_TYPE, 
getJSONStringValue(cei.getChangeType().value()));
             changeEventInfo.put(JSON_CHANGE_EVENT_TIME, 
getJSONValue(cei.getChangeTime()));
 
             result.put(JSON_OBJECT_CHANGE_EVENT_INFO, changeEventInfo);