You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2014/07/15 12:31:14 UTC
[17/20] git commit: Update the .net odata library to version 6.5.0
Update the .net odata library to version 6.5.0
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/06b34494
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/06b34494
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/06b34494
Branch: refs/heads/master
Commit: 06b3449430a7cad91f7ef6af90adeab58971a98f
Parents: b45ddd7
Author: Bing Li <bi...@apache.org>
Authored: Thu Jul 10 09:32:09 2014 +0800
Committer: Bing Li <bi...@apache.org>
Committed: Thu Jul 10 09:40:34 2014 +0800
----------------------------------------------------------------------
datajs/.gitignore | 6 +++-
datajs/JSLib.csproj | 38 +++++++++++++++-----
datajs/Web.config | 6 ++--
datajs/packages.config | 10 +++---
datajs/tests/code/ReflectionDataContext.cs | 6 ----
datajs/tests/endpoints/BasicAuthDataService.svc | 5 ++-
datajs/tests/endpoints/EpmDataService.svc | 5 ++-
datajs/tests/endpoints/ErrorDataService.svc | 5 ++-
.../tests/endpoints/FoodStoreDataServiceV4.svc | 9 +----
.../tests/endpoints/LargeCollectionService.svc | 3 +-
datajs/tests/endpoints/web.config | 6 ++--
datajs/tests/odata-batch-functional-tests.html | 1 +
12 files changed, 55 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/.gitignore
----------------------------------------------------------------------
diff --git a/datajs/.gitignore b/datajs/.gitignore
index 6e9f0e0..bedbbca 100644
--- a/datajs/.gitignore
+++ b/datajs/.gitignore
@@ -1,3 +1,7 @@
node_modules/
build
-localgrunt.config
\ No newline at end of file
+localgrunt.config
+bin/
+obj/
+packages/
+JSLib.suo
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/JSLib.csproj
----------------------------------------------------------------------
diff --git a/datajs/JSLib.csproj b/datajs/JSLib.csproj
index 1bb20fb..c1c0d5f 100644
--- a/datajs/JSLib.csproj
+++ b/datajs/JSLib.csproj
@@ -37,7 +37,29 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <!-- Product code. -->
+ <Content Include="src\index.js" />
+ <Content Include="src\banner.txt" />
+ <Content Include="src\lib\cache.js" />
+ <Content Include="src\lib\datajs.js" />
+ <Content Include="src\lib\odata.js" />
+ <Content Include="src\lib\store.js" />
+ <Content Include="src\lib\cache\source.js" />
+ <Content Include="src\lib\datajs\deferred.js" />
+ <Content Include="src\lib\datajs\utils.js" />
+ <Content Include="src\lib\datajs\xml.js" />
+ <Content Include="src\lib\odata\atom.js" />
+ <Content Include="src\lib\odata\batch.js" />
+ <Content Include="src\lib\odata\gml.js" />
+ <Content Include="src\lib\odata\handler.js" />
+ <Content Include="src\lib\odata\json.js" />
+ <Content Include="src\lib\odata\json-light.js" />
+ <Content Include="src\lib\odata\metadata.js" />
+ <Content Include="src\lib\odata\net.js" />
+ <Content Include="src\lib\odata\utils.js" />
+ <Content Include="src\lib\odata\xml.js" />
+ <Content Include="src\lib\store\dom.js" />
+ <Content Include="src\lib\store\indexeddb.js" />
+ <Content Include="src\lib\store\memory.js" />
<Content Include="tests\cache-tests.js" />
<Content Include="tests\common\CacheOracle.js" />
<Content Include="tests\common\Instrument.svc" />
@@ -119,20 +141,20 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Microsoft.OData.Client, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>packages\Microsoft.OData.Client.6.0.0-beta1\lib\net40\Microsoft.OData.Client.dll</HintPath>
+ <Reference Include="Microsoft.OData.Client, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>packages\Microsoft.OData.Client.6.5.0\lib\net40\Microsoft.OData.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Core">
- <HintPath>packages\Microsoft.OData.Core.6.0.0-beta1\lib\portable-net40+sl5+wp8+win8\Microsoft.OData.Core.dll</HintPath>
+ <HintPath>packages\Microsoft.OData.Core.6.5.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Edm">
- <HintPath>packages\Microsoft.OData.Edm.6.0.0-beta1\lib\portable-net40+sl5+wp8+win8\Microsoft.OData.Edm.dll</HintPath>
+ <HintPath>packages\Microsoft.OData.Edm.6.5.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Edm.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>packages\Microsoft.OData.Service.6.0.0-beta1\lib\net40\Microsoft.OData.Service.dll</HintPath>
+ <Reference Include="Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>packages\Microsoft.OData.Service.6.5.0\lib\net40\Microsoft.OData.Service.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Spatial">
- <HintPath>packages\Microsoft.Spatial.6.0.0-beta1\lib\portable-net40+sl5+wp8+win8\Microsoft.Spatial.dll</HintPath>
+ <HintPath>packages\Microsoft.Spatial.6.5.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net" />
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/Web.config
----------------------------------------------------------------------
diff --git a/datajs/Web.config b/datajs/Web.config
index 2e1d265..e45c79e 100644
--- a/datajs/Web.config
+++ b/datajs/Web.config
@@ -10,9 +10,9 @@
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="Microsoft.OData.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <add assembly="Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <add assembly="Microsoft.OData.Client, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Core, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Client, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</assemblies>
</compilation>
</system.web>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/packages.config
----------------------------------------------------------------------
diff --git a/datajs/packages.config b/datajs/packages.config
index d2b5a9b..8d5126f 100644
--- a/datajs/packages.config
+++ b/datajs/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.OData.Client" version="6.0.0-beta1" targetFramework="net40" />
- <package id="Microsoft.OData.Core" version="6.0.0-beta1" targetFramework="net40" />
- <package id="Microsoft.OData.Edm" version="6.0.0-beta1" targetFramework="net40" />
- <package id="Microsoft.OData.Service" version="6.0.0-beta1" targetFramework="net40" />
- <package id="Microsoft.Spatial" version="6.0.0-beta1" targetFramework="net40" />
+ <package id="Microsoft.OData.Client" version="6.5.0" targetFramework="net40" />
+ <package id="Microsoft.OData.Core" version="6.5.0" targetFramework="net40" />
+ <package id="Microsoft.OData.Edm" version="6.5.0" targetFramework="net40" />
+ <package id="Microsoft.OData.Service" version="6.5.0" targetFramework="net40" />
+ <package id="Microsoft.Spatial" version="6.5.0" targetFramework="net40" />
</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/code/ReflectionDataContext.cs
----------------------------------------------------------------------
diff --git a/datajs/tests/code/ReflectionDataContext.cs b/datajs/tests/code/ReflectionDataContext.cs
index fcaeda7..1635d54 100644
--- a/datajs/tests/code/ReflectionDataContext.cs
+++ b/datajs/tests/code/ReflectionDataContext.cs
@@ -25,7 +25,6 @@ namespace DataJS.Tests
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using System.Globalization;
using System.Linq;
using System.Reflection;
@@ -568,11 +567,6 @@ namespace DataJS.Tests
{
keyPropertyList.Add(keyProperty.Name);
}
-
- foreach (DataServiceKeyAttribute customAttribute in type.GetCustomAttributes(typeof(DataServiceKeyAttribute), true))
- {
- keyPropertyList.AddRange(customAttribute.KeyNames);
- }
return keyPropertyList.ToArray();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/BasicAuthDataService.svc
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/BasicAuthDataService.svc b/datajs/tests/endpoints/BasicAuthDataService.svc
index 46709f1..df448dc 100644
--- a/datajs/tests/endpoints/BasicAuthDataService.svc
+++ b/datajs/tests/endpoints/BasicAuthDataService.svc
@@ -19,7 +19,7 @@
*/
-->
-<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
Service="DataJS.Tests.BasicAuthDataService" %>
namespace DataJS.Tests
@@ -27,7 +27,6 @@ namespace DataJS.Tests
using System;
using System.Collections.Generic;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using System.Linq;
using System.ServiceModel;
using System.ServiceModel.Web;
@@ -45,7 +44,7 @@ namespace DataJS.Tests
{
config.SetEntitySetAccessRule("*", EntitySetRights.All);
config.SetServiceOperationAccessRule("*", ServiceOperationRights.All);
- config.DataServiceBehavior.MaxProtocolVersion = DataServiceProtocolVersion.V4;
+ config.DataServiceBehavior.MaxProtocolVersion = Microsoft.OData.Client.ODataProtocolVersion.V4;
config.UseVerboseErrors = true;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/EpmDataService.svc
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/EpmDataService.svc b/datajs/tests/endpoints/EpmDataService.svc
index 7fd27ef..316c9ae 100644
--- a/datajs/tests/endpoints/EpmDataService.svc
+++ b/datajs/tests/endpoints/EpmDataService.svc
@@ -19,7 +19,7 @@
*/
-->
-<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
Service="DataJS.Tests.EpmDataService" %>
@@ -28,7 +28,6 @@ namespace DataJS.Tests
using System;
using System.Collections.Generic;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using System.Linq;
using System.ServiceModel.Web;
@@ -43,7 +42,7 @@ namespace DataJS.Tests
{
config.SetEntitySetAccessRule("*", EntitySetRights.All);
config.SetServiceOperationAccessRule("*", ServiceOperationRights.All);
- config.DataServiceBehavior.MaxProtocolVersion = DataServiceProtocolVersion.V4;
+ config.DataServiceBehavior.MaxProtocolVersion = Microsoft.OData.Client.ODataProtocolVersion.V4;
config.UseVerboseErrors = true;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/ErrorDataService.svc
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/ErrorDataService.svc b/datajs/tests/endpoints/ErrorDataService.svc
index e23c920..052a2df 100644
--- a/datajs/tests/endpoints/ErrorDataService.svc
+++ b/datajs/tests/endpoints/ErrorDataService.svc
@@ -19,7 +19,7 @@
*/
-->
-<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
Service="DataJS.Tests.ErrorDataService" %>
@@ -29,7 +29,6 @@ namespace DataJS.Tests
using System;
using System.Collections.Generic;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using System.Linq;
/// <summary>
@@ -41,7 +40,7 @@ namespace DataJS.Tests
public static void InitializeService(DataServiceConfiguration config)
{
config.SetEntitySetAccessRule("*", EntitySetRights.All);
- config.DataServiceBehavior.MaxProtocolVersion = DataServiceProtocolVersion.V4;
+ config.DataServiceBehavior.MaxProtocolVersion = Microsoft.OData.Client.ODataProtocolVersion.V4;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/FoodStoreDataServiceV4.svc
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/FoodStoreDataServiceV4.svc b/datajs/tests/endpoints/FoodStoreDataServiceV4.svc
index 8e8e557..ac1cfe7 100644
--- a/datajs/tests/endpoints/FoodStoreDataServiceV4.svc
+++ b/datajs/tests/endpoints/FoodStoreDataServiceV4.svc
@@ -19,7 +19,7 @@
*/
-->
-<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
Service="DataJS.Tests.V4.FoodStoreDataService" %>
namespace DataJS.Tests.V4
@@ -27,7 +27,6 @@ namespace DataJS.Tests.V4
using System;
using System.Collections.Generic;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using Microsoft.OData.Service.Providers;
using System.Linq;
using System.ServiceModel.Web;
@@ -479,9 +478,6 @@ namespace DataJS.Tests.V4
/// <summary>
/// The Category class is a simple class with V1-compatible feed customizations.
/// </summary>
- [DataServiceKey("CategoryID")]
- [EntitySet("Categories")]
- [NamedStream("Icon")]
public class Category
{
public Category()
@@ -498,9 +494,6 @@ namespace DataJS.Tests.V4
/// The Food class has a mixture of V1-compatible and incompatible feed
/// customizations (thus it's V2), and custom mappings.
/// </summary>
- [DataServiceKey("FoodID")]
- [EntitySet("Foods")]
- [NamedStream("Picture")]
public class Food
{
private List<string> alternativeNames = new List<string>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/LargeCollectionService.svc
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/LargeCollectionService.svc b/datajs/tests/endpoints/LargeCollectionService.svc
index 0a339c5..bfbd3ef 100644
--- a/datajs/tests/endpoints/LargeCollectionService.svc
+++ b/datajs/tests/endpoints/LargeCollectionService.svc
@@ -19,7 +19,7 @@
*/
-->
-<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+<%@ ServiceHost Language="C#" Factory="Microsoft.OData.Service.DataServiceHostFactory, Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
Service="DataJS.Tests.LargeCollectionService" %>
namespace DataJS.Tests
@@ -27,7 +27,6 @@ namespace DataJS.Tests
using System;
using System.Collections.Generic;
using Microsoft.OData.Service;
- using Microsoft.OData.Service.Common;
using System.Linq;
using System.ServiceModel;
using System.ServiceModel.Web;
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/endpoints/web.config
----------------------------------------------------------------------
diff --git a/datajs/tests/endpoints/web.config b/datajs/tests/endpoints/web.config
index 5836287..11c6696 100644
--- a/datajs/tests/endpoints/web.config
+++ b/datajs/tests/endpoints/web.config
@@ -10,9 +10,9 @@
<add assembly='System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089'/>
<add assembly='System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089'/>
<add assembly='System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35'/>
- <add assembly="Microsoft.OData.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <add assembly="Microsoft.OData.Service, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <add assembly="Microsoft.OData.Client, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Core, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Service, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <add assembly="Microsoft.OData.Client, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</assemblies>
</compilation>
</system.web>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06b34494/datajs/tests/odata-batch-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-batch-functional-tests.html b/datajs/tests/odata-batch-functional-tests.html
index 5857301..927690f 100644
--- a/datajs/tests/odata-batch-functional-tests.html
+++ b/datajs/tests/odata-batch-functional-tests.html
@@ -15,6 +15,7 @@
window.TestSynchronizer.init(QUnit);
</script>
+ <!-- To do: on Oata library 6.1.0, there contains a change about "Content-Id" in the batch request change set header (odata v4.0 protocol spec. Chapter 11.7.3 Change sets). This change makes most the batch related test cases not work. Need to do a fix. -->
<script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
<!--<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>