Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/jasondentler/Hermes
  • Loading branch information
silviom committed Jul 19, 2011
2 parents f373aa7 + 41e3954 commit dd8aceb
Show file tree
Hide file tree
Showing 41 changed files with 20,494 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -19,5 +19,7 @@ src/[pP]ackages/*
*.log*
*.svclog

rx.js
rx.jQuery.js

/README.html
8 changes: 6 additions & 2 deletions README.md
Expand Up @@ -20,5 +20,9 @@ Road map
* Enhance the portal
* Add support for long polling; even if we have some spikes of this, we are probabily open a new opensource project for doing this.
* Create a real scenario application
* Create more client examples in different technologies (javascript is the most important right now)
* Add support for serialization/deserialization of messages in the .Net client.
* Create more client examples in different technologies
* Add support for serialization/deserialization of messages in the .Net client.

Javascript Client
========
The Hermes.js client requires Reactive Extensions for Javascript. Because of the current EULA, it can't be included in this repository. It's currently available for download from [MSDN](http://msdn.microsoft.com/en-us/data/gg577610#js). Extract rx.js and rx.jQuery.js from the archive to the src/JsClient/Scripts directory, then build the solution.
3 changes: 0 additions & 3 deletions src/Client.Tests/Client.Tests.csproj
Expand Up @@ -49,9 +49,6 @@
<Reference Include="SharpTestsEx">
<HintPath>..\packages\SharpTestsEx.1.1.1\lib\SharpTestsEx.dll</HintPath>
</Reference>
<Reference Include="SharpTestsEx.Mvc">
<HintPath>..\packages\SharpTestsEx.MVC.1.1.1\lib\SharpTestsEx.Mvc.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
Expand Down
1 change: 0 additions & 1 deletion src/Client.Tests/packages.config
Expand Up @@ -3,5 +3,4 @@
<package id="Rx-Main" version="1.0.10621" />
<package id="NUnit" version="2.5.10.11092" />
<package id="SharpTestsEx" version="1.1.1" />
<package id="SharpTestsEx.MVC" version="1.1.1" />
</packages>
114 changes: 114 additions & 0 deletions src/ExampleWeb/ExampleWeb.csproj
@@ -0,0 +1,114 @@
<?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>{4E88EDCF-2760-431E-A529-E638B8FDAC82}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExampleWeb</RootNamespace>
<AssemblyName>ExampleWeb</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<UseIISExpress>true</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>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
<Content Include="default.htm" />
<Content Include="Scripts\Hermes.js" />
<Content Include="Scripts\jquery-1.6.2-vsdoc.js" />
<Content Include="Scripts\jquery-1.6.2.js" />
<Content Include="Scripts\jquery-1.6.2.min.js" />
<Content Include="Scripts\jquery.jfeed.js" />
<Content Include="Scripts\jquery.json2xml.js" />
<Content Include="Scripts\RestClient.js" />
<Content Include="Scripts\rx.jQuery.js" />
<Content Include="Scripts\rx.js" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</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>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>1207</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6156/ExampleWeb</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="BeforeBuild">
<Exec Condition="Exists('$(ProjectDir)packages.config')" Command="&quot;$(SolutionDir)..\Tools\nuget.exe&quot; install &quot;$(ProjectDir)packages.config&quot; -o &quot;$(SolutionDir)Packages&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\Hermes.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\Hermes.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\RestClient.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\RestClient.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\jquery.jfeed.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\jquery.jfeed.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\jquery.json2xml.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\jquery.json2xml.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\rx.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\rx.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
<Exec Condition="Exists('$(ProjectDir)..\JsClient\Scripts\rx.jQuery.js')" Command="copy &quot;$(ProjectDir)..\JsClient\Scripts\rx.jQuery.js&quot; &quot;$(ProjectDir)Scripts\&quot;" />
</Target>
</Project>
35 changes: 35 additions & 0 deletions src/ExampleWeb/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ExampleWeb")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("ExampleWeb")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7561a432-2ac7-4373-a0a3-9d859bc4facb")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit dd8aceb

Please sign in to comment.