Author: shuston
Date: Thu Feb 17 22:59:34 2011
New Revision: 1071829
URL: http://svn.apache.org/viewvc?rev=1071829&view=rev
Log:
Update to include qpidtypes, qpidmessaging, and the .NET binding. Resolves
QPID-3058
Modified:
qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
qpid/trunk/qpid/packaging/windows/installer.proj
qpid/trunk/qpid/packaging/windows/qpidc.wxs
Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1071829&r1=1071828&r2=1071829&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Thu Feb 17 22:59:34
2011
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.6 Installation Notes</title>
+<title>Apache Qpid C++ 0.9 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.6 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.9 Installation Notes</H1>
-<p>Thank you for installing the Apache Qpid version 0.6 for Windows kit.
+<p>Thank you for installing Apache Qpid version 0.9 for Windows.
If the requisite features were installed, you can now run a broker,
use the example programs, and design your own messaging programs while
reading the Qpid C++ API reference documentation.</p>
@@ -20,11 +20,10 @@ on the same system as the client, but it
<p>The broker executable is installed in the <code>bin</code> subdirectory
of your Qpid installation directory. The broker program is
-<code>qpidd.exe</code>. The simplest way to experiment with the
-broker is to open a command prompt window, cd to the installation
-directory, and execute the broker:
+<code>qpidd.exe</code>. The installation procedure adds the Qpid bin
+directory to the PATH environment variable, so the simplest way to experiment
+with the broker is to open a command prompt window and execute the broker:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.6\bin"
qpidd
</pre>
A small amount of information will be displayed to let you know the broker
@@ -65,60 +64,24 @@ channel (C++ Broker Compatible)."</p>
<H1>Notes</H1>
<p>Please read the following sections for important notes regarding this
release.</p>
-<H2>WCF Channel</H2>
-<p>This release includes a new .NET WCF Channel implementation. The WCF DLL
-is named <code>Apache.Qpid.Channel.dll</code> located in the <code>bin</code>
-directory under the Qpid installation location.</p>
-<p>WCF Channel programming examples are located in the
-<code>examples\Channel</code> under the installation directory.</p>
-<p>The WCF Channel DLLs are not loaded into the Global Assembly Cache (GAC)
-at install time; therefore, they must be referenced explicitly from the install
-location.</p>
-<p>If you wish to install the WCF Channel DLLs into the GAC, you can use the
-following commands (assuming the Qpid install location is
-<code>C:\Program Files\Apache\qpidc-0.6</code>):</p>
-<pre>
-gacutil -I "C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Channel.dll"
-gacutil -I "C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Interop.dll"
-</pre>
-<p>To remove the DLLs from the GAC:</p>
-<pre>
-gacutil /u "Apache.Qpid.Channel"
-gacutil /u "Apache.Qpid.Interop"
-</pre>
-To use transactions with the WCF channel, you must enable the Microsoft
Distributed Transaction Coordinator service and configure it to find and use
the Qpid XA transaction module.
-<ul>
-<li>
-Update the PATH environment variable for services:
-right click <i>Computer</i>, select <i>Properties > Advanced System
-Settings > Environment Variables > System Variables</i> and add
-"C:\Program Files\Apache\qpidc-0.6\bin" to the PATH variable.
-<li>
-Following the instructions in
-<a href="http://support.microsoft.com/kb/817066";>
-http://support.microsoft.com/kb/817066</a>,
-update the MSDTC security settings to allow XA transactions, and
-create an XADLL registry entry for "qpidxarm" with string (REG_SZ)
-value "C:\Program Files\Apache\qpidc-0.6\bin\qpidxarm.dll"
-<li>
-Open <i>Control Panel > Administrative Tools > Services</i> and start
-(or restart) the DTC service and make sure that the DTC service is set
-to start automatically when the system reboots.
-</ul>
-<H2>Broker Persistence Module</H2>
-<p>This release includes a new persistence module. The broker can use this
+<H2>CLFS-Based Broker Persistence Module</H2>
+<p>This release includes a second persistence module. The broker can use this
module to facilitate durable queues, exchanges, bindings, configuration, and
-messages. The persistence module uses SQL Server Express (or SQL Server) 2005
-or newer. The persistence module is a Qpid broker plugin. It is not loaded by
+messages. The new persistence module, like the SQL-based store introduced in
+Qpid 0.6, uses SQL Server Express (or SQL Server) 2005 or newer. However, it
+also used Common Log File System (CLFS) to store message and
transaction-related
+information. CLFS and, thus, the new store, is available on Windows Vista and
+Server 2005 and newer.
+The persistence module is a Qpid broker plugin. It is not loaded by
default; therefore, to gain support for durable items the persistence plugin
must be loaded into the broker. This can be done using the
-<code>--module-dir</code> option to load all available plugins. For example:
+<code>--load-module</code> option to load the needed plugins. For example:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.6"
-bin\qpidd.exe --module-dir plugins\broker
+cd "C:\Program Files\Apache\qpidc-0.9"
+qpidd.exe --load-module plugins\broker\store.dll --load-module
plugins\broker\msclfs_store.dll
</pre>
-The <code>--module-dir</code> option can also take a full path. The option
+The <code>--load-module</code> option can also take a full path. The option
can also be included in the broker configuration file. A sample is located
in the <code>conf\qpidd.conf</code> file under the installation directory.</p>
Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1071829&r1=1071828&r2=1071829&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Thu Feb 17 22:59:34 2011
@@ -45,6 +45,7 @@
<CmakeGenerator>%22Visual Studio 9 2008
Win64%22</CmakeGenerator>
<Architecture>x64</Architecture>
<CSProjArchitecture>x64</CSProjArchitecture>
+ <DotNetBindingsArchitecture>x64</DotNetBindingsArchitecture>
</PropertyGroup>
</When>
<Otherwise>
@@ -53,23 +54,32 @@
<CmakeGenerator>%22Visual Studio 9 2008%22</CmakeGenerator>
<Architecture>x86</Architecture>
<CSProjArchitecture>Win32</CSProjArchitecture>
+ <DotNetBindingsArchitecture>Win32</DotNetBindingsArchitecture>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
+ <CppDebugProjects Include="$(build_dir)\src\qpidtypes.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qpidcommon.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qpidclient.vcproj"/>
+ <CppDebugProjects Include="$(build_dir)\src\qpidmessaging.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qmfconsole.vcproj"/>
</ItemGroup>
<ItemGroup>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.dll"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.lib"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.pdb"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.dll"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.lib"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.pdb"/>
@@ -83,6 +93,20 @@
</ItemGroup>
<ItemGroup>
+ <DotNetBindingArtifacts
Include="$(build_dir)\src\Release\org.apache.qpid.messaging.dll"/>
+ <DotNetBindingArtifacts
Include="$(build_dir)\src\Release\org.apache.qpid.messaging.pdb"/>
+ <DotNetBindingArtifacts
Include="$(build_dir)\src\Release\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <DotNetBindingArtifacts
Include="$(build_dir)\src\Release\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <DotNetBindingDebugArtifacts
Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.dll"/>
+ <DotNetBindingDebugArtifacts
Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.pdb"/>
+ <DotNetBindingDebugArtifacts
Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <DotNetBindingDebugArtifacts
Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </ItemGroup>
+
+ <ItemGroup>
<BoostDlls Include="$(staging_dir)\bin\boost_*.dll"/>
</ItemGroup>
@@ -142,13 +166,22 @@
<Target Name="BuildDocs" DependsOnTargets="Configure">
<VCBuild
- Projects="$(build_dir)\docs\api\user-api-docs.vcproj"
+ Projects="$(build_dir)\docs\api\docs-user-api.vcproj"
SolutionFile="$(build_dir)/qpid-cpp.sln"
Configuration="Release" />
</Target>
+ <Target Name="BuildDotNetBindings"><!--
DependsOnTargets="BuildCpp;BuildCppDebug" -->
+ <MSBuild
+
Projects="$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln"
+ Properties="Configuration=Debug;Platform=$(Architecture)" />
+ <MSBuild
+
Projects="$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln"
+ Properties="Configuration=Release;Platform=$(Architecture)" />
+ </Target>
+
<Target Name="Stage"
- DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs">
+
DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs;BuildDotNetBindings">
<Exec
Command="cmake -DCMAKE_INSTALL_CONFIG_NAME=%22Release%22 -P
$(build_dir)\cmake_install.cmake" />
<Copy
@@ -160,6 +193,12 @@
<Copy
SourceFiles="@(WcfExamples)"
DestinationFiles="@(WcfExamples->'$(staging_dir)\examples\%(RecursiveDir)%(Filename)%(Extension)')"
/>
+ <Copy
+ SourceFiles="@(DotNetBindingArtifacts)"
+ DestinationFolder="$(staging_dir)\bin" />
+ <Copy
+ SourceFiles="@(DotNetBindingDebugArtifacts)"
+ DestinationFolder="$(staging_dir)\bin\Debug" />
</Target>
<Target Name="Installer" DependsOnTargets="Stage">
@@ -178,9 +217,9 @@
OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.6"
+ DefineConstants="qpidc_version=0.9"
InstallerPlatform="x64"
- OutputFile="qpidc-0.6-x64.msi" />
+ OutputFile="qpidc-0.9-x64.msi" />
-->
<Exec
Command="heat dir $(staging_dir)\include\qpid -var
var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out
qpid_headers.wxs" />
@@ -194,9 +233,9 @@
<Exec
Command="heat dir $(staging_dir)\docs\api -var var.api_docs_dir
-dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs" />
<Exec
- Command="candle -dqpidc_version=0.6 -dProgramFiles=$(ProgramFiles)
-dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid
-dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples
-dapi_docs_dir=$(staging_dir)\docs\api qpidc.wxs qpid_headers.wxs
boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch
$(Architecture)" />
+ Command="candle -dqpidc_version=0.9 -dProgramFiles=$(ProgramFiles)
-dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid
-dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples
-dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs
qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs
-arch $(Architecture)" />
<Exec
- Command="light -ext WixUtilExtension -ext WixUIExtension
-cultures:en-us -out qpidc-0.6-$(Architecture).msi qpidc.wixobj
qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj
api_docs.wixobj" />
+ Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext
WixUIExtension -cultures:en-us -out qpidc-0.9-$(Architecture).msi qpidc.wixobj
qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj
api_docs.wixobj" />
</Target>
</Project>
Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/qpidc.wxs?rev=1071829&r1=1071828&r2=1071829&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/qpidc.wxs (original)
+++ qpid/trunk/qpid/packaging/windows/qpidc.wxs Thu Feb 17 22:59:34 2011
@@ -20,30 +20,39 @@
-->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
- <Product Id="818aca03-2bed-4baf-8408-361c29e8b6a4"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";
+ xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension";>
+
+ <Product Id="{BEEC3337-9346-4663-ACFC-D3149A222C46}"
Name="Apache Qpid $(var.qpidc_version)"
Language="1033"
Version="$(var.qpidc_version).0.0"
Manufacturer="Apache Software Foundation"
- UpgradeCode="006510A1-3D2F-4fa6-BF23-4F76AD68D6AF">
+ UpgradeCode="{94677A0C-606C-49d8-BB63-DF2F6F6D780F}">
<Package Description="Apache Qpid C++ for Windows"
Manufacturer="Apache Software Foundation"
Id="*"
- InstallerVersion="200"
+ InstallerVersion="300"
Compressed="yes" />
<Media Id="1" Cabinet="qpidc.cab" EmbedCab="yes" />
+ <!-- The .NET-using client pieces check for .NET 3.5 -->
+ <PropertyRef Id="NETFRAMEWORK35"/>
+
<!-- Allow 64-bit builds to pick ProgramFiles64Folder instead -->
<?Define ProgramFiles = "ProgramFilesFolder"?>
<Directory Id="TARGETDIR" Name="SourceDir">
+ <Merge Id="VCRedist" SourceFile="C:\Program Files\Common Files\Merge
Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
+ <Merge Id="VCRedistPolicy" SourceFile="C:\Program Files\Common
Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1"
Language="0"/>
<Directory Id="$(var.ProgramFiles)">
<Directory Id="ApacheTop" Name="Apache">
<Directory Id="INSTALLLOCATION" Name="qpidc-$(var.qpidc_version)">
- <Directory Id="QpidBin" Name="bin"/>
+ <Directory Id="QpidBin" Name="bin">
+ <Directory Id="QpidBinDebug" Name="Debug"/>
+ </Directory>
<Directory Id="QpidConf" Name="conf"/>
<Directory Id="QpidDoc" Name="docs">
<Directory Id="QpidDocAPI" Name="api"/>
@@ -62,6 +71,35 @@
</Directory>
+ <DirectoryRef Id="TARGETDIR">
+
+ <Component Id="QpidBinPATH"
Guid="{0E88CF22-7988-4d34-9C42-61C764091B11}">
+ <Environment Id="envPath" Separator=";" Action="set" Permanent="no"
+ Name="PATH" System="yes" Part="last" Value="[QpidBin]"/>
+ </Component>
+ <Component Id="QpidRootEnv"
Guid="{DC89CA24-E66F-4506-AA1F-153A88979AC7}">
+ <Environment Id="RootPath" Separator=";" Action="set" Permanent="no"
+ Name="QPID_ROOT" System="yes" Part="last"
+ Value="[INSTALLLOCATION]"/>
+ </Component>
+ <Component Id="WCFXAKey" Guid="{88EDD4D2-59FC-46be-BE18-40A94FB5C9D7}">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
+ <!-- This registry key, values, procedure, and reasoning are
+ described at http://support.microsoft.com/kb/817066
+ It's necessary for the WCF XA support to work properly. -->
+ <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\MSDTC\XADLL"
+ Action="create">
+ <RegistryValue Type="string"
+ Name="qpidxarm.dll"
+ Value="[QpidBin]qpidxarm.dll" />
+ </RegistryKey>
+ <ServiceControl Id="MSDTCSvcRestart" Name="MSDTC"
+ Stop="both" Start="both"/>
+ </Component>
+ </DirectoryRef>
+
<DirectoryRef Id="INSTALLLOCATION">
<Component Id="InstallNotes"
Guid="{10A64ABE-B3F7-40c0-88F1-E0AD71467A3E}">
<File Id="InstallNotesHTML" Source="INSTALL_NOTES.html"/>
@@ -81,15 +119,22 @@
<File Id="CommonDebugLIB"
Source="$(var.staging_dir)\bin\qpidcommond.lib"/>
<File Id="CommonDebugDLL"
Source="$(var.staging_dir)\bin\qpidcommond.dll"/>
<File Id="CommonDebugPDB"
Source="$(var.staging_dir)\bin\qpidcommond.pdb"/>
-
- <Environment Id="envPath" Separator=";" Action="set" Permanent="no"
- Name="PATH" System="no" Part="last" Value="[QpidBin]"/>
</Component>
<Component Id="CommonLib_Release"
Guid="BB2FA938-25CB-498e-A3D8-D6C475B82853">
<File Id="CommonReleaseLIB"
Source="$(var.staging_dir)\bin\qpidcommon.lib"/>
<File Id="CommonReleaseDLL"
Source="$(var.staging_dir)\bin\qpidcommon.dll"/>
<!-- File Id="CommonReleasePDB"
Source="$(var.staging_dir)\bin\qpidcommon.pdb"/ -->
</Component>
+ <Component Id="TypesLib_Debug"
Guid="31059F1D-6C2C-4ad0-88E4-4938EC0091C5">
+ <File Id="TypesDebugLIB"
Source="$(var.staging_dir)\bin\qpidtypesd.lib"/>
+ <File Id="TypesDebugDLL"
Source="$(var.staging_dir)\bin\qpidtypesd.dll"/>
+ <File Id="TypesDebugPDB"
Source="$(var.staging_dir)\bin\qpidtypesd.pdb"/>
+ </Component>
+ <Component Id="TypesLib_Release"
Guid="121FF239-8C37-4ca4-836D-39E5D98E0DB1">
+ <File Id="TypesReleaseLIB"
Source="$(var.staging_dir)\bin\qpidtypes.lib"/>
+ <File Id="TypesReleaseDLL"
Source="$(var.staging_dir)\bin\qpidtypes.dll"/>
+ <!-- File Id="TypesReleasePDB"
Source="$(var.staging_dir)\bin\qpidtypes.pdb"/ -->
+ </Component>
<Component Id="ClientLib_Debug"
Guid="2AB8EA8C-8AD5-4A8E-8CB3-E525A59962A3">
<File Id="ClientDebugLIB"
Source="$(var.staging_dir)\bin\qpidclientd.lib"/>
<File Id="ClientDebugDLL"
Source="$(var.staging_dir)\bin\qpidclientd.dll"/>
@@ -100,9 +145,45 @@
<File Id="ClientReleaseDLL"
Source="$(var.staging_dir)\bin\qpidclient.dll"/>
<!-- File Id="ClientReleasePDB"
Source="$(var.staging_dir)\bin\qpidclient.pdb"/ -->
</Component>
- <Component Id="ClientWCFDLL" Guid="FF88DEAF-59BC-4846-993A-0D317E094DF4">
- <File Id="ChannelDLL"
Source="$(var.staging_dir)\bin\Apache.Qpid.Channel.dll"/>
- <File Id="InteropDLL"
Source="$(var.staging_dir)\bin\Apache.Qpid.Interop.dll"/>
+ <Component Id="MessagingLib_Debug"
Guid="41F85AFA-69F4-4f9a-BE48-804D68F880C4">
+ <File Id="MessagingDebugLIB"
Source="$(var.staging_dir)\bin\qpidmessagingd.lib"/>
+ <File Id="MessagingDebugDLL"
Source="$(var.staging_dir)\bin\qpidmessagingd.dll"/>
+ <File Id="MessagingDebugPDB"
Source="$(var.staging_dir)\bin\qpidmessagingd.pdb"/>
+ </Component>
+ <Component Id="MessagingLib_Release"
Guid="C023833B-430E-492a-991F-003084EF0E3C">
+ <File Id="MessagingReleaseLIB"
Source="$(var.staging_dir)\bin\qpidmessaging.lib"/>
+ <File Id="MessagingReleaseDLL"
Source="$(var.staging_dir)\bin\qpidmessaging.dll"/>
+ <!-- File Id="MessagingReleasePDB"
Source="$(var.staging_dir)\bin\qpidmessaging.pdb"/ -->
+ </Component>
+ <Component Id="DotNetMessaging_Release"
Guid="25C3F69E-593E-4b30-9CC5-329488D7840E">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
+ <File Id="DotNetMessagingDLL"
Source="$(var.staging_dir)\bin\org.apache.qpid.messaging.dll"/>
+ <File Id="DotNetMessagingPDB"
Source="$(var.staging_dir)\bin\org.apache.qpid.messaging.pdb"/>
+ <File Id="DotNetMessagingSessionDLL"
Source="$(var.staging_dir)\bin\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <File Id="DotNetMessagingSessionPDB"
Source="$(var.staging_dir)\bin\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </Component>
+ <Component Id="WCFChannelDLL"
Guid="{4039F91C-C663-4ef4-8A74-7D425D6D32E6}">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
+ <File Id="ChannelDLL"
+ Name="Apache.Qpid.Channel.dll" KeyPath="yes" Assembly=".net"
+ Source="$(var.staging_dir)\bin\Apache.Qpid.Channel.dll"/>
+ </Component>
+ <Component Id="WCFInteropDLL"
Guid="{EE9E36BF-C951-4429-AC78-F105C3D6BD95}">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
+ <File Id="InteropDLL"
+ Name="Apache.Qpid.Interop.dll" KeyPath="yes" Assembly=".net"
+ Source="$(var.staging_dir)\bin\Apache.Qpid.Interop.dll"/>
+ </Component>
+ <Component Id="WCFXADLL" Guid="{4C3F32C2-1A31-4af6-9863-770090A60E52}">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
<File Id="XARMDLL" Source="$(var.staging_dir)\bin\qpidxarm.dll"/>
</Component>
@@ -119,6 +200,18 @@
</DirectoryRef>
+ <DirectoryRef Id="QpidBinDebug">
+ <Component Id="DotNetMessaging_Debug"
Guid="{949C5592-4EEF-44c7-86C0-FB0F8FA37035}">
+ <Condition>
+ <![CDATA[Installed OR NETFRAMEWORK35]]>
+ </Condition>
+ <File Id="DotNetMessagingDebugDLL"
Source="$(var.staging_dir)\bin\Debug\org.apache.qpid.messaging.dll"/>
+ <File Id="DotNetMessagingDebugPDB"
Source="$(var.staging_dir)\bin\Debug\org.apache.qpid.messaging.pdb"/>
+ <File Id="DotNetMessagingSessionDebugDLL"
Source="$(var.staging_dir)\bin\Debug\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <File Id="DotNetMessagingSessionDebugPDB"
Source="$(var.staging_dir)\bin\Debug\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </Component>
+ </DirectoryRef>
+
<DirectoryRef Id="QpidConf">
<Component Id="BrokerConf" Guid="{8893D4B8-F87B-4da7-914A-87ED61E46577}">
<File Id="BrokerConfFile" Source="$(var.staging_dir)\conf\qpidd.conf"/>
@@ -129,10 +222,19 @@
</DirectoryRef>
<DirectoryRef Id="QpidBrPlugin">
- <Component Id="SQLPersistence"
Guid="{DDF3AF70-C4E4-4745-BB7E-0E195FAF116B}">
+ <Component Id="TopStorePlugin"
Guid="455A04EE-CFFE-4dad-963E-4CD2AC09C1C5">
<File Id="StorePlugin"
Source="$(var.staging_dir)\plugins\broker\store.dll"/>
+ </Component>
+ <Component Id="SQLPersistence"
Guid="C45EDD16-A91A-44d2-BA62-64AC63AA310D">
<File Id="SQLPlugin"
Source="$(var.staging_dir)\plugins\broker\mssql_store.dll"/>
</Component>
+ <Component Id="CLFSPersistence"
Guid="{49E9EE38-D16E-4188-8F58-D8715598C5FB}">
+ <!-- CLFS store only works on Win Svr 2003 and up -->
+ <Condition>
+ <![CDATA[Installed OR (VersionNT >= 502)]]>
+ </Condition>
+ <File Id="CLFSPlugin"
Source="$(var.staging_dir)\plugins\broker\msclfs_store.dll"/>
+ </Component>
</DirectoryRef>
<DirectoryRef Id="ApplicationProgramsFolder">
@@ -152,23 +254,44 @@
<ComponentRef Id="InstallNotes"/>
<ComponentRef Id="Legal"/>
+ <Feature Id="VCRedist" Title="Visual C++ 9.0 Runtime"
+ AllowAdvertise="no" Display="hidden" Level="1">
+ <MergeRef Id="VCRedist"/>
+ <MergeRef Id="VCRedistPolicy"/>
+ </Feature>
+
<Feature Id="Broker" Title="Broker: Routes and queues messages"
Level="1">
+ <ComponentRef Id="QpidBinPATH"/>
<ComponentRef Id="BrokerConf"/>
<ComponentRef Id="Broker_Release"/>
<ComponentRef Id="CommonLib_Release"/>
+ <ComponentRef Id="TypesLib_Release"/>
+ <ComponentRef Id="TopStorePlugin"/>
<ComponentRef Id="SQLPersistence"/>
+ <ComponentRef Id="CLFSPersistence"/>
<ComponentGroupRef Id="group_BoostDlls"/>
</Feature>
<Feature Id="ClientLib" Title="Client Libraries and Headers to develop
and run programs" Level="1">
+ <ComponentRef Id="QpidBinPATH"/>
+ <ComponentRef Id="QpidRootEnv"/>
+ <ComponentRef Id="WCFXAKey"/>
<ComponentRef Id="ClientConf"/>
<ComponentRef Id="CommonLib_Debug"/>
<ComponentRef Id="CommonLib_Release"/>
+ <ComponentRef Id="TypesLib_Debug"/>
+ <ComponentRef Id="TypesLib_Release"/>
<ComponentRef Id="ClientLib_Debug"/>
<ComponentRef Id="ClientLib_Release"/>
+ <ComponentRef Id="MessagingLib_Debug"/>
+ <ComponentRef Id="MessagingLib_Release"/>
<ComponentRef Id="QMFConsoleLib_Debug"/>
<ComponentRef Id="QMFConsoleLib_Release"/>
- <ComponentRef Id="ClientWCFDLL"/>
+ <ComponentRef Id="DotNetMessaging_Debug"/>
+ <ComponentRef Id="DotNetMessaging_Release"/>
+ <ComponentRef Id="WCFChannelDLL"/>
+ <ComponentRef Id="WCFInteropDLL"/>
+ <ComponentRef Id="WCFXADLL"/>
<ComponentGroupRef Id="group_QpidHeaders"/>
<ComponentGroupRef Id="group_BoostHeaders"/>
<ComponentGroupRef Id="group_BoostDlls"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
