You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2011/03/23 21:58:35 UTC
svn commit: r1084737 - in /chemistry/dotcmis/trunk: ./ DotCMIS/
DotCMIS/binding/ DotCMIS/binding/atompub/ DotCMIS/binding/webservices/
DotCMIS/client/ DotCMIS/data/ DotCMISUnitTest/
Author: fmui
Date: Wed Mar 23 20:58:33 2011
New Revision: 1084737
URL: http://svn.apache.org/viewvc?rev=1084737&view=rev
Log:
- made tracing configurable
- optimized link cache
- cleaned up code
- updated README
Modified:
chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-linkcache.cs
chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs
chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-writer.cs
chemistry/dotcmis/trunk/DotCMIS/binding/binding-caches.cs
chemistry/dotcmis/trunk/DotCMIS/binding/binding-intf.cs
chemistry/dotcmis/trunk/DotCMIS/binding/http.cs
chemistry/dotcmis/trunk/DotCMIS/binding/services.cs
chemistry/dotcmis/trunk/DotCMIS/binding/webservices/webservices.cs
chemistry/dotcmis/trunk/DotCMIS/client/client-caches.cs
chemistry/dotcmis/trunk/DotCMIS/client/client-intf.cs
chemistry/dotcmis/trunk/DotCMIS/client/client-types.cs
chemistry/dotcmis/trunk/DotCMIS/client/client-utils.cs
chemistry/dotcmis/trunk/DotCMIS/const.cs
chemistry/dotcmis/trunk/DotCMIS/data/data-intf.cs
chemistry/dotcmis/trunk/DotCMIS/data/extensions.cs
chemistry/dotcmis/trunk/DotCMIS/enums.cs
chemistry/dotcmis/trunk/DotCMIS/exceptions.cs
chemistry/dotcmis/trunk/DotCMIS/util.cs
chemistry/dotcmis/trunk/DotCMISUnitTest/SmokeTest.cs
chemistry/dotcmis/trunk/README
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-linkcache.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-linkcache.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-linkcache.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-linkcache.cs Wed Mar 23 20:58:33 2011
@@ -18,15 +18,31 @@
*/
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Text;
-using DotCMIS.Binding.Impl;
using System.Web;
+using DotCMIS.Binding.Impl;
namespace DotCMIS.Binding.AtomPub
{
internal class LinkCache
{
+ private static HashSet<string> KnownLinks = new HashSet<string>();
+
+ static LinkCache()
+ {
+ KnownLinks.Add(AtomPubConstants.RelACL);
+ KnownLinks.Add(AtomPubConstants.RelDown);
+ KnownLinks.Add(AtomPubConstants.RelUp);
+ KnownLinks.Add(AtomPubConstants.RelFolderTree);
+ KnownLinks.Add(AtomPubConstants.RelRelationships);
+ KnownLinks.Add(AtomPubConstants.RelSelf);
+ KnownLinks.Add(AtomPubConstants.RelAllowableActions);
+ KnownLinks.Add(AtomPubConstants.RelEditMedia);
+ KnownLinks.Add(AtomPubConstants.RelPolicies);
+ KnownLinks.Add(AtomPubConstants.RelVersionHistory);
+ KnownLinks.Add(AtomPubConstants.LinkRelContent);
+ }
+
private const int CacheSizeRepositories = 10;
private const int CacheSizeTypes = 100;
private const int CacheSizeLinks = 400;
@@ -98,7 +114,10 @@ namespace DotCMIS.Binding.AtomPub
public void AddLink(string repositoryId, string id, string rel, string type, string link)
{
- linkCache.Put(new string[] { repositoryId, id, rel, type }, link);
+ if (KnownLinks.Contains(rel))
+ {
+ linkCache.Put(new string[] { repositoryId, id, rel, type }, link);
+ }
}
public void RemoveLinks(string repositoryId, string id)
@@ -135,7 +154,10 @@ namespace DotCMIS.Binding.AtomPub
public void AddTypeLink(string repositoryId, string id, string rel, string type, string link)
{
- typeLinkCache.Put(new string[] { repositoryId, id, rel, type }, link);
+ if (KnownLinks.Contains(rel))
+ {
+ typeLinkCache.Put(new string[] { repositoryId, id, rel, type }, link);
+ }
}
public void RemoveTypeLinks(string repositoryId, string id)
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs Wed Mar 23 20:58:33 2011
@@ -22,8 +22,6 @@ using System.IO;
using System.Xml;
using System.Xml.Serialization;
using DotCMIS.CMISWebServicesReference;
-using DotCMIS.Exceptions;
-using System.Globalization;
namespace DotCMIS.Binding.AtomPub
{
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-writer.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-writer.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-writer.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-writer.cs Wed Mar 23 20:58:33 2011
@@ -17,16 +17,14 @@
* under the License.
*/
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DotCMIS.CMISWebServicesReference;
+using System.Globalization;
using System.IO;
-using DotCMIS.Exceptions;
+using System.Text;
using System.Xml;
-using System.Globalization;
using System.Xml.Serialization;
+using DotCMIS.CMISWebServicesReference;
using DotCMIS.Enums;
+using DotCMIS.Exceptions;
namespace DotCMIS.Binding.AtomPub
{
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/binding-caches.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/binding-caches.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/binding-caches.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/binding-caches.cs Wed Mar 23 20:58:33 2011
@@ -63,7 +63,7 @@ namespace DotCMIS.Binding
private IBindingCacheLevel root;
private string name;
private object cacheLock = new object();
-
+
public Cache()
: this("Cache")
{
@@ -146,7 +146,10 @@ namespace DotCMIS.Binding
cacheLevel[keys[keys.Length - 1]] = value;
- Trace.WriteLine(name + ": put [" + GetFormattedKeys(keys) + "] = " + value);
+ if (DotCMISDebug.DotCMISSwitch.TraceVerbose)
+ {
+ Trace.WriteLine(name + ": put [" + GetFormattedKeys(keys) + "] = " + value);
+ }
}
finally
{
@@ -216,7 +219,10 @@ namespace DotCMIS.Binding
cacheLevel.Remove(keys[keys.Length - 1]);
- Trace.WriteLine(name + ": removed [" + GetFormattedKeys(keys) + "]");
+ if (DotCMISDebug.DotCMISSwitch.TraceVerbose)
+ {
+ Trace.WriteLine(name + ": removed [" + GetFormattedKeys(keys) + "]");
+ }
}
finally
{
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/binding-intf.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/binding-intf.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/binding-intf.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/binding-intf.cs Wed Mar 23 20:58:33 2011
@@ -19,11 +19,11 @@
using System;
using System.Collections.Generic;
using System.Net;
+using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
using DotCMIS.Binding.Impl;
using DotCMIS.Binding.Services;
using DotCMIS.CMISWebServicesReference;
-using System.ServiceModel.Description;
-using System.ServiceModel.Channels;
namespace DotCMIS.Binding
{
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/http.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/http.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/http.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/http.cs Wed Mar 23 20:58:33 2011
@@ -17,14 +17,15 @@
* under the License.
*/
using System;
-using System.Diagnostics;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Net;
using System.Text;
using System.Web;
using DotCMIS.Enums;
using DotCMIS.Exceptions;
+using DotCMIS.Util;
namespace DotCMIS.Binding.Impl
{
@@ -63,7 +64,10 @@ namespace DotCMIS.Binding.Impl
try
{
// log before connect
- Trace.WriteLine(method + " " + url);
+ if (DotCMISDebug.DotCMISSwitch.TraceInfo)
+ {
+ Trace.WriteLine(method + " " + url);
+ }
// create connection
HttpWebRequest conn = (HttpWebRequest)WebRequest.Create(url.Url);
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/services.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/services.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/services.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/services.cs Wed Mar 23 20:58:33 2011
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-using System;
using System.Collections.Generic;
using DotCMIS.Data;
using DotCMIS.Data.Extensions;
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/webservices/webservices.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/webservices/webservices.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/webservices/webservices.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/webservices/webservices.cs Wed Mar 23 20:58:33 2011
@@ -18,16 +18,16 @@
*/
using System;
using System.Collections.Generic;
+using System.Reflection;
using System.ServiceModel;
+using System.ServiceModel.Channels;
using DotCMIS.Binding.Impl;
using DotCMIS.Binding.Services;
using DotCMIS.CMISWebServicesReference;
using DotCMIS.Data;
using DotCMIS.Data.Extensions;
-using DotCMIS.Exceptions;
using DotCMIS.Enums;
-using System.ServiceModel.Channels;
-using System.Reflection;
+using DotCMIS.Exceptions;
namespace DotCMIS.Binding.WebServices
{
Modified: chemistry/dotcmis/trunk/DotCMIS/client/client-caches.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/client/client-caches.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/client/client-caches.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/client/client-caches.cs Wed Mar 23 20:58:33 2011
@@ -18,8 +18,6 @@
*/
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading;
using DotCMIS.Util;
Modified: chemistry/dotcmis/trunk/DotCMIS/client/client-intf.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/client/client-intf.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/client/client-intf.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/client/client-intf.cs Wed Mar 23 20:58:33 2011
@@ -18,11 +18,11 @@
*/
using System;
using System.Collections.Generic;
+using System.IO;
using DotCMIS.Binding;
using DotCMIS.Data;
using DotCMIS.Data.Extensions;
using DotCMIS.Enums;
-using System.IO;
namespace DotCMIS.Client
{
Modified: chemistry/dotcmis/trunk/DotCMIS/client/client-types.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/client/client-types.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/client/client-types.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/client/client-types.cs Wed Mar 23 20:58:33 2011
@@ -18,11 +18,9 @@
*/
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DotCMIS.Enums;
using DotCMIS.Data;
using DotCMIS.Data.Impl;
+using DotCMIS.Enums;
namespace DotCMIS.Client.Impl
{
Modified: chemistry/dotcmis/trunk/DotCMIS/client/client-utils.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/client/client-utils.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/client/client-utils.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/client/client-utils.cs Wed Mar 23 20:58:33 2011
@@ -17,11 +17,10 @@
* under the License.
*/
using System;
+using System.Collections;
using System.Collections.Generic;
-using System.Linq;
using System.Text;
using DotCMIS.Enums;
-using System.Collections;
namespace DotCMIS.Client.Impl
{
Modified: chemistry/dotcmis/trunk/DotCMIS/const.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/const.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/const.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/const.cs Wed Mar 23 20:58:33 2011
@@ -16,10 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace DotCMIS
{
Modified: chemistry/dotcmis/trunk/DotCMIS/data/data-intf.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/data/data-intf.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/data/data-intf.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/data/data-intf.cs Wed Mar 23 20:58:33 2011
@@ -1,4 +1,5 @@
-/*
+using System;
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,11 +18,9 @@
* under the License.
*/
using System.Collections.Generic;
+using System.IO;
using DotCMIS.Data.Extensions;
using DotCMIS.Enums;
-using System.IO;
-using System;
-using System.Collections;
namespace DotCMIS.Data
{
Modified: chemistry/dotcmis/trunk/DotCMIS/data/extensions.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/data/extensions.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/data/extensions.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/data/extensions.cs Wed Mar 23 20:58:33 2011
@@ -16,10 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace DotCMIS.Data.Extensions
{
Modified: chemistry/dotcmis/trunk/DotCMIS/enums.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/enums.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/enums.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/enums.cs Wed Mar 23 20:58:33 2011
@@ -18,11 +18,9 @@
*/
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
-using DotCMIS.CMISWebServicesReference;
using System.Xml.Serialization;
+using DotCMIS.CMISWebServicesReference;
namespace DotCMIS.Enums
{
Modified: chemistry/dotcmis/trunk/DotCMIS/exceptions.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/exceptions.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/exceptions.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/exceptions.cs Wed Mar 23 20:58:33 2011
@@ -17,9 +17,6 @@
* under the License.
*/
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace DotCMIS.Exceptions
{
Modified: chemistry/dotcmis/trunk/DotCMIS/util.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/util.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/util.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/util.cs Wed Mar 23 20:58:33 2011
@@ -18,11 +18,16 @@
*/
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
-using System.Text;
namespace DotCMIS.Util
{
+ internal class DotCMISDebug
+ {
+ public static TraceSwitch DotCMISSwitch = new TraceSwitch("DotCMIS", "DotCMIS");
+ }
+
/// <summary>
/// LRU cache implementation. Not thread safe!
/// </summary>
Modified: chemistry/dotcmis/trunk/DotCMISUnitTest/SmokeTest.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMISUnitTest/SmokeTest.cs?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMISUnitTest/SmokeTest.cs (original)
+++ chemistry/dotcmis/trunk/DotCMISUnitTest/SmokeTest.cs Wed Mar 23 20:58:33 2011
@@ -171,6 +171,12 @@ namespace DotCMISUnitTest
Assert.NotNull(hit);
Assert.NotNull(hit["cmis:objectId"]);
Console.WriteLine(hit.GetPropertyValueById(PropertyIds.Name) + " (" + hit.GetPropertyValueById(PropertyIds.ObjectId) + ")");
+
+ foreach (IPropertyData prop in hit.Properties)
+ {
+ string name = prop.QueryName;
+ object value = prop.FirstValue;
+ }
}
}
@@ -199,6 +205,12 @@ namespace DotCMISUnitTest
Assert.True(doc.AllowableActions.Actions.Contains(Actions.CanGetProperties));
Assert.False(doc.AllowableActions.Actions.Contains(Actions.CanGetChildren));
+ // check type
+ IObjectType type = doc.ObjectType;
+ Assert.NotNull(type);
+ Assert.NotNull(type.Id);
+ Assert.AreEqual(properties[PropertyIds.ObjectTypeId], type.Id);
+
// check versions
IList<IDocument> versions = doc.GetAllVersions();
Assert.NotNull(versions);
Modified: chemistry/dotcmis/trunk/README
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/README?rev=1084737&r1=1084736&r2=1084737&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/README (original)
+++ chemistry/dotcmis/trunk/README Wed Mar 23 20:58:33 2011
@@ -1,4 +1,4 @@
-Apache Chemistry DotCMIS 0.1
+Apache Chemistry DotCMIS 0.2
============================
Apache Chemistry DotCMIS is a Content Management Interoperability Services (CMIS)
@@ -10,7 +10,7 @@ See http://chemistry.apache.org/dotnet/g
and DotCMISDoc.chm for the API documentation.
-This is the very first release of DotCMIS. All CMIS operations and both bindings have
+This is the second release of DotCMIS. All CMIS operations and both bindings have
been implemented. The API is complete and is not supposed to change in following releases.
The most frequently used operations have been successfully tested against a small number
of repositories from different vendors.
@@ -20,15 +20,36 @@ compatibility issues. The code base will
If you find a problem, please let us know: https://issues.apache.org/jira/browse/CMIS
+Change log
+----------
+
+DotCMIS 0.2:
+
+- Web Services compatibility has been improved.
+- AtomPub content encoding and link cache have been improved.
+- Content-Disposition header has been added to the AtomPub setContentStream operation.
+- Compression option has been added to the AtomPub binding.
+- Another GetObject() convenience method has been added to ISession.
+- Several bug fixes.
+
+
Known stumbling blocks
----------------------
-- The Web Services binding only works with HTTPS. The .NET framework does not allow calls
- with UsernameTokens over plain HTTP.
+- The Web Services binding only works with HTTPS.
+ The .NET framework does not allow calls with UsernameTokens over plain HTTP.
-- Not all CMIS Web Services endpoints are compatible with the .NET framework for a number
- of reasons. Use the AtomPub binding if available. It's also faster.
+- Not all CMIS Web Services endpoints are compatible with the .NET framework for
+ a number of reasons.
+
+- Content is buffered in main memory when the Web Services binding is used.
+ That can cause problems with huge documents.
+ The maxium document size can be controlled with the SessionParameter.MessageSize
+ parameter. The default is 4 MB. The absolute maximum is 2 GB.
+=> Use the AtomPub binding whenever possible!
+ It causes less trouble, is faster, streams and can deal with documents of any size.
+
Strong-Name signing
-------------------