chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1236061 - in /chemistry/opencmis/trunk: chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/ chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apa...
Date Thu, 26 Jan 2012 07:57:31 GMT
Author: fmui
Date: Thu Jan 26 07:57:30 2012
New Revision: 1236061

URL: http://svn.apache.org/viewvc?rev=1236061&view=rev
Log:
renamed clientToken to callback

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Constants.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createdocument.html
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createfolder.html
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/demo.html

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Constants.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Constants.java?rev=1236061&r1=1236060&r2=1236061&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Constants.java
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Constants.java
Thu Jan 26 07:57:30 2012
@@ -203,7 +203,7 @@ public final class Constants {
 
     public static final String PARAM_SELECTOR = "cmisselector";
     public static final String PARAM_TRANSACTION = "transaction";
-    public static final String PARAM_CLIENT_TOKEN = "clientToken";
+    public static final String PARAM_CALLBACK = "callback";
     public static final String PARAM_SUPPRESS_RESPONSE_CODES = "suppressResponseCodes";
 
     // rendition filter

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java?rev=1236061&r1=1236060&r2=1236061&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
Thu Jan 26 07:57:30 2012
@@ -454,17 +454,17 @@ public class BrowserBindingUtils {
         response.setContentType(JSON_MIME_TYPE);
         response.setCharacterEncoding("UTF-8");
 
-        String clientToken = getStringParameter(request, Constants.PARAM_CLIENT_TOKEN);
-        if (clientToken != null) {
-            if (!clientToken.matches("[A-Za-z0-9._\\[\\]]*")) {
-                throw new CmisInvalidArgumentException("Invalid clientToken name!");
+        String callback = getStringParameter(request, Constants.PARAM_CALLBACK);
+        if (callback != null) {
+            if (!callback.matches("[A-Za-z0-9._\\[\\]]*")) {
+                throw new CmisInvalidArgumentException("Invalid callback name!");
             }
-            response.getWriter().print(clientToken + "(");
+            response.getWriter().print(callback + "(");
         }
 
         json.writeJSONString(response.getWriter());
 
-        if (clientToken != null) {
+        if (callback != null) {
             response.getWriter().print(");");
         }
 

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createdocument.html
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createdocument.html?rev=1236061&r1=1236060&r2=1236061&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createdocument.html
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createdocument.html
Thu Jan 26 07:57:30 2012
@@ -69,7 +69,7 @@ function createDocumentCallback() {
         document.getElementById('info').innerHTML = 'Transaction: ' + lastTransaction
 
         var script1 = document.createElement("script");
-        script1.setAttribute("src", repositoryUrl + "?cmisselector=lastResult&clientToken=showNewDocumentId&transaction="+lastTransaction);
+        script1.setAttribute("src", repositoryUrl + "?cmisselector=lastResult&callback=showNewDocumentId&transaction="+lastTransaction);
         script1.setAttribute("type","text/javascript");                
         document.body.appendChild(script1);
     }
@@ -130,6 +130,6 @@ function showNewDocumentId(result) {
 <div id="info"></div>
 <iframe name="result" style="border:2px;width:800px;height:400px;" onload="createDocumentCallback()"></iframe>
 
-<script type="text/javascript" src="../browser?clientToken=loadRepositoryInfos"></script>
+<script type="text/javascript" src="../browser?callback=loadRepositoryInfos"></script>
 </body>
 </html>
\ No newline at end of file

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createfolder.html
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createfolder.html?rev=1236061&r1=1236060&r2=1236061&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createfolder.html
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/createfolder.html
Thu Jan 26 07:57:30 2012
@@ -68,7 +68,7 @@ function createFolderCallback() {
         document.getElementById('info').innerHTML = 'Transaction: ' + lastTransaction
 
         var script1 = document.createElement("script");
-        script1.setAttribute("src", repositoryUrl + "?cmisselector=lastResult&clientToken=showNewFolderId&transaction="+lastTransaction);
+        script1.setAttribute("src", repositoryUrl + "?cmisselector=lastResult&callback=showNewFolderId&transaction="+lastTransaction);
         script1.setAttribute("type","text/javascript");                
         document.body.appendChild(script1);
     }
@@ -117,6 +117,6 @@ function showNewFolderId(result) {
 <div id="info"></div>
 <iframe name="result" style="border:2px;width:800px;height:400px;" onload="createFolderCallback()"></iframe>
 
-<script type="text/javascript" src="../browser?clientToken=loadRepositoryInfos"></script>
+<script type="text/javascript" src="../browser?callback=loadRepositoryInfos"></script>
 </body>
 </html>
\ No newline at end of file

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/demo.html
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/demo.html?rev=1236061&r1=1236060&r2=1236061&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/demo.html
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/webapp/web/demo.html
Thu Jan 26 07:57:30 2012
@@ -64,17 +64,17 @@ function printRepositoryInfos(infos) {
     document.getElementById('queryForm').action = repositoryUrl;
 	
     var script1 = document.createElement("script");        
-    script1.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=object&clientToken=printObject");
+    script1.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=object&callback=printObject");
     script1.setAttribute("type","text/javascript");                
     document.body.appendChild(script1);
 
     var script2 = document.createElement("script");        
-    script2.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=children&clientToken=printChildren");
+    script2.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=children&callback=printChildren");
     script2.setAttribute("type","text/javascript");                
     document.body.appendChild(script2);
 
     var script3 = document.createElement("script");        
-    script3.setAttribute("src", repositoryUrl + "?cmisselector=typeChildren&clientToken=printTypes");
+    script3.setAttribute("src", repositoryUrl + "?cmisselector=typeChildren&callback=printTypes");
     script3.setAttribute("type","text/javascript");                
     document.body.appendChild(script3);
 }
@@ -187,7 +187,7 @@ function printTypes(types) {
 
 function reloadChildren() {
     var reloadScript = document.createElement("script");        
-    reloadScript.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=children&clientToken=printChildren");
+    reloadScript.setAttribute("src", rootFolderUrl + rootFolder + "?cmisselector=children&callback=printChildren");
     reloadScript.setAttribute("type","text/javascript");                
     document.body.appendChild(reloadScript);
 }
@@ -228,6 +228,6 @@ function deleteFolder(id) {
 </form>
 </div>
 
-<script type="text/javascript" src="../browser?clientToken=printRepositoryInfos"></script>
+<script type="text/javascript" src="../browser?callback=printRepositoryInfos"></script>
 </body>
 </html>
\ No newline at end of file



Mime
View raw message