chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1305873 - in /chemistry/dotcmis/trunk: DEPENDENCIES DotCMIS/DotCMIS.shfbproj DotCMIS/binding/atompub/atompub.cs DotCMIS/build.bat DotCMIS/client/client-objectfactory.cs NOTICE
Date Tue, 27 Mar 2012 15:23:34 GMT
Author: fmui
Date: Tue Mar 27 15:23:34 2012
New Revision: 1305873

URL: http://svn.apache.org/viewvc?rev=1305873&view=rev
Log:
- fixed an ACL merging bug
- moved back to older SHFB version

Modified:
    chemistry/dotcmis/trunk/DEPENDENCIES
    chemistry/dotcmis/trunk/DotCMIS/DotCMIS.shfbproj
    chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub.cs
    chemistry/dotcmis/trunk/DotCMIS/build.bat
    chemistry/dotcmis/trunk/DotCMIS/client/client-objectfactory.cs
    chemistry/dotcmis/trunk/NOTICE

Modified: chemistry/dotcmis/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DEPENDENCIES?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DEPENDENCIES (original)
+++ chemistry/dotcmis/trunk/DEPENDENCIES Tue Mar 27 15:23:34 2012
@@ -1,3 +1,5 @@
 Apache Chemistry DotCMIS requires the .NET Framework 3.5 or higher.
 
 The Apache Chemistry DotCMIS unit tests require NUnit 2.5 or higher.
+
+The documentation is built with Sandcastle Help File Builder 1.9.1.0.

Modified: chemistry/dotcmis/trunk/DotCMIS/DotCMIS.shfbproj
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/DotCMIS.shfbproj?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/DotCMIS.shfbproj (original)
+++ chemistry/dotcmis/trunk/DotCMIS/DotCMIS.shfbproj Tue Mar 27 15:23:34 2012
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
   <PropertyGroup>
     <!-- The configuration and platform will be used to determine which
          assemblies to include from solution and project documentation

Modified: chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub.cs?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub.cs Tue Mar 27 15:23:34 2012
@@ -526,32 +526,43 @@ namespace DotCMIS.Binding.AtomPub
             // iterate through the original ACEs
             foreach (KeyValuePair<string, HashSet<string>> ace in originals)
             {
+                HashSet<string> permSet;
+                if (ace.Value == null)
+                {
+                    permSet = new HashSet<string>();
+                }
+                else
+                {
+                    permSet = new HashSet<string>(ace.Value);
+                }
+
                 // add permissions
-                HashSet<string> addPermissions = adds[ace.Key];
-                if (addPermissions != null)
+                HashSet<string> addPermissions;
+                if (adds.TryGetValue(ace.Key, out addPermissions))
                 {
                     foreach (string perm in addPermissions)
                     {
-                        ace.Value.Add(perm);
+                        permSet.Add(perm);
                     }
                 }
 
                 // remove permissions
-                HashSet<string> removePermissions = removes[ace.Key];
-                if (removePermissions != null)
+                HashSet<string> removePermissions;
+                if (adds.TryGetValue(ace.Key, out removePermissions))
                 {
                     foreach (string perm in removePermissions)
                     {
-                        ace.Value.Remove(perm);
+                        permSet.Remove(perm);
                     }
                 }
 
                 // create new ACE
                 Ace resultAce = new Ace();
+                resultAce.IsDirect = true;
                 Principal resultPrincipal = new Principal();
                 resultPrincipal.Id = ace.Key;
                 resultAce.Principal = resultPrincipal;
-                resultAce.Permissions = new List<string>(ace.Value);
+                resultAce.Permissions = new List<string>(permSet);
 
                 newACEs.Add(resultAce);
             }
@@ -559,9 +570,10 @@ namespace DotCMIS.Binding.AtomPub
             // find all ACEs that should be added but are not in the original ACE list
             foreach (KeyValuePair<string, HashSet<string>> ace in adds)
             {
-                if (!originals.ContainsKey(ace.Key) && ace.Value.Count > 0)
+                if (!originals.ContainsKey(ace.Key) && ace.Value != null &&
ace.Value.Count > 0)
                 {
                     Ace resultAce = new Ace();
+                    resultAce.IsDirect = true;
                     Principal resultPrincipal = new Principal();
                     resultPrincipal.Id = ace.Key;
                     resultAce.Principal = resultPrincipal;

Modified: chemistry/dotcmis/trunk/DotCMIS/build.bat
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/build.bat?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/build.bat (original)
+++ chemistry/dotcmis/trunk/DotCMIS/build.bat Tue Mar 27 15:23:34 2012
@@ -33,4 +33,4 @@ echo Building Release DLL...
 msbuild DotCMIS.csproj /ToolsVersion:3.5 /p:Configuration=Release
 
 echo Building documentation...
-msbuild DotCMIS.shfbproj /ToolsVersion:4.0 /p:Configuration=Release
\ No newline at end of file
+msbuild DotCMIS.shfbproj /ToolsVersion:3.5 /p:Configuration=Release
\ No newline at end of file

Modified: chemistry/dotcmis/trunk/DotCMIS/client/client-objectfactory.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/client/client-objectfactory.cs?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/client/client-objectfactory.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/client/client-objectfactory.cs Tue Mar 27 15:23:34 2012
@@ -63,6 +63,7 @@ namespace DotCMIS.Client.Impl
         public IAce CreateAce(string principal, IList<string> permissions)
         {
             Ace ace = new Ace();
+            ace.IsDirect = true;
             Principal acePrincipal = new Principal();
             acePrincipal.Id = principal;
             ace.Principal = acePrincipal;

Modified: chemistry/dotcmis/trunk/NOTICE
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/NOTICE?rev=1305873&r1=1305872&r2=1305873&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/NOTICE (original)
+++ chemistry/dotcmis/trunk/NOTICE Tue Mar 27 15:23:34 2012
@@ -1,2 +1,2 @@
 Apache Chemistry DotCMIS
-Copyright 2009-2011 The Apache Software Foundation
\ No newline at end of file
+Copyright 2009-2012 The Apache Software Foundation
\ No newline at end of file



Mime
View raw message