qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r1187150 [2/43] - in /qpid/branches/QPID-2519: ./ bin/ cpp/ cpp/bindings/ cpp/bindings/qmf/python/ cpp/bindings/qmf/ruby/ cpp/bindings/qmf/tests/ cpp/bindings/qmf2/ cpp/bindings/qmf2/examples/cpp/ cpp/bindings/qmf2/python/ cpp/bindings/qmf2...
Date Fri, 21 Oct 2011 01:20:13 GMT

Propchange: qpid/branches/QPID-2519/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 01:19:00 2011
@@ -2,6 +2,3 @@
 /qpid/branches/0.6-release-windows-installer:926803
 /qpid/branches/0.6-release-windows-installer/qpid:926803,927233
 /qpid/branches/java-network-refactor/qpid:805429-825319
-/qpid/branches/qpid-2935/qpid:1061302-1072333
-/qpid/branches/qpid-3346/qpid:1144319-1179855
-/qpid/trunk/qpid:1072051-1185907

Modified: qpid/branches/QPID-2519/KEYS
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/KEYS?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/KEYS (original)
+++ qpid/branches/QPID-2519/KEYS Fri Oct 21 01:19:00 2011
@@ -371,58 +371,3 @@ EAAKCRCFx21QqdfQx+2MAKDPilVZy0YNhW5fIvA/
 jvJP5xcF6/EBpys=
 =Wc+j
 -----END PGP PUBLIC KEY BLOCK-----
-pub   4096R/C6B459DB 2011-07-18
-uid                  Justin Ross (CODE SIGNING KEY) <jross@apache.org>
-sub   4096R/95BB2C1A 2011-07-18
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-mQINBE4kjewBEADSfPSpx+dZqdopNR8h/QG6jFDL9stuTQkLN0y9VEo+PEX4wzR6
-npzxcjVZF0ZBGOZl6DT3/SgmOZtFtnH5nb3ebpFEaalktyC9K4rFad4QW3mez7+x
-Slsb6DEx0l6PFU9FM97RI7MLMfkkYuAsWqO1kDdLaY7XeFg0a05OA0d/i7qCl5fR
-rAmCKM80SDM23DToWWEVP3Pw8ZYl8KNjc2aTiov/2VdMRZgldJr4EpAkPWk88qGu
-s9otP5tKu+aQA/ub6myF295uBtdycvq2DkLUSStSPripADjBcsNswBfITr5inuuQ
-g4mIF8pzkRajud4ahZe8mi1hE4K2eyPc2a5Yj1gXM6MPsuNSieSiwlIfj3u+0dRX
-74PZzCbPPmmveVWXBFbHBPZs9BwDUBint+1QRk5b0xi3uV/YUuciHQPdjXBcFo8y
-fPeZv6vkPHlozXW+wnS7XZqz06fObFPGjpOsTXSiFzd/+9Ecav3tDY7z6UvzRqpN
-dU7x0SskEBaU3CS6Av2as5mJ4psaYspSk8goo71JrGZS8hZdALkn6Q6exb1BSEXL
-O06N6niNxEf97KAbKvdByfmGMCuombF7My/CwkD6tbhIFO+mGga0AHYkE/F9s3o+
-gWEk/Rfx0jgkiMZWaQqJUYM6XRkNiKjR/QYjbo3eIibCxX8PfKg2iG/tdQARAQAB
-tDFKdXN0aW4gUm9zcyAoQ09ERSBTSUdOSU5HIEtFWSkgPGpyb3NzQGFwYWNoZS5v
-cmc+iQI4BBMBAgAiBQJOJI3sAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
-CRBkio5XxrRZ2xBpEACS45v7yMgqFzMEAdTb7uOZ6ibZSBD83Xhgraq0Deygt5aZ
-zglcegfHufVKC7jmGtWcKYrJ5zwPcclmAut4mc7akPUZYmeSKAcDPhysswvf4vm9
-lNxzwnT83S2bCALK67kj1M2K+U56hP49jCYWCYhoAIb2yRffO/x8EZDmN388Z3ki
-6wuD/bfhGKXig04njeWhdJz4asKifbORec4z8R2wIqiOfBy+ObZzQjtXq8CWb2VR
-cz0vVQGUCLdD3W2XKryxgzWoJlybCF2+XAx1GJ/zQ/6TDLm2P1kVX285/pcOVAUM
-Ca1IHf70z1SOjAI7KfH9ewgZoMJMqIauDxf2YNejntj9tyd5i4i1h1upeDD7mI79
-c1kBZfYDDJhqlbgPfSnBX46xEXY2Vh9hHmIeLzNpaMQhGgFVwLKQdNOjDN4WcaoV
-pKQf/ZZ6dzBkzTZni7j11DxIgCIu64qgzqlBI2xYmxNzkF/1hVVkHsrZ82TpFcKM
-ejmq3NKtQMvt9TeJwRe+NVdF19bpszk7FnxYWfiokP7SJcjBDnuXah8ScEk2Fa3D
-Q41Rpg3q6e3Gc7ehfhZsUNlstQ/zEVfg3Dj9lkkMm2Jx13S+bHobgXbNIG23Kv+N
-vfKqtoRKrJwujgdy0KgyeMUSTYKVxgjK9nbOZtNbFMn0rYTnKjdTt//DzZ5We7kC
-DQROJI3sARAA2wHTgOEYWLHhJPOzuM5nEnPTMTTSymo31dePqUEGM/5Gxcl+GXwK
-0RCvV4Hlaju7fR8SB2wbVqZDRACqynw7aSGxr327ebvCOKc/9d5R9aK2qRisoN9b
-wIq2IzboLDC8PKEZsFyOUcEirt0q8k05cC8S9nx5LG5ddeIcIyXwKUYLLgOeUgre
-Drzm2R+6N28C1AcXL7V8pDEfy5sd1tslMsV9khtF1hqxaW9nRKt/7qGsI+ALmwyz
-QwV54GPLs1LUJX7vlEbl3gUbmrgdCk1eYP/KloZJFMlwgB+EUoWFrboy+BAxUBwJ
-xk4y+Dqu9GLnNYo8MrTvL6QAFdoscAPFThZRndQ/MfOvCNz/0Yima7AKOPoQXDFB
-zhjR8lv8A12mmnegHpkV9P4isT6c5Tc5TPbCBqnOId2buLm2V7f3kgH5dPgPEO0z
-P3SPe39mJNSLWtrqpi89EQI+cD/JhyemgTNJOYqjLnnrsyaPXYClVR05nW3g7Bmh
-9UO/5L82Mi8LFZXFO23L/JRvpvh529f7fPpMv4KiJiU5Gc2LJ3/HAYDIp/4q3ETF
-TboPEAP7WW0BLVkl37LkhJ/uD7/COFlTolgsNqtIZtRr6m8/PeLPYXfOwKNSmhz2
-CqW7RSIiyqwdFtyfyR0RpDAYissaRpMgqU/6r49OsZIOLImkJI33M7sAEQEAAYkC
-HwQYAQIACQUCTiSN7AIbDAAKCRBkio5XxrRZ20o4EACnL2xNHpRZQm4L+qB/Lanz
-2GONIKqdFzRls/6WlqOS+/loylorF3hVo8aJe13bJtf8LIoBTViFUq8BCBEb1Q3S
-qmmlzfiMeTZtCK9WbfqC07iEe/KUNmxjA/ZR6sE9x8Pe+QI0mnXZBKHexLsjdpav
-hdwHi5EmAE8gEiY7PwbJmxq+JXxKWrhyPscn3TIQrs6F+0KMs61XVPsflN0Tfzvf
-7hJ8Zn7HGjGsa+g6XmiEoZMDWwZDQVZby+g95EE9iyAwT6tlNqNGgHS8QKL9zFo0
-cxCntJYMQhYHKsd744Tfq01i3EEFIUMqGc/md0Ra/E5bG563VfbvBOpDobiX1KX1
-wRIMo5StjjFVzZj7Zyj73ALSQ5mfSvzJqsXRYpoPdy6bHJj3nSBrswpjpl+WsVOR
-oe6o73mM3CB6r10YMITa+aEmSQGAFSwajpDAfqbSQRbIGq0K+hqyCMzZ7qqv2b0+
-U1N6jUaWBFLMNiti+jw6TRUcdQstagb6qYqpF5MQ+NU7ddxNgIiRByeoFR9vMIfT
-wFtVHi7IN8OM6rvshjc/rmOEiSPCULSvpI1vq14MfRAWfyeqkxrvuklbdMOeJwSP
-U6nOKyS2R4/y+0s1J85amn4YHTUhOHYRnQAEckX8DB0UtCP15FSmrN3aOBp7hbvm
-MxumwmEHVDFpDpKCCnJa9A==
-=Uryx
------END PGP PUBLIC KEY BLOCK-----

Modified: qpid/branches/QPID-2519/LICENSE
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/LICENSE?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/LICENSE (original)
+++ qpid/branches/QPID-2519/LICENSE Fri Oct 21 01:19:00 2011
@@ -1,5 +1,7 @@
 Please see the individual LICENSE files for each language
 cpp/LICENSE
+dotnet/LICENSE.txt
 gentools/lib/LICENSE
 java/resources/LICENSE
 python/LICENSE.txt
+ruby/LICENSE.txt

Modified: qpid/branches/QPID-2519/NOTICE
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/NOTICE?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/NOTICE (original)
+++ qpid/branches/QPID-2519/NOTICE Fri Oct 21 01:19:00 2011
@@ -1,6 +1,8 @@
 Please see the individual NOTICE files for each language:
 
 cpp/NOTICE
+dotnet/NOTICE.txt
 gentools/lib/NOTICE
 java/resources/NOTICE
 python/NOTICE.txt
+ruby/NOTICE.txt

Modified: qpid/branches/QPID-2519/QPID_VERSION.txt
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/QPID_VERSION.txt?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/QPID_VERSION.txt (original)
+++ qpid/branches/QPID-2519/QPID_VERSION.txt Fri Oct 21 01:19:00 2011
@@ -1 +1 @@
-0.13
+0.9

Modified: qpid/branches/QPID-2519/README.txt
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/README.txt?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/README.txt (original)
+++ qpid/branches/QPID-2519/README.txt Fri Oct 21 01:19:00 2011
@@ -36,10 +36,22 @@ Python Client Libraries
 
   ./python
 
+Ruby Client Libraries
+
+  ./ruby
+
+.NET Client Libraries
+
+  ./dotnet
+
 WCF Support
 
   ./wcf
 
+Messaging Client (implemented in Ruby):
+
+  ./ruby
+
 Management Tools (implemented in Python):
 
   ./tools
@@ -54,4 +66,4 @@ Documentation:
 
 
 Further information about the organization of Qpid source components may
-be found in ./doc/dev-readme/QPID-Component-README.pdf.
+be found in ./doc/dev-readme/QPID-0.8-Component-README.pdf.

Modified: qpid/branches/QPID-2519/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/bin/release.sh?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/bin/release.sh (original)
+++ qpid/branches/QPID-2519/bin/release.sh Fri Oct 21 01:19:00 2011
@@ -41,8 +41,6 @@ usage()
     echo "--ruby  |-r : Generate the ruby artefacts"
     echo "--python|-p : Generate the python artefacts"
     echo "--wcf   |-w : Generate the WCF artefacts"
-    echo "--tools |-t : Generate the tools artefacts"
-    echo "--qmf   |-q : Generate the QMF artefacts"
     echo "--source|-e : Generate the source artefact"
     echo "--sign  |-s : Sign generated artefacts"
     echo "--upload|-u : Upload the artifacts directory to people.apache.org as qpid-\$VER"
@@ -76,11 +74,11 @@ for arg in $* ; do 
  ;;
  --all|-a)
    CPP="CPP"
+   DOTNET="DOTNET"
    JAVA="JAVA"
+   RUBY="RUBY"
    PYTHON="PYTHON"
    WCF="WCF"
-   TOOLS="TOOLS"
-   QMF="QMF"
    SOURCE="SOURCE"
  ;;
  --cpp|-c)
@@ -101,12 +99,6 @@ for arg in $* ; do 
  --wcf|-w)
    WCF="WCF"
  ;;
- --tools|-t)
-   TOOLS="TOOLS"
- ;;
- --qmf|-q)
-   QMF="QMF"
- ;;
  --source|-e)
    SOURCE="SOURCE"
  ;;
@@ -226,8 +218,8 @@ if [ "JAVA" == "$JAVA" ] ; then
   cp qpid-${VER}/java/management/eclipse-plugin/release/*.tar.gz qpid-${VER}/java/management/eclipse-plugin/release/*.zip artifacts/
 
   # copy the Maven artifacts
-  cp -a qpid-${VER}/java/client/release/maven artifacts/
-  cp -a qpid-${VER}/java/common/release/maven artifacts/
+  cp qpid-${VER}/java/client/release/maven artifacts/
+  cp qpid-${VER}/java/common/release/maven artifacts/
 fi
 
 if [ "DOTNET" == "$DOTNET" ] ; then
@@ -247,26 +239,6 @@ if [ "DOTNET" == "$DOTNET" ] ; then
   cp qpid-${VER}/dotnet/client-010/bin/mono-2.0/debug/*.zip artifacts/qpid-dotnet-0-10-${VER}.zip
 fi
 
-if [ "TOOLS" = "$TOOLS" ] ; then
-    pushd qpid-${VER}/tools
-
-    python setup.py sdist
-    
-    popd
-
-    cp qpid-${VER}/tools/dist/*.tar.gz artifacts/qpid-tools-${VER}.tar.gz
-fi
-
-if [ "QMF" = "$QMF" ]; then
-    pushd qpid-${VER}/extras/qmf
-
-    python setup.py sdist
-
-    popd
-
-    cp qpid-${VER}/extras/qmf/dist/*.tar.gz artifacts/qpid-qmf-${VER}.tar.gz
-fi
-
 if [ "SIGN" == "$SIGN" ] ; then
   pushd artifacts
   sha1sum *.zip *.gz *.svnversion > SHA1SUM

Modified: qpid/branches/QPID-2519/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/CMakeLists.txt?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/CMakeLists.txt (original)
+++ qpid/branches/QPID-2519/cpp/CMakeLists.txt Fri Oct 21 01:19:00 2011
@@ -80,7 +80,6 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpi
 add_subdirectory(managementgen)
 add_subdirectory(etc)
 add_subdirectory(src)
-add_subdirectory(bindings/qpid)
 add_subdirectory(docs/api)
 # add_subdirectory(docs/man)
 add_subdirectory(examples)

Modified: qpid/branches/QPID-2519/cpp/INSTALL
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/INSTALL?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/INSTALL (original)
+++ qpid/branches/QPID-2519/cpp/INSTALL Fri Oct 21 01:19:00 2011
@@ -47,9 +47,9 @@ Redhat Linux 3, will almost certainly re
 ====================
 The following libraries and header files must be installed to build
 a source distribution:
- * boost      <http://www.boost.org>                    (1.35)(*)
- * libuuid    <http://kernel.org/~kzak/util-linux/>     (2.19)
- * pkgconfig  <http://pkgconfig.freedesktop.org/wiki/>  (0.21)
+ * boost      <http://www.boost.org>                   	(1.35)(*)
+ * e2fsprogs  <http://e2fsprogs.sourceforge.net/>      	(1.39)
+ * pkgconfig  <http://pkgconfig.freedesktop.org/wiki/> 	(0.21)
 
 (*) earlier versions of boost e.g. 1.33 also work and there is a patch
 to get 1.32 working in the svn tree though that is only recommended as
@@ -96,12 +96,12 @@ the following must also be installed:
  * python-devel
  * swig       <http://www.swig.org>                     (1.3.35)
  
-UUID problems: 
-In some earlier Linux releases (such as Fedora 11), the uuid/uuid.h
-file is located in the e2fsprogs-devel package instead of
-libuuid-devel. If you are using an older Linux release and run into a
-problem during configure in which uuid.h cannot be found, install the
-e2fsprogs-devel package.
+UUID problems:
+In some later Linux releases (such as Fedora 12), the uuid/uuid.h file has been
+moved from e2fsprogs-devel into libuuid-devel. If you are using a newer Linux
+release and run into a problem during configure in which uuid.h cannot be found,
+look for and install the libuuid-devel package.
+
 
 2.2. How to Install
 ===================
@@ -112,7 +112,7 @@ e2fsprogs-devel package.
 On linux most packages can be installed using your distribution's
 package management tool. For example on Fedora:
 
- # yum install boost-devel libuuid-devel pkgconfig gcc-c++ make autoconf automake ruby libtool help2man doxygen graphviz
+ # yum install boost-devel e2fsprogs-devel pkgconfig gcc-c++ make autoconf automake ruby libtool help2man doxygen graphviz
 
 The optional clustering packages changed name in Fedora 10. On Fedora 9 or earlier:
  # yum install openais-devel cman-devel

Modified: qpid/branches/QPID-2519/cpp/INSTALL-WINDOWS
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/INSTALL-WINDOWS?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/INSTALL-WINDOWS (original)
+++ qpid/branches/QPID-2519/cpp/INSTALL-WINDOWS Fri Oct 21 01:19:00 2011
@@ -64,7 +64,7 @@ manually installed to non-standard locat
 It is also necessary to set BOOST_ROOT to refer to the base of your Boost
 installation. The Visual Studio projects refer to it. For example:
 
- # set BOOST_ROOT="C:\Program Files\boost\boost_1_35_0"
+ # set BOOST_ROOT=C:\Program Files\boost\boost_1_35_0
 
 
 3. Building from a Source Distribution
@@ -75,7 +75,7 @@ Visual Studio solution file which is gen
 From a command prompt:
 
  # cd qpid\cpp
- # cmake -i -G "Visual Studio 9 2008" .
+ # cmake -i
 
 Output from CMake includes .h files in the include directory, .vcproj
 files for executables and dlls, and the qpid-cpp.sln solution file.
@@ -120,12 +120,7 @@ files that are part of the build. 
   Configure again. Repeat until all the Cache Values are gray.
 - Click the OK button to generate the project/make files.
 
-Open the qpid-cpp.sln solution located in the build directory, select Debug
-or Release, and build. You can build both Release and Debug from the same
-project.
-
-If you build all the projects you can then "Build" the RUN_TESTS project.
-This will run the test suite against the Qpid version just built.
+Now follow instruction for building from a source distribution in step (3).
 
 
 5. Tests

Modified: qpid/branches/QPID-2519/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/Makefile.am Fri Oct 21 01:19:00 2011
@@ -33,7 +33,3 @@ SUBDIRS = managementgen etc src docs/api
 # Update libtool, if needed.
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
-
-check-long: all
-	$(MAKE) -C src/tests check-long
-	
\ No newline at end of file

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf/python/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf/python/Makefile.am Fri Oct 21 01:19:00 2011
@@ -30,13 +30,11 @@ BUILT_SOURCES = $(generated_file_list)
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
-	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
+	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _qmfengine.la
-qenginedir = $(pyexecdir)
-qengine_PYTHON = qmfengine.py qmf.py
 
 #_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
 #_qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".so"

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf/ruby/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf/ruby/Makefile.am Fri Oct 21 01:19:00 2011
@@ -35,9 +35,9 @@ qmfengine.cpp: $(srcdir)/ruby.i $(srcdir
 rubylibarchdir = $(RUBY_LIB_ARCH)
 rubylibarch_LTLIBRARIES = qmfengine.la
 
-qmfengine_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
+qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
 qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfengine.la
-qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
+qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
 nodist_qmfengine_la_SOURCES = qmfengine.cpp
 
 CLEANFILES = qmfengine.cpp

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf/tests/test_base.rb
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf/tests/test_base.rb?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf/tests/test_base.rb (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf/tests/test_base.rb Fri Oct 21 01:19:00 2011
@@ -24,7 +24,6 @@ require 'socket'
 
 class ConsoleTestBase < Qmf::ConsoleHandler
   def initialize
-    sleep(2)
     @settings = Qmf::ConnectionSettings.new
     @settings.host = ARGV[0] if ARGV.size > 0
     @settings.port = ARGV[1].to_i if ARGV.size > 1
@@ -68,7 +67,7 @@ class ConsoleTestBase < Qmf::ConsoleHand
 
   def assert(condition, in_text=nil)
     text = " (#{in_text})" if in_text
-    raise "Assertion failed: #{condition} #{text}" unless condition
+    raise "Assertion failed: #{left} != #{right}#{text}" unless condition
   end
 
   def fail(text)

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf2/examples/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf2/examples/cpp/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf2/examples/cpp/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf2/examples/cpp/Makefile.am Fri Oct 21 01:19:00 2011
@@ -21,7 +21,7 @@ INCLUDE = -I$(top_srcdir)/include
 
 AM_CPPFLAGS = $(INCLUDE)
 
-noinst_PROGRAMS=agent event_driven_list_agents list_agents print_events
+noinst_PROGRAMS=agent list_agents print_events
 
 agent_SOURCES=agent.cpp
 agent_LDADD=$(top_builddir)/src/libqmf2.la
@@ -29,8 +29,5 @@ agent_LDADD=$(top_builddir)/src/libqmf2.
 list_agents_SOURCES=list_agents.cpp
 list_agents_LDADD=$(top_builddir)/src/libqmf2.la
 
-event_driven_list_agents_SOURCES=event_driven_list_agents.cpp
-event_driven_list_agents_LDADD=$(top_builddir)/src/libqmf2.la
-
 print_events_SOURCES=print_events.cpp
 print_events_LDADD=$(top_builddir)/src/libqmf2.la

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf2/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf2/python/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf2/python/Makefile.am Fri Oct 21 01:19:00 2011
@@ -30,12 +30,12 @@ BUILT_SOURCES = $(generated_file_list)
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
-	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
+	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _cqmf2.la
-cqpiddir = $(pyexecdir)
+cqpiddir = $(pythondir)
 cqpid_PYTHON = qmf2.py cqmf2.py
 
 _cqmf2_la_LDFLAGS = -avoid-version -module -shared

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf2/qmf2.i
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf2/qmf2.i?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf2/qmf2.i (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf2/qmf2.i Fri Oct 21 01:19:00 2011
@@ -37,7 +37,6 @@
 
 %}
 
-%include <qpid/ImportExport.h>
 %include <qpid/messaging/ImportExport.h>
 %include <qpid/messaging/Duration.h>
 

Modified: qpid/branches/QPID-2519/cpp/bindings/qmf2/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qmf2/ruby/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qmf2/ruby/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qmf2/ruby/Makefile.am Fri Oct 21 01:19:00 2011
@@ -34,9 +34,9 @@ rubylibarchdir = $(RUBY_LIB_ARCH)
 rubylibarch_LTLIBRARIES = cqmf2.la
 dist_rubylib_DATA = qmf2.rb
 
-cqmf2_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
+cqmf2_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
 cqmf2_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqmf2 $(top_builddir)/src/libqmf2.la
-cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
+cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
 nodist_cqmf2_la_SOURCES = cqmf2.cpp
 
 CLEANFILES = cqmf2.cpp

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/Makefile.am Fri Oct 21 01:19:00 2011
@@ -21,7 +21,7 @@ SUBDIRS = dotnet
 
 if HAVE_SWIG
 
-EXTRA_DIST = CMakeLists.txt qpid.i
+EXTRA_DIST = qpid.i
 
 if HAVE_RUBY_DEVEL
 SUBDIRS += ruby

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/configure-windows.ps1
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/configure-windows.ps1?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/configure-windows.ps1 (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/configure-windows.ps1 Fri Oct 21 01:19:00 2011
@@ -24,32 +24,29 @@
 # This script configures a qpid\cpp developer build environment under Windows
 # to enable working with cpp\bindings\qpid\dotnet binding source code.
 #
-# * Supports multiple versions of Visual Studio (VS2008, VS2010) as CMake
-#   generator.
-#
 # * Supports 32-bit and/or 64-bit development platforms.
 #
 # * User chooses in-source or out-of-source build directories.
 #
 #     - 'In-source' builds happen when CMake is run from directory qpid\cpp.
-#       Hundreds of CMake-generated output files are placed in qpid\cpp\src.
+#       Hundreds of CMake-generated output files are placed in qpid\cpp\src. 
 #       These files go right on top of files that are part of the source tree
 #       in qpid\cpp\src.
-#       In-source builds support only one platform.
+#       In-source builds support only one platform. 
 #       Choose only a 32-bit or a 64-bit platform but not both.
 #
 #     - Out-of-source builds happen when the user chooses another directory
 #       under qpid in which to run CMake. Out-of-source builds are required
-#       in order to build both x86 and x64 targets using the same source tree.
+#       in order to build both x86 and x64 targets using the same source tree. 
 #       For each build platform (32-bit x86 or Win32, or 64-bit x64) the user
-#       specifies a build directory and a specific version of Boost.
+#       specifies a build directory and a specific version of Boost. 
 #       Many platform/Boost-version directories may reside side by side.
 #
 # * User chooses to run CMake or not.
 #
 #     - When a new build directory is created then the user is given the
-#       option of running CMake in that directory. Running CMake is a
-#       necessary step as CMake creates important source, solution, and
+#       option of running CMake in that directory. Running CMake is a 
+#       necessary step as CMake creates important source, solution, and 
 #       project files.
 #
 #     - If a directory "looks like" is has already had CMake run in it
@@ -66,7 +63,7 @@
 #  3. CMake 2.8 (or later) must be installed. The cmake\bin directory
 #     must be in the user's path.
 #  4. Boost library specifications may or may not be in the user's path.
-#     The script author recommeds not to have Boost in the path and only
+#     The script author recommeds not to have Boost in the path and only 
 #     allow the Boost path to be specified by generated command procedures.
 #  5. Visual Studio build environment must be installed.
 #
@@ -93,7 +90,7 @@
 #  In this example the build dirs are new. The script will prompt
 #  asking if CMake is to run in the build directories. User chooses Yes.
 #
-#  Now this script runs CMake twice, once each with the 32-bit and 64-bit
+#  Now this script runs CMake twice, once each with the 32-bit and 64-bit 
 #  generators.
 #  * This step creates qpid-cpp.sln and related project files.
 #      C:\svn\qpid\build32\qpid-cpp.sln
@@ -110,7 +107,7 @@
 #   C:\svn\qpid\build64\setenv-messaging-x64-64bit.bat
 #
 #  Next the user compiles solution qpid\build32\qpid-cpp.sln.
-#
+#  
 # Using the generated scripts:
 #
 # Case 1. Run an executable in 32-bit mode.
@@ -145,11 +142,6 @@ $global:txtPath = '$env:PATH'
 $global:txtQR   = '$env:QPID_BUILD_ROOT'
 $global:txtWH   = 'Write-Host'
 
-#############################
-# Visual Studio version selection dialog items and choice
-#
-[array]$global:VsVersionCmakeChoiceList = "Visual Studio 10", "Visual Studio 9 2008"
-$global:cmakeGenerator = ''
 
 #############################
 # Select-Folder
@@ -176,7 +168,7 @@ function AskYesOrNo ($Question="No quest
            [Windows.Forms.MessageBoxIcon]::Question)
 
     $result = $dlg -eq [Windows.Forms.DialogResult]::Yes
-
+    
     $result
 }
 
@@ -196,7 +188,7 @@ function SanityCheckBoostPath ($path=0)
 
         $toTest = ('include', 'lib')
         foreach ($pattern in $toTest) {
-            $target = Join-Path $path $pattern
+        	$target = Join-Path $path $pattern
             if (!(Test-Path -path $target)) {
                 $result = $false
             }
@@ -204,7 +196,7 @@ function SanityCheckBoostPath ($path=0)
     } else {
         $result = $false
     }
-
+    
     if (! $result) {
         Write-Host "The path ""$displayPath"" does not appear to be a Boost root path."
     }
@@ -227,7 +219,7 @@ function SanityCheckBuildPath ($path=0)
         $toTest = ('CMakeFiles', 'docs', 'etc', 'examples', 'include',
                    'managementgen', 'src')
         foreach ($pattern in $toTest) {
-            $target = Join-Path $path $pattern
+        	$target = Join-Path $path $pattern
             if (!(Test-Path -path $target)) {
                 $result = $false
             }
@@ -321,7 +313,7 @@ function WriteDotnetBindingEnvSetupBat
 
     $out = @("@ECHO OFF
 REM
-REM Call this command procedure from a command prompt to set up a $vsPlatform ($nBits-bit)
+REM Call this command procedure from a command prompt to set up a $vsPlatform ($nBits-bit) 
 REM $slnName environment
 REM
 REM     > call $outfileName
@@ -337,56 +329,6 @@ ECHO Environment set for $slnName $vsPla
     $out | Out-File "$buildRoot\$outfileName" -encoding ASCII
 }
 
-#############################
-# Return the SelectedItem from the dropdown list and close the form.
-#
-function Return-DropDown {
-    if ($DropDown.SelectedItem -ne $null) {
-        $global:cmakeGenerator = $DropDown.SelectedItem.ToString()
-    	$Form.Close()
-        Write-Host "Selected generator: $global:cmakeGenerator"
-    }
-}
-
-#############################
-# Create the CMake generator form and launch it
-#
-function SelectCMakeGenerator {
-
-    $Form = New-Object System.Windows.Forms.Form
-
-    $Form.width = 350
-    $Form.height = 150
-    $Form.Text = ”Select CMake Generator”
-
-    $DropDown          = new-object System.Windows.Forms.ComboBox
-    $DropDown.Location = new-object System.Drawing.Size(120,10)
-    $DropDown.Size     = new-object System.Drawing.Size(150,30)
-
-    ForEach ($Item in $global:VsVersionCmakeChoiceList) {
-    	$DropDown.Items.Add($Item)
-    }
-    $DropDown.SelectedIndex = 0
-
-    $Form.Controls.Add($DropDown)
-
-    $DropDownLabel          = new-object System.Windows.Forms.Label
-    $DropDownLabel.Location = new-object System.Drawing.Size(10,10)
-    $DropDownLabel.size     = new-object System.Drawing.Size(100,20)
-    $DropDownLabel.Text     = "CMake generators"
-    $Form.Controls.Add($DropDownLabel)
-
-    $Button          = new-object System.Windows.Forms.Button
-    $Button.Location = new-object System.Drawing.Size(120,50)
-    $Button.Size     = new-object System.Drawing.Size(120,20)
-    $Button.Text     = "Select a generator"
-    $Button.Add_Click({Return-DropDown})
-    $form.Controls.Add($Button)
-
-    $Form.Add_Shown({$Form.Activate()})
-    $Form.ShowDialog()
-}
-
 
 #############################
 # Main
@@ -399,12 +341,6 @@ function SelectCMakeGenerator {
 [string] $cppDir   = Resolve-Path (Join-Path $curDir "..\..\..")
 
 [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
-[System.Reflection.Assembly]::LoadWithPartialName("System.Drawing")       | Out-Null
-
-#############################
-# User dialog to select a version of Visual Studio as CMake generator
-#
-SelectCMakeGenerator
 
 #############################
 # User dialog to get optional 32-bit boost and build paths
@@ -476,7 +412,7 @@ if ($make32) {
     $env:BOOST_ROOT = "$boost32"
     cd "$build32"
     Write-Host "Running 32-bit CMake in $build32 ..."
-    CMake -G "$global:cmakeGenerator" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir
+    CMake -G "Visual Studio 9 2008" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir
 } else {
     Write-Host "Skipped 32-bit CMake."
 }
@@ -488,7 +424,7 @@ if ($make64) {
     $env:BOOST_ROOT = "$boost64"
     cd "$build64"
     Write-Host "Running 64-bit CMake in $build64"
-    CMake -G "$global:cmakeGenerator Win64" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir
+    CMake -G "Visual Studio 9 2008 Win64" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir
 } else {
     Write-Host "Skipped 64-bit CMake."
 }
@@ -501,7 +437,7 @@ if ($make64) {
 if ($defined32) {
 
     Write-Host "Writing 32-bit scripts..."
-
+    
     ###########
     # Powershell script to launch org.apache.qpid.messaging.sln
     #
@@ -512,8 +448,8 @@ if ($defined32) {
                                       -vsPlatform "x86" `
                                            -nBits "32" `
                                      -outfileName "start-devenv-messaging-x86-32bit.ps1"
-
-
+                                     
+    
     ###########
     # Batch script (that you doubleclick) to launch powershell script
     # that launches org.apache.qpid.messaging.sln.
@@ -546,7 +482,7 @@ if ($defined32) {
 if ($defined64) {
 
     Write-Host "Writing 64-bit scripts..."
-
+    
     ###########
     # Powershell script to launch org.apache.qpid.messaging.sln
     #
@@ -557,8 +493,8 @@ if ($defined64) {
                                       -vsPlatform "x64" `
                                            -nBits "64" `
                                      -outfileName "start-devenv-messaging-x64-64bit.ps1"
-
-
+                                     
+    
     ###########
     # Batch script (that you doubleclick) to launch powershell script
     # that launches org.apache.qpid.messaging.sln.

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -7,9 +7,9 @@
  * 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
@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("csharp.direct.receiver")]
@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.direct.receiver")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -7,9 +7,9 @@
  * 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
@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("csharp.direct.sender")]
@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.direct.sender")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -20,7 +20,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("csharp.map.callback.receiver")]
@@ -28,12 +28,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.map.callback.receiver")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -43,11 +43,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.map.callback.sender")]
-[assembly: AssemblyCopyright("Copyright 2010")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -7,9 +7,9 @@
  * 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
@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("csharp.map.receiver")]
@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.map.receiver")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -7,9 +7,9 @@
  * 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
@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("csharp.map.sender")]
@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("csharp.map.sender")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb Fri Oct 21 01:19:00 2011
@@ -6,9 +6,9 @@
 ' 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
@@ -21,34 +21,34 @@ Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
-' General Information about an assembly is controlled through the following
+' 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.
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("visualbasic.example.client")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("visualbasic.example.client")>
-<Assembly: AssemblyCopyright("Copyright 2011")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTitle("visualbasic.example.client")> 
+<Assembly: AssemblyDescription("")> 
+<Assembly: AssemblyCompany("Microsoft")> 
+<Assembly: AssemblyProduct("visualbasic.example.client")> 
+<Assembly: AssemblyCopyright("Copyright © Microsoft 2010")> 
+<Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
 
 'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("ec9df8cf-c1d4-4938-9e72-93fb81d55700")>
+<Assembly: Guid("ec9df8cf-c1d4-4938-9e72-93fb81d55700")> 
 
 ' Version information for an assembly consists of the following four values:
 '
 '      Major Version
-'      Minor Version
+'      Minor Version 
 '      Build Number
 '      Revision
 '
-' You can specify all the values or you can default the Build and Revision Numbers
+' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")>
+' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.0.0")> 

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln Fri Oct 21 01:19:00 2011
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-#
+# 
 # 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
@@ -8,9 +8,9 @@ Microsoft Visual Studio Solution File, F
 # 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

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.cpp Fri Oct 21 01:19:00 2011
@@ -141,7 +141,7 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor look-alike (C#)
+    // copy constructor
     Address::Address(const Address ^ address)
     {
         System::Exception ^ newException = nullptr;
@@ -163,28 +163,6 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Address::Address(const Address % address)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            addressp = new ::qpid::messaging::Address(
-                        *(const_cast<Address %>(address).NativeAddress));
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
     // unmanaged clone
     Address::Address(const ::qpid::messaging::Address & addrp)
     {

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Address.h Fri Oct 21 01:19:00 2011
@@ -64,7 +64,6 @@ namespace Messaging {
 
         // copy constructor
         Address(const Address ^ address);
-        Address(const Address % address);
 
         // unmanaged clone
         Address(const ::qpid::messaging::Address & addrp);

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.cpp Fri Oct 21 01:19:00 2011
@@ -114,7 +114,7 @@ namespace Messaging {
     }
 
 
-    // Copy constructor look-alike (C#)
+    // Copy constructor
     Connection::Connection(const Connection ^ connection)
     {
         System::Exception ^ newException = nullptr;
@@ -136,28 +136,6 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Connection::Connection(const Connection % connection)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            connectionp = new ::qpid::messaging::Connection(
-                        *(const_cast<Connection %>(connection).NativeConnection));
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
 
     // Destructor
     Connection::~Connection()

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Connection.h Fri Oct 21 01:19:00 2011
@@ -56,7 +56,6 @@ namespace Messaging {
 
         // copy constructor
         Connection(const Connection ^ connection);
-        Connection(const Connection % connection);
 
 		// unmanaged clone
 		// not defined

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Duration.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Duration.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Duration.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Duration.h Fri Oct 21 01:19:00 2011
@@ -81,17 +81,7 @@ namespace Messaging {
             Duration ^ result = gcnew Duration(multiplier * dur->Milliseconds);
             return result;
         }
-
-        static bool operator == (Duration ^ a, Duration ^ b)
-        {
-            return a->Milliseconds == b->Milliseconds;
-        }
-
-        static bool operator != (Duration ^ a, Duration ^ b)
-        {
-            return a->Milliseconds != b->Milliseconds;
-        }
-};
+	};
 
     public ref class DurationConstants sealed
     {

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h Fri Oct 21 01:19:00 2011
@@ -54,7 +54,6 @@ namespace Messaging {
 
         // copy constructor
         FailoverUpdates(const FailoverUpdates ^ failoverUpdates) {}
-        FailoverUpdates(const FailoverUpdates % failoverUpdates) {}
 
         // assignment operator
         FailoverUpdates % operator=(const FailoverUpdates % rhs) 

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.cpp Fri Oct 21 01:19:00 2011
@@ -235,7 +235,7 @@ namespace Messaging {
         }
     }
 
-    // Copy constructor look-alike (C#)
+    // Copy constructor
     Message::Message(const Message ^ message)
     {
         System::Exception ^ newException = nullptr;
@@ -257,29 +257,7 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Message::Message(const Message % message)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            messagep = new ::qpid::messaging::Message(
-                        *(const_cast<Message %>(message).NativeMessage));
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
-    // Property
+	// Property
     void Message::SetProperty(System::String ^ name, System::Object ^ value)
     {
         System::Exception ^ newException = nullptr;

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Message.h Fri Oct 21 01:19:00 2011
@@ -71,7 +71,6 @@ namespace Messaging {
 
         // Copy constructor
         Message(const Message ^ message);
-        Message(const Message % message);
 
 	    // unmanaged clone
         Message(const ::qpid::messaging::Message & msgp);

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.cpp Fri Oct 21 01:19:00 2011
@@ -89,7 +89,7 @@ namespace Messaging {
     }
 
 
-    // Copy constructor look-alike (C#)
+    // Copy constructor
     Receiver::Receiver(const Receiver ^ receiver) :
         parentSession(receiver->parentSession)
     {
@@ -112,29 +112,6 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Receiver::Receiver(const Receiver % receiver) :
-        parentSession(receiver.parentSession)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            receiverp = new ::qpid::messaging::Receiver(
-                        *(const_cast<Receiver %>(receiver).NativeReceiver));
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
 
     //
     // Get(message)

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Receiver.h Fri Oct 21 01:19:00 2011
@@ -65,7 +65,6 @@ namespace Messaging {
 
         // copy constructor
         Receiver(const Receiver ^ receiver);
-        Receiver(const Receiver % receiver);
 
         // unmanaged clone
         // undefined

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.cpp Fri Oct 21 01:19:00 2011
@@ -84,7 +84,7 @@ namespace Messaging {
     }
 
 
-    // Copy constructor look-alike (C#)
+    // Copy constructor
     Sender::Sender(const Sender ^ sender)
         : parentSession(sender->parentSession)
     {
@@ -107,29 +107,6 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Sender::Sender(const Sender % sender)
-        : parentSession(sender.parentSession)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            senderp = new ::qpid::messaging::Sender(
-                        *(const_cast<Sender %>(sender).NativeSender));
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
 
     //
     // Send(msg)

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Sender.h Fri Oct 21 01:19:00 2011
@@ -62,7 +62,6 @@ namespace Messaging {
         
         // copy constructor
         Sender(const Sender ^ sender);
-        Sender(const Sender % sender);
 
         ~Sender();
         !Sender();

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.cpp?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.cpp (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.cpp Fri Oct 21 01:19:00 2011
@@ -89,7 +89,7 @@ namespace Messaging {
     }
 
 
-    // Copy constructor look-alike (C#)
+    // Copy constructor
     Session::Session(const Session ^ session)
         : parentConnectionp(session->parentConnectionp)
     {
@@ -113,30 +113,6 @@ namespace Messaging {
 		}
     }
 
-    // Copy constructor implicitly dereferenced (C++)
-    Session::Session(const Session % session)
-        : parentConnectionp(session.parentConnectionp)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            sessionp = new ::qpid::messaging::Session(
-                        *(const_cast<Session %>(session).NativeSession));
-          
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
 
     void Session::Close()
     {
@@ -248,31 +224,6 @@ namespace Messaging {
 		}
     }
 
-    void Session::AcknowledgeUpTo(Message ^ message)
-    {
-        AcknowledgeUpTo(message, false);
-    }
-
-    void Session::AcknowledgeUpTo(Message ^ message, bool sync)
-    {
-        System::Exception ^ newException = nullptr;
-
-        try 
-		{
-            sessionp->acknowledgeUpTo(*(message->NativeMessage), sync);
-        } 
-        catch (const ::qpid::types::Exception & error) 
-		{
-            String ^ errmsg = gcnew String(error.what());
-            newException    = gcnew QpidException(errmsg);
-        }
-
-		if (newException != nullptr) 
-		{
-	        throw newException;
-		}
-    }
-
     void Session::Reject(Message ^ message)
     {
         System::Exception ^ newException = nullptr;

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.h?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.h (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/src/Session.h Fri Oct 21 01:19:00 2011
@@ -69,7 +69,6 @@ namespace Messaging {
 
         // copy constructor
         Session(const Session ^ session);
-        Session(const Session % session);
 
         ~Session();
         !Session();
@@ -104,8 +103,6 @@ namespace Messaging {
         void Acknowledge(bool sync);
         void Acknowledge(Message ^ message);
         void Acknowledge(Message ^ message, bool sync);
-        void AcknowledgeUpTo(Message ^ message);
-        void AcknowledgeUpTo(Message ^ message, bool sync);
         void Reject(Message ^);
         void Release(Message ^);
         void Sync();

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs Fri Oct 21 01:19:00 2011
@@ -7,9 +7,9 @@
  * 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
@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("messaging.test")]
@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("messaging.test")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
 [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
+// 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)]
 
@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/client.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/client.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/client.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/client.pl Fri Oct 21 01:19:00 2011
@@ -20,13 +20,13 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use cqpid;
 
 my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
 my $connectionOptions =  ( @ARGV > 1 ) ? $ARGV[1] : ""; 
 
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
 $connection->open();
@@ -35,7 +35,7 @@ my $session = $connection->createSession
 my $sender = $session->createSender("service_queue");
 
 #create temp queue & receiver...
-my $responseQueue = new cqpid_perl::Address("#response-queue; {create:always, delete:always}");
+my $responseQueue = new cqpid::Address("#response-queue; {create:always, delete:always}");
 my $receiver = $session->createReceiver($responseQueue);
 
 #Now send some messages...
@@ -47,7 +47,7 @@ my @s = (
       "And the mome raths outgrabe."
      );
 
-my $request = new cqpid_perl::Message();
+my $request = new cqpid::Message();
 $request->setReplyTo($responseQueue);
 for (my $i=0; $i<4; $i++) {
     $request->setContent($s[$i]);

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/drain.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/drain.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/drain.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/drain.pl Fri Oct 21 01:19:00 2011
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use cqpid;
 use Getopt::Long;
 
 my $url = "127.0.0.1";
@@ -47,11 +47,11 @@ if ($#ARGV ge 0) {
 }
 
 sub getTimeout {
-   return ($forever) ? $cqpid_perl::Duration::FOREVER : new cqpid_perl::Duration($timeout*1000);
+   return ($forever) ? $cqpid::Duration::FOREVER : new cqpid::Duration($timeout*1000);
 }
 
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
     $connection->open();
@@ -59,13 +59,13 @@ eval {
     my $receiver = $session->createReceiver($address);
     my $timeout  = getTimeout();
 
-    my $message = new cqpid_perl::Message();
+    my $message = new cqpid::Message();
     my $i = 0;
 
     while($receiver->fetch($message, $timeout)) {
         print "Message(properties=" . $message->getProperties() . ",content='";
         if ($message->getContentType() eq "amqp/map") {
-            my $content = cqpid_perl::decodeMap($message);
+            my $content = cqpid::decodeMap($message);
             map{ print "\n$_ => $content->{$_}"; } keys %{$content};
         }
         else {
@@ -77,7 +77,7 @@ eval {
         if ($replyto->getName()) {
             print "Replying to " . $message->getReplyTo()->str() . "...\n";
             my $sender = $session->createSender($replyto);
-            my $response = new cqpid_perl::Message("received by the server.");
+            my $response = new cqpid::Message("received by the server.");
             $sender->send($response);
         }
         $session->acknowledge();

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_world.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_world.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_world.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_world.pl Fri Oct 21 01:19:00 2011
@@ -21,13 +21,13 @@ use strict;
 use warnings;
 use Data::Dumper;
 
-use cqpid_perl;
+use cqpid;
 
 my $broker            = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
 my $address           = ( @ARGV > 1 ) ? $ARGV[0] : "amq.topic";
 my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
 
-my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
+my $connection = new cqpid::Connection($broker, $connectionOptions);
 
 eval {
     $connection->open();
@@ -36,12 +36,12 @@ eval {
     my $receiver = $session->createReceiver($address);
     my $sender   = $session->createSender($address);
 
-    $sender->send(new cqpid_perl::Message("Hello world!"));
+    $sender->send(new cqpid::Message("Hello world!"));
 
-    #my $duration = new cqpid_perl::Duration(1000);
+    #my $duration = new cqpid::Duration(1000);
     #print ">>>" . $duration->getMilliseconds() . "\n";
 
-    my $message = $receiver->fetch($cqpid_perl::Duration::SECOND);
+    my $message = $receiver->fetch($cqpid::Duration::SECOND);
 
     #$message->setDurable(1);
     #print "Durable: " . $message->getDurable() . "\n";

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_xml.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_xml.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_xml.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/hello_xml.pl Fri Oct 21 01:19:00 2011
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use cqpid;
 
 my $broker            = ( @ARGV > 0 ) ? $ARGV[0] : "localhost:5672";
 my $connectionOptions = ( @ARGV > 1 ) ? $ARGV[1] : "";
@@ -44,7 +44,7 @@ x-bindings: [{ exchange: xml-exchange, k
 END
 
 
-my $connection = new cqpid_perl::Connection($broker, $connectionOptions);
+my $connection = new cqpid::Connection($broker, $connectionOptions);
 
 eval {
     $connection->open();
@@ -52,7 +52,7 @@ eval {
 
     my $receiver = $session->createReceiver($address);
     
-    my $message = new cqpid_perl::Message();
+    my $message = new cqpid::Message();
 
     my $content = <<END;
     <weather>

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_receiver.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_receiver.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_receiver.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_receiver.pl Fri Oct 21 01:19:00 2011
@@ -21,21 +21,21 @@ use strict;
 use warnings;
 use Data::Dumper;
 
-use cqpid_perl;
+use cqpid;
 
 my $url               = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
 my $address           = ( @ARGV > 1 ) ? $ARGV[0] : "message_queue; {create: always}";
 my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[1] : "";
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
     $connection->open();
     my $session  = $connection->createSession();
     my $receiver = $session->createReceiver($address);
 
-    my $content = cqpid_perl::decodeMap($receiver->fetch());
-    #my $content = cqpid_perl::decodeList($receiver->fetch());
+    my $content = cqpid::decodeMap($receiver->fetch());
+    #my $content = cqpid::decodeList($receiver->fetch());
    
     print Dumper($content);
 

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_sender.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_sender.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_sender.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/map_sender.pl Fri Oct 21 01:19:00 2011
@@ -21,13 +21,13 @@ use strict;
 use warnings;
 use Data::Dumper;
 
-use cqpid_perl;
+use cqpid;
 
 my $url               = ( @ARGV > 0 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
 my $address           = ( @ARGV > 1 ) ? $ARGV[1] : "message_queue; {create: always}";
 my $connectionOptions = ( @ARGV > 2 ) ? $ARGV[2] : "";
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
     $connection->open();
@@ -35,13 +35,13 @@ eval {
     my $session = $connection->createSession();
     my $sender  = $session->createSender($address);
 
-    my $message = new cqpid_perl::Message();
+    my $message = new cqpid::Message();
     my $content = { id   => 987654321, 
                     name => "Widget", 
                     percent => sprintf("%.2f", 0.99), 
                     colours => [ qw (red green white) ], 
                    };
-    cqpid_perl::encode($content, $message);
+    cqpid::encode($content, $message);
     $sender->send($message, 1);
 
     $connection->close();

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/server.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/server.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/server.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/server.pl Fri Oct 21 01:19:00 2011
@@ -20,13 +20,13 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use cqpid;
 
 my $url = ( @ARGV == 1 ) ? $ARGV[0] : "amqp:tcp:127.0.0.1:5672";
 my $connectionOptions =  ( @ARGV > 1 ) ? $ARGV[1] : ""; 
 
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
     $connection->open();
@@ -41,7 +41,7 @@ eval {
             my $sender = $session->createSender($address);
             my $s = $request->getContent();
             $s = uc($s);
-            my $response = new cqpid_perl::Message($s);
+            my $response = new cqpid::Message($s);
             $sender->send($response);
             print "Processed request: " . $request->getContent() . " -> " . $response->getContent() . "\n";
             $session->acknowledge();

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/spout.pl
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/spout.pl?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/spout.pl (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/examples/perl/spout.pl Fri Oct 21 01:19:00 2011
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use cqpid;
 use Getopt::Long;
 use Time::Local;
 
@@ -77,19 +77,19 @@ sub setProperties {
     }
 }
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+my $connection = new cqpid::Connection($url, $connectionOptions);
 
 eval {
     $connection->open();
     my $session  = $connection->createSession();
     my $sender = $session->createSender($address);
 
-    my $message = new cqpid_perl::Message();
+    my $message = new cqpid::Message();
     setProperties($message) if (@properties);
     if (@entries) {
         my $content = {};
         setEntries($content);
-        cqpid_perl::encode($content, $message);
+        cqpid::encode($content, $message);
     }
     elsif ($content) {
         $message->setContent($content);
@@ -98,7 +98,7 @@ eval {
 
     my $receiver;
     if ($replyto) {
-        my $responseQueue = new cqpid_perl::Address($replyto);
+        my $responseQueue = new cqpid::Address($replyto);
         $receiver = $session->createReceiver($responseQueue);
         $message->setReplyTo($responseQueue);
     }

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/perl/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/perl/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/perl/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/perl/Makefile.am Fri Oct 21 01:19:00 2011
@@ -21,22 +21,22 @@ if HAVE_PERL_DEVEL
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
 
-EXTRA_DIST = CMakeLists.txt perl.i
-BUILT_SOURCES = cqpid_perl.cpp
+EXTRA_DIST = perl.i
+BUILT_SOURCES = cqpid.cpp
 SWIG_FLAGS = -w362,401
 
-cqpid_perl.cpp: $(srcdir)/perl.i $(srcdir)/../qpid.i $(srcdir)/../../swig_perl_typemaps.i
-	$(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid_perl.cpp $(srcdir)/perl.i
+cqpid.cpp: $(srcdir)/perl.i $(srcdir)/../qpid.i $(srcdir)/../../swig_perl_typemaps.i
+	$(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/perl.i
 
-lib_LTLIBRARIES = libcqpid_perl.la
-cqpid_perl_PERL = cqpid_perl.pm
+lib_LTLIBRARIES = cqpid.la
+cqpid_PERL = cqpid.pm
 
-libcqpid_perl_la_LDFLAGS = -avoid-version -shared
-libcqpid_perl_la_LIBADD = -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
+cqpid_la_LDFLAGS = -avoid-version -module -shared
+cqpid_la_LIBADD = -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
 	$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
-libcqpid_perl_la_CXXFLAGS = $(INCLUDES) -fno-strict-aliasing
-nodist_libcqpid_perl_la_SOURCES = cqpid_perl.cpp
+cqpid_la_CXXFLAGS = $(INCLUDES)
+nodist_cqpid_la_SOURCES = cqpid.cpp
 
-CLEANFILES = cqpid_perl.cpp cqpid_perl.pm
+CLEANFILES = cqpid.cpp cqpid.pm
 
 endif # HAVE_PERL_DEVEL

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/perl/perl.i
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/perl/perl.i?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/perl/perl.i (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/perl/perl.i Fri Oct 21 01:19:00 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-%module cqpid_perl
+%module cqpid
 %include "std_string.i"
 %include "../../swig_perl_typemaps.i"
 

Modified: qpid/branches/QPID-2519/cpp/bindings/qpid/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/bindings/qpid/python/Makefile.am?rev=1187150&r1=1187149&r2=1187150&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/bindings/qpid/python/Makefile.am (original)
+++ qpid/branches/QPID-2519/cpp/bindings/qpid/python/Makefile.am Fri Oct 21 01:19:00 2011
@@ -25,17 +25,17 @@ generated_file_list = \
 	cqpid.cpp \
 	cqpid.py
 
-EXTRA_DIST = CMakeLists.txt python.i
+EXTRA_DIST = python.i
 BUILT_SOURCES = $(generated_file_list)
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
-	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
+	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _cqpid.la
-cqpiddir = $(pyexecdir)
+cqpiddir = $(pythondir)
 cqpid_PYTHON = cqpid.py
 
 _cqpid_la_LDFLAGS = -avoid-version -module -shared



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


Mime
View raw message