Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 69408 invoked from network); 14 Mar 2011 15:08:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Mar 2011 15:08:41 -0000 Received: (qmail 83509 invoked by uid 500); 14 Mar 2011 15:08:41 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 83482 invoked by uid 500); 14 Mar 2011 15:08:41 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 83462 invoked by uid 99); 14 Mar 2011 15:08:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2011 15:08:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2011 15:08:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 47AF423888CB; Mon, 14 Mar 2011 15:08:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1081413 - in /qpid/branches/0.10/qpid/cpp/examples: ./ old_api/ old_api/direct/ old_api/failover/ old_api/fanout/ old_api/pub-sub/ old_api/request-response/ old_api/tradedemo/ old_api/xml-exchange/ Date: Mon, 14 Mar 2011 15:08:14 -0000 To: commits@qpid.apache.org From: gsim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110314150814.47AF423888CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsim Date: Mon Mar 14 15:08:13 2011 New Revision: 1081413 URL: http://svn.apache.org/viewvc?rev=1081413&view=rev Log: QPID-3137: Merged r1080679 from trunk Modified: qpid/branches/0.10/qpid/cpp/examples/ (props changed) qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/direct/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/failover/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/fanout/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/pub-sub/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/request-response/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/Makefile.am qpid/branches/0.10/qpid/cpp/examples/old_api/xml-exchange/Makefile.am Propchange: qpid/branches/0.10/qpid/cpp/examples/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 14 15:08:13 2011 @@ -3,4 +3,4 @@ /qpid/branches/0.6-release-windows-installer/qpid/cpp/examples:926803,927233 /qpid/branches/java-network-refactor/qpid/cpp/examples:805429-825319 /qpid/branches/qpid-2935/qpid/cpp/examples:1061302-1072333 -/qpid/trunk/qpid/cpp/examples:1078099,1079385,1079590,1079830 +/qpid/trunk/qpid/cpp/examples:1078099,1079385,1079590,1079830,1080589,1080679 Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am Mon Mar 14 15:08:13 2011 @@ -34,6 +34,8 @@ $(MAKEDIST): Makefile echo ' for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done' ; \ ) > $(MAKEDIST) +examplesdir=$(pkgdatadir)/examples/old_api +dist_examples_DATA = $(MAKEDIST) EXTRA_DIST = README.verify verify verify_all # For older versions of automake Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/direct/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/direct/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/direct/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/direct/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/direct +examplesdir=$(pkgdatadir)/examples/old_api/direct MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/failover/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/failover/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/failover/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/failover/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/failover +examplesdir=$(pkgdatadir)/examples/old_api/failover MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/fanout/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/fanout/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/fanout/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/fanout/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/fanout +examplesdir=$(pkgdatadir)/examples/old_api/fanout MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/pub-sub/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/pub-sub/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/pub-sub/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/pub-sub/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/pub-sub +examplesdir=$(pkgdatadir)/examples/old_api/pub-sub MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/request-response/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/request-response/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/request-response/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/request-response/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/request-response +examplesdir=$(pkgdatadir)/examples/old_api/request-response MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/tradedemo +examplesdir=$(pkgdatadir)/examples/old_api/tradedemo MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/xml-exchange/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/xml-exchange/Makefile.am?rev=1081413&r1=1081412&r2=1081413&view=diff ============================================================================== --- qpid/branches/0.10/qpid/cpp/examples/old_api/xml-exchange/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/xml-exchange/Makefile.am Mon Mar 14 15:08:13 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -examplesdir=$(pkgdatadir)/examples/xml-exchange +examplesdir=$(pkgdatadir)/examples/old_api/xml-exchange MAKELDFLAGS=$(CLIENTFLAGS) include $(top_srcdir)/examples/makedist.mk --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org