Modified: qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs Mon Jan 5 12:42:00 2009 @@ -20,7 +20,7 @@ */ using System.ServiceModel; -namespace org.apache.qpid.wcf.demo +namespace org.apache.qpid.wcf.demo.rpc { [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall)] public sealed class UpperCase : IUpperCase
Modified: qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj Mon Jan 5 12:42:00 2009 @@ -1,94 +1,73 @@ -<!-- - - 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 - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{C988F456-1025-486F-9BCD-49C0F83B91DB}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>wcfRPC</RootNamespace> - <AssemblyName>Qpid WCF UpperCase</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</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\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.configuration" /> - <Reference Include="System.Core"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Drawing" /> - <Reference Include="System.ServiceModel"> - <RequiredTargetFramework>3.0</RequiredTargetFramework> - </Reference> - <Reference Include="System.Windows.Forms" /> - <Reference Include="System.Xml.Linq"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Data.DataSetExtensions"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="IUpperCase.cs" /> - <Compile Include="Program.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="UpperCase.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\wcf.csproj"> - <Project>{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}</Project> - <Name>wcf</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{C988F456-1025-486F-9BCD-49C0F83B91DB}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>wcfRPC</RootNamespace> + <AssemblyName>Qpid WCF UpperCase</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</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\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.configuration" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Drawing" /> + <Reference Include="System.ServiceModel"> + <RequiredTargetFramework>3.0</RequiredTargetFramework> + </Reference> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml.Linq"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data.DataSetExtensions"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="IUpperCase.cs" /> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="UpperCase.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\wcf.csproj"> + <Project>{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}</Project> + <Name>wcf</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- 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> - --> -</Project> + --> +</Project> \ No newline at end of file Modified: qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs Mon Jan 5 12:42:00 2009 @@ -26,7 +26,6 @@ using System.ServiceModel.Channels; using System.Text; using System.Threading; -using client.client; using org.apache.qpid.client; using org.apache.qpid.transport; using org.apache.qpid.transport.util; @@ -59,12 +58,12 @@ } - public override Message Receive(TimeSpan timeout) + public override System.ServiceModel.Channels.Message Receive(TimeSpan timeout) { _session.messageFlow("myDest", MessageCreditUnit.MESSAGE, 1); _session.sync(); - MessageTransfer m = _queue.Dequeue(); - Message result = null; + IMessage m = _queue.Dequeue(); + System.ServiceModel.Channels.Message result = null; if (m != null) { var reader = new BinaryReader(m.Body, Encoding.UTF8); @@ -97,7 +96,7 @@ return result; } - public override bool TryReceive(TimeSpan timeout, out Message message) + public override bool TryReceive(TimeSpan timeout, out System.ServiceModel.Channels.Message message) { message = Receive(timeout); return message != null; @@ -143,7 +142,7 @@ } } - internal class WCFListener : MessageListener + internal class WCFListener : IMessageListener { private static readonly Logger _log = Logger.get(typeof (WCFListener)); private readonly BlockingQueue _q; @@ -153,7 +152,7 @@ _q = q; } - public void messageTransfer(MessageTransfer m) + public void messageTransfer(IMessage m) { _log.debug("message received by listener"); _q.Enqueue(m); @@ -163,9 +162,9 @@ internal class BlockingQueue { private int _count; - private readonly Queue<MessageTransfer> _queue = new Queue<MessageTransfer>(); + private readonly Queue<IMessage> _queue = new Queue<IMessage>(); - public MessageTransfer Dequeue(TimeSpan timeout) + public IMessage Dequeue(TimeSpan timeout) { lock (_queue) { @@ -185,7 +184,7 @@ } } - public MessageTransfer Dequeue() + public IMessage Dequeue() { lock (_queue) { @@ -202,7 +201,7 @@ } } - public void Enqueue(MessageTransfer data) + public void Enqueue(IMessage data) { if (data != null) { Modified: qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs Mon Jan 5 12:42:00 2009 @@ -47,7 +47,7 @@ _session = session; } - public override void Send(Message message, TimeSpan timeout) + public override void Send(System.ServiceModel.Channels.Message message, TimeSpan timeout) { if (message.State != MessageState.Closed) { Modified: qpid/trunk/qpid/dotnet/client-010/wcf/wcf.csproj URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/wcf.csproj?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/wcf.csproj (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/wcf.csproj Mon Jan 5 12:42:00 2009 @@ -1,90 +1,59 @@ -<!-- - - 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 - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>WCF</RootNamespace> - <AssemblyName>qpidWCFModel</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</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\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Reference Include="Qpid Client, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\client\bin\Debug\Qpid Client.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.configuration" /> - <Reference Include="System.ServiceModel"> - <RequiredTargetFramework>3.0</RequiredTargetFramework> - </Reference> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="model\QpidBinding.cs" /> - <Compile Include="model\QpidChannelBase.cs" /> - <Compile Include="model\CommunicationOperation.cs" /> - <Compile Include="model\QpidChannelFactory.cs" /> - <Compile Include="model\QpidChannelListener.cs" /> - <Compile Include="model\QpidChannelListenerBase.cs" /> - <Compile Include="model\QpidInputChannel.cs" /> - <Compile Include="model\QpidInputChannelBase.cs" /> - <Compile Include="model\QpidOutputChannel.cs" /> - <Compile Include="model\QpidOutputChannelBase.cs" /> - <Compile Include="model\QpidTransportBindingElement.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="model\QpidTransportElement.cs" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!-- 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> - --> -</Project> +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>WCF</RootNamespace> + <AssemblyName>qpidWCFModel</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</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\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="Qpid Client, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\client\bin\Debug\Qpid Client.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.configuration" /> + <Reference Include="System.ServiceModel"> + <RequiredTargetFramework>3.0</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="model\*.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- 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> + --> +</Project> \ No newline at end of file Modified: qpid/trunk/qpid/dotnet/client-010/wcf/wcf.sln URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/wcf.sln?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== --- qpid/trunk/qpid/dotnet/client-010/wcf/wcf.sln (original) +++ qpid/trunk/qpid/dotnet/client-010/wcf/wcf.sln Mon Jan 5 12:42:00 2009 @@ -1,8 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcf", "wcf.csproj", "{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcfHelloClient", "demo\wcfHelloClient\wcfHelloClient.csproj", "{A24E27DB-A38D-40C9-9879-8390B68C2F06}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcfHelloServer", "demo\wcfHelloServer\wcfHelloServer.csproj", "{3EF848D7-5FAC-482C-922A-D4D45A4CCD2A}" @@ -13,16 +11,14 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcfBookingServer", "demo\wcfBookingServer\wcfBookingServer.csproj", "{B34E21C4-A742-4886-8569-1A89490E093E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcf", "wcf.csproj", "{F1D80D9D-FE22-4213-A760-BFFDE7D131DD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Release|Any CPU.Build.0 = Release|Any CPU {A24E27DB-A38D-40C9-9879-8390B68C2F06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A24E27DB-A38D-40C9-9879-8390B68C2F06}.Debug|Any CPU.Build.0 = Debug|Any CPU {A24E27DB-A38D-40C9-9879-8390B68C2F06}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -43,6 +39,10 @@ {B34E21C4-A742-4886-8569-1A89490E093E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B34E21C4-A742-4886-8569-1A89490E093E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B34E21C4-A742-4886-8569-1A89490E093E}.Release|Any CPU.Build.0 = Release|Any CPU + {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1D80D9D-FE22-4213-A760-BFFDE7D131DD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: qpid/trunk/qpid/dotnet/client-010/wcf/wcf.suo URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/wcf/wcf.suo?rev=731698&r1=731697&r2=731698&view=diff ============================================================================== Binary files - no diff available.
