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/05/26 10:45:50 UTC
git commit: [OLINGO-238] copy server code to new build
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 0c2def207 -> 7cd1b6bb7
[OLINGO-238] copy server code to new build
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/7cd1b6bb
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/7cd1b6bb
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/7cd1b6bb
Branch: refs/heads/master
Commit: 7cd1b6bb7d1fdb41dfffc53d390b5cdc277abf7b
Parents: 0c2def2
Author: Sven Kobler <sv...@sap.com>
Authored: Mon May 26 10:45:38 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Mon May 26 10:45:38 2014 +0200
----------------------------------------------------------------------
datajs/JSLib.csproj | 171 ++++++++++++++++++++++++++++++++++++++++++++
datajs/JSLib.sln | 20 ++++++
datajs/Web.config | 34 +++++++++
datajs/packages.config | 8 +++
4 files changed, 233 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/7cd1b6bb/datajs/JSLib.csproj
----------------------------------------------------------------------
diff --git a/datajs/JSLib.csproj b/datajs/JSLib.csproj
new file mode 100644
index 0000000..1bb20fb
--- /dev/null
+++ b/datajs/JSLib.csproj
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>
+ </ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}</ProjectGuid>
+ <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>JSLib</RootNamespace>
+ <AssemblyName>JSLib</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
+ <UseIISExpress>false</UseIISExpress>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <!-- Product code. -->
+ <Content Include="tests\cache-tests.js" />
+ <Content Include="tests\common\CacheOracle.js" />
+ <Content Include="tests\common\Instrument.svc" />
+ <Content Include="tests\common\Instrument.js" />
+ <Content Include="tests\common\mockXMLHttpRequest.js" />
+ <Content Include="tests\common\mockHttpClient.js" />
+ <Content Include="tests\common\djstest.js" />
+ <Content Include="tests\common\gpo-ie8-tour-disable.reg" />
+ <Content Include="tests\common\ObservableHttpClient.js" />
+ <Content Include="tests\common\ODataReadOracle.js" />
+ <Content Include="tests\common\ODataReadOracle.svc" />
+ <Content Include="tests\common\rx.js" />
+ <Content Include="tests\common\TestLogger.svc" />
+ <Content Include="tests\common\TestSynchronizerClient.js" />
+ <Content Include="tests\odata-json-light-tests.js" />
+ <Content Include="tests\datajs-startup-perf-test.html" />
+ <Content Include="tests\endpoints\BasicAuthDataService.svc" />
+ <Content Include="tests\endpoints\FoodStoreDataServiceV4.svc" />
+ <Content Include="tests\endpoints\CustomAnnotations.xml" />
+ <Content Include="tests\endpoints\CustomDataService.svc" />
+ <Content Include="tests\endpoints\EpmDataService.svc" />
+ <Content Include="tests\endpoints\ErrorDataService.svc" />
+ <Content Include="tests\endpoints\LargeCollectionService.svc" />
+ <Content Include="tests\endpoints\web.config" />
+ <Content Include="tests\datajs-cache-large-collection-functional-tests.html" />
+ <Content Include="tests\datajs-cache-large-collection-functional-tests.js" />
+ <Content Include="tests\datajs-cache-long-haul-tests.html" />
+ <Content Include="tests\odata-atom-tests.js" />
+ <Content Include="tests\odata-batch-functional-tests.html" />
+ <Content Include="tests\odata-batch-functional-tests.js" />
+ <Content Include="tests\odata-batch-tests.js" />
+ <Content Include="tests\odata-cache-filter-functional-tests.html" />
+ <Content Include="tests\odata-cache-filter-functional-tests.js" />
+ <Content Include="tests\odata-cache-fperf-tests.html" />
+ <Content Include="tests\odata-cache-fperf-tests.js" />
+ <Content Include="tests\odata-cache-functional-tests.html" />
+ <Content Include="tests\odata-cache-functional-tests.js" />
+ <Content Include="tests\odata-cache-rx-functional-tests.html" />
+ <Content Include="tests\odata-cache-rx-functional-tests.js" />
+ <Content Include="tests\odata-fuzz.html" />
+ <Content Include="tests\odata-metadata-tests.js" />
+ <Content Include="tests\odata-handler-tests.js" />
+ <Content Include="tests\odata-json-tests.js" />
+ <Content Include="tests\odata-links-functional-tests.html" />
+ <Content Include="tests\odata-links-functional-tests.js" />
+ <Content Include="tests\odata-metadata-awareness-functional-tests.html" />
+ <Content Include="tests\odata-metadata-awareness-functional-tests.js" />
+ <Content Include="tests\odata-net-tests.js" />
+ <Content Include="tests\odata-perf-tests.html" />
+ <Content Include="tests\odata-perf-tests.js" />
+ <Content Include="tests\odata-read-crossdomain-functional-tests.html" />
+ <Content Include="tests\odata-read-crossdomain-functional-tests.js" />
+ <Content Include="tests\odata-read-functional-tests.html" />
+ <Content Include="tests\odata-request-functional-tests.html" />
+ <Content Include="tests\odata-request-functional-tests.js" />
+ <Content Include="tests\odata-read-functional-tests.js" />
+ <Content Include="tests\odata-qunit-tests.htm" />
+ <Content Include="tests\odata-tests.js" />
+ <Content Include="tests\odata-xml-tests.js" />
+ <Content Include="tests\run-tests.wsf" />
+ <Content Include="tests\store-indexeddb-tests.js" />
+ <Content Include="tests\store-tests.js" />
+ <Content Include="tests\test-list.js" />
+ <Content Include="tests\test-manager.html" />
+ <!-- Configuration file for the web project. -->
+ <Content Include="Web.config">
+ <SubType>Designer</SubType>
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="tests\code\AtomReader.cs" />
+ <Compile Include="tests\code\CsdlReader.cs" />
+ <Compile Include="tests\code\JsDate.cs" />
+ <Compile Include="tests\code\JsonObject.cs" />
+ <Compile Include="tests\code\ReaderUtils.cs" />
+ <Compile Include="tests\code\ReflectionDataContext.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <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>
+ <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>
+ </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>
+ </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>
+ <Reference Include="Microsoft.Spatial">
+ <HintPath>packages\Microsoft.Spatial.6.0.0-beta1\lib\portable-net40+sl5+wp8+win8\Microsoft.Spatial.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Net" />
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.ServiceModel" />
+ <Reference Include="System.ServiceModel.Activation" />
+ <Reference Include="System.ServiceModel.Web" />
+ <Reference Include="System.Web.Extensions" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Xml.Linq" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="src\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <UseIIS>False</UseIIS>
+ <AutoAssignPort>True</AutoAssignPort>
+ <DevelopmentServerPort>4002</DevelopmentServerPort>
+ <DevelopmentServerVPath>/</DevelopmentServerVPath>
+ <IISUrl>
+ </IISUrl>
+ <NTLMAuthentication>False</NTLMAuthentication>
+ <UseCustomServer>False</UseCustomServer>
+ <CustomServerUrl>
+ </CustomServerUrl>
+ <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/7cd1b6bb/datajs/JSLib.sln
----------------------------------------------------------------------
diff --git a/datajs/JSLib.sln b/datajs/JSLib.sln
new file mode 100644
index 0000000..d265e52
--- /dev/null
+++ b/datajs/JSLib.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSLib", "JSLib.csproj", "{73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73ADF1A7-613B-4679-885B-2AE4AFAA9A6A}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/7cd1b6bb/datajs/Web.config
----------------------------------------------------------------------
diff --git a/datajs/Web.config b/datajs/Web.config
new file mode 100644
index 0000000..2e1d265
--- /dev/null
+++ b/datajs/Web.config
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <system.web>
+ <compilation debug="true" targetFramework="4.0">
+ <assemblies>
+ <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+ <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+ <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+ <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" />
+ </assemblies>
+ </compilation>
+ </system.web>
+ <system.webServer>
+ <directoryBrowse enabled="true" />
+ </system.webServer>
+ <system.codedom>
+ <compilers>
+ <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <providerOption name="CompilerVersion" value="v4.0" />
+ </compiler>
+ </compilers>
+ </system.codedom>
+ <system.net>
+ <defaultProxy>
+ <proxy autoDetect="True" />
+ </defaultProxy>
+ </system.net>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/7cd1b6bb/datajs/packages.config
----------------------------------------------------------------------
diff --git a/datajs/packages.config b/datajs/packages.config
new file mode 100644
index 0000000..d2b5a9b
--- /dev/null
+++ b/datajs/packages.config
@@ -0,0 +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" />
+</packages>
\ No newline at end of file