From c152bbebc0bbe253aa9d2c647d0c2393ed1cc9fe Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 17 Feb 2011 22:59:34 +0000 Subject: Update to include qpidtypes, qpidmessaging, and the .NET binding. Resolves QPID-3058 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071829 13f79535-47bb-0310-9956-ffa450edef68 --- packaging/windows/INSTALL_NOTES.html | 73 +++++------------ packaging/windows/installer.proj | 51 ++++++++++-- packaging/windows/qpidc.wxs | 149 ++++++++++++++++++++++++++++++++--- 3 files changed, 199 insertions(+), 74 deletions(-) diff --git a/packaging/windows/INSTALL_NOTES.html b/packaging/windows/INSTALL_NOTES.html index 0eda0aa2fe..4aecce697a 100644 --- a/packaging/windows/INSTALL_NOTES.html +++ b/packaging/windows/INSTALL_NOTES.html @@ -1,11 +1,11 @@ -Apache Qpid C++ 0.6 Installation Notes +Apache Qpid C++ 0.9 Installation Notes -

Apache Qpid C++ 0.6 Installation Notes

+

Apache Qpid C++ 0.9 Installation Notes

-

Thank you for installing the Apache Qpid version 0.6 for Windows kit. +

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.

@@ -20,11 +20,10 @@ on the same system as the client, but it must be reachable using TCP/IP.

The broker executable is installed in the bin subdirectory of your Qpid installation directory. The broker program is -qpidd.exe. The simplest way to experiment with the -broker is to open a command prompt window, cd to the installation -directory, and execute the broker: +qpidd.exe. 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: 

-cd "C:\Program Files\Apache\qpidc-0.6\bin"
 qpidd
A small amount of information will be displayed to let you know the broker @@ -65,60 +64,24 @@ channel (C++ Broker Compatible)."

Notes

Please read the following sections for important notes regarding this release.

-

WCF Channel

-

This release includes a new .NET WCF Channel implementation. The WCF DLL -is named Apache.Qpid.Channel.dll located in the bin -directory under the Qpid installation location.

-

WCF Channel programming examples are located in the -examples\Channel under the installation directory.

-

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.

-

If you wish to install the WCF Channel DLLs into the GAC, you can use the -following commands (assuming the Qpid install location is -C:\Program Files\Apache\qpidc-0.6):

-
-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"
-
-

To remove the DLLs from the GAC:

-
-gacutil /u "Apache.Qpid.Channel"
-gacutil /u "Apache.Qpid.Interop"
-
-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. - -

Broker Persistence Module

-

This release includes a new persistence module. The broker can use this +

CLFS-Based Broker Persistence Module

+

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 ---module-dir option to load all available plugins. For example: +--load-module option to load the needed plugins. For example: 

-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
-The --module-dir option can also take a full path. The option +The --load-module option can also take a full path. The option can also be included in the broker configuration file. A sample is located in the conf\qpidd.conf file under the installation directory.

diff --git a/packaging/windows/installer.proj b/packaging/windows/installer.proj index de68b05626..7be5fda472 100644 --- a/packaging/windows/installer.proj +++ b/packaging/windows/installer.proj @@ -45,6 +45,7 @@ %22Visual Studio 9 2008 Win64%22 x64 x64 + x64 @@ -53,23 +54,32 @@ %22Visual Studio 9 2008%22 x86 Win32 + Win32 + + + + + + + + @@ -82,6 +92,20 @@ Exclude="$(source_root)\wcf\samples\**\.svn\**"/> + + + + + + + + + + + + + + @@ -142,13 +166,22 @@ + + + + + + DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs;BuildDotNetBindings"> + + @@ -178,9 +217,9 @@ OutputFile="boost_dlls.wxs" /> + OutputFile="qpidc-0.9-x64.msi" /> --> @@ -194,9 +233,9 @@ + 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)" /> + 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" /> diff --git a/packaging/windows/qpidc.wxs b/packaging/windows/qpidc.wxs index 924e92d20f..8e73ea0661 100644 --- a/packaging/windows/qpidc.wxs +++ b/packaging/windows/qpidc.wxs @@ -20,30 +20,39 @@ --> - - + + + UpgradeCode="{94677A0C-606C-49d8-BB63-DF2F6F6D780F}"> + + + + + - + + + @@ -62,6 +71,35 @@ + + + + + + + + + + + + + + + + + + + + @@ -81,15 +119,22 @@ - - + + + + + + + + + + @@ -100,9 +145,45 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -119,6 +200,18 @@ + + + + + + + + + + + + @@ -129,10 +222,19 @@ - + + + + + + + = 502)]]> + + + @@ -152,23 +254,44 @@ + + + + + + + + + + + + + + + + - + + + + + -- cgit v1.2.1