svn commit: r1212505 - in /qpid/trunk/qpid/cpp: README-winsdk.txt bld-winsdk.ps1

2011-12-09 Thread chug 
Author: chug
Date: Fri Dec  9 16:40:56 2011
New Revision: 1212505

URL: http://svn.apache.org/viewvc?rev=1212505view=rev
Log:
QPID-3671 WinSDK is incomplete. Adds .NET PDB files and fixes Readme-winsdk.

Modified:
qpid/trunk/qpid/cpp/README-winsdk.txt
qpid/trunk/qpid/cpp/bld-winsdk.ps1

Modified: qpid/trunk/qpid/cpp/README-winsdk.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/README-winsdk.txt?rev=1212505r1=1212504r2=1212505view=diff
==
--- qpid/trunk/qpid/cpp/README-winsdk.txt (original)
+++ qpid/trunk/qpid/cpp/README-winsdk.txt Fri Dec  9 16:40:56 2011
@@ -6,8 +6,9 @@ Table of Contents
 1. Introduction
 2. Prerequisites
 3. Kit contents
-4. Building dotnet_examples
-5. Notes
+4. Building unmanaged C++ examples
+5. Building dotnet_examples
+6. Notes
 
 
 1. Introduction
@@ -16,11 +17,19 @@ Qpid-Cpp-Win-Sdk is a software developme
 to write code using the Qpid-Cpp program libraries in a Windows
 environment.
 
-This kit is distributed as two zip files:
-qpid-cpp-x86-version.zip - projects and libraries for 32-bit
- x86 and Win32 development.
-qpid-cpp-x64-version.zip - projects and libraries for 64-bit
- x64 development.
+This kit is distributed as four zip files:
+qpid-cpp-x86-VS2008-version.zip - projects and libraries for 32-bit
+x86 and Win32 development using
+Visual Studio 2008.
+qpid-cpp-x64-VS2008-version.zip - projects and libraries for 64-bit
+x64 development using
+Visual Studio 2008.
+qpid-cpp-x86-VS2010-version.zip - projects and libraries for 32-bit
+x86 and Win32 development using
+Visual Studio 2010.
+qpid-cpp-x64-VS2010-version.zip - projects and libraries for 64-bit
+x64 development using
+Visual Studio 2010.
 
 For additional software or information on the Qpid project go to:
 http://cwiki.apache.org/qpid/
@@ -28,16 +37,19 @@ http://cwiki.apache.org/qpid/
 
 2. Prerequisites
 
-A. Visual Studio 2008. This kit was produced by Visual Studio 2008
-   and example solutions and projects are in Visual Studio 2008
-   format.
+A. Visual Studio 2008 or Visual Studio 2010. The kits were produced 
+   using Visual Studio 2008 or Visual Studio 2010 and provide a matched
+   set of link libraries for each tool chain.

-B. MSVC 9.0 runtime libraries. Copies of the MSVC90 redistributable
-   runtime libraries and manifest are included in the /bin directory.
+B. MSVC runtime libraries. Copies of the MSVC redistributable runtime
+   libraries and manifest are included in the \bin\release directories.

-C. Boost version 1_39. The Boost libraries required by this SDK are
-   included in the /bin directory. Both Debug and Release variants
-   are present.
+C. Boost version 1_47. The Boost libraries required by this SDK are
+   included in the \bin\debug and \bin\release directories.
+   
+D. CMake version 2.8.6 or later, available for free from http://cmake.org/ 
+   CMake generates custom Visual Studio solutions and projects for
+   the unmanaged C++ examples.
 
 
 3. Kit contents
@@ -48,7 +60,7 @@ The kit directories hold the content des
 The precompiled binary (.dll and .exe) files and
   the associated debug program database (.pdb) files.
 Boost library files.
-MSVC90 runtime library files.
+MSVC runtime library files are in \bin\release.
 
   \include
 A directory tree of .h files.
@@ -60,8 +72,7 @@ The kit directories hold the content des
 Apache Qpid C++ API Reference
 
   \examples
-A Visual Studio solution file and associated project files 
-to demonstrate using this SDK in unmanaged C++.
+Source files which demonstrate using this SDK in unmanaged C++.
 
   \dotnet_examples
 A Visual Studio solution file and associated project files 
@@ -117,35 +128,45 @@ unmanaged  | org.apache.qpid
   +-+
 
 
-4. Building dotnet_examples
+4. Building unmanaged C++ examples
+===
+
+This version of Qpid-Cpp-Win-Sdk ships with no pre-built Visual Studio
+solution or project files for the C++ examples. Instead this kit has
+support for using CMake to generate the solution and project files.
+
+A. Make sure that the CMake bin directory is defined in your path.
+   You may check this from a command prompt by typing:
+  cmake --version
+ cmake version 2.8.6
+   
+   If CMake is installed correctly it will respond with a version number.
+   
+B. Change directory to \examples\examples-cmake.
+
+C. Execute run-cmake.bat batch file.
+
+   Run-cmake.bat runs CMake and generates

svn commit: r1212554 - /qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java

2011-12-09 Thread rajith 
Author: rajith
Date: Fri Dec  9 18:03:00 2011
New Revision: 1212554

URL: http://svn.apache.org/viewvc?rev=1212554view=rev
Log:
QPID-3625 Reversing the change we made as AUTO_ACK seems correct.
For the specific changes required for the JCA case we will be exploring
other alternatives.
(cherry picked from commit 3223886060101a3f471ad7f33fa07647d5ba2752)

Modified:

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java

Modified: 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java?rev=1212554r1=1212553r2=1212554view=diff
==
--- 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
 (original)
+++ 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
 Fri Dec  9 18:03:00 2011
@@ -51,7 +51,7 @@ public class XASessionImpl extends AMQSe
  int defaultPrefetchHigh, int defaultPrefetchLow)
 {
 super(qpidConnection, con, channelId, false,  // this is not a 
transacted session
-  Session.CLIENT_ACKNOWLEDGE, //QPID-3625 XA should explicitly ack 
messages
+  Session.AUTO_ACKNOWLEDGE,
   MessageFactoryRegistry.newDefaultRegistry(), 
defaultPrefetchHigh, defaultPrefetchLow,null);
 createSession();
 _xaResource = new XAResourceImpl(this);



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r1212625 - /qpid/trunk/qpid/cpp/bld-winsdk.ps1

2011-12-09 Thread chug 
Author: chug
Date: Fri Dec  9 20:56:09 2011
New Revision: 1212625

URL: http://svn.apache.org/viewvc?rev=1212625view=rev
Log:
QPID-3671 WinSDK - Executables are built release; copy them to bin/release.

Modified:
qpid/trunk/qpid/cpp/bld-winsdk.ps1

Modified: qpid/trunk/qpid/cpp/bld-winsdk.ps1
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bld-winsdk.ps1?rev=1212625r1=1212624r2=1212625view=diff
==
--- qpid/trunk/qpid/cpp/bld-winsdk.ps1 (original)
+++ qpid/trunk/qpid/cpp/bld-winsdk.ps1 Fri Dec  9 20:56:09 2011
@@ -218,7 +218,7 @@ function BuildAPlatform
 ('bin/msvc*.dll','bin/Release') ,
 ('bin/*d.dll',   'bin/Debug'),
 ('bin/*.dll','bin/Release'),
-('bin/*test.exe','bin/Debug')
+('bin/*test.exe','bin/Release')
 )
 
 $preserve=(



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r1212672 - in /qpid/trunk/qpid/cpp/examples: CMakeLists.txt qmf-console/CMakeLists.txt

2011-12-09 Thread shuston 
Author: shuston
Date: Fri Dec  9 22:44:40 2011
New Revision: 1212672

URL: http://svn.apache.org/viewvc?rev=1212672view=rev
Log:
Don't install C++ examples we don't want users basing their learning on any 
longer. Fixes QPID-3673.

Modified:
qpid/trunk/qpid/cpp/examples/CMakeLists.txt
qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=1212672r1=1212671r2=1212672view=diff
==
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Fri Dec  9 22:44:40 2011
@@ -63,6 +63,11 @@ macro(add_example subdir example)
 target_link_libraries(${subdir}_${example} qpidclient
   ${_boost_libs_needed})
   endif (${ARGC} GREATER 2)
+endmacro(add_example)
+
+macro(add_installed_example subdir example)
+  add_example(${subdir} ${example} ${ARGN})
+
   # For installs, don't install the built example; that would be pointless.
   # Install the things a user needs to build the example on-site.
   install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
@@ -74,7 +79,7 @@ macro(add_example subdir example)
  COMPONENT ${QPID_COMPONENT_EXAMPLES})
   endif (MSVC)
 
-endmacro(add_example)
+endmacro(add_installed_example)
 
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
  DESTINATION ${QPID_INSTALL_EXAMPLESDIR}

Modified: qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt?rev=1212672r1=1212671r2=1212672view=diff
==
--- qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt Fri Dec  9 22:44:40 
2011
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-add_example(qmf-console console qmfconsole)
-add_example(qmf-console printevents qmfconsole)
-add_example(qmf-console ping qmfconsole)
-add_example(qmf-console queuestats qmfconsole)
+add_installed_example(qmf-console console qmfconsole)
+add_installed_example(qmf-console printevents qmfconsole)
+add_installed_example(qmf-console ping qmfconsole)
+add_installed_example(qmf-console queuestats qmfconsole)



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org