Author: gsim
Date: Tue Mar 1 16:23:56 2011
New Revision: 1075883
URL: http://svn.apache.org/viewvc?rev=1075883&view=rev
Log:
QPID-3067: moved old examples to old_api directory
Added:
qpid/trunk/qpid/cpp/examples/old_api/
qpid/trunk/qpid/cpp/examples/old_api/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/README.verify
- copied unchanged from r1075698,
qpid/trunk/qpid/cpp/examples/README.verify
qpid/trunk/qpid/cpp/examples/old_api/direct/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/direct/
qpid/trunk/qpid/cpp/examples/old_api/failover/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/failover/
qpid/trunk/qpid/cpp/examples/old_api/fanout/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/fanout/
qpid/trunk/qpid/cpp/examples/old_api/pub-sub/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/pub-sub/
qpid/trunk/qpid/cpp/examples/old_api/request-response/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/request-response/
qpid/trunk/qpid/cpp/examples/old_api/tradedemo/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/tradedemo/
qpid/trunk/qpid/cpp/examples/old_api/verify
- copied unchanged from r1075698, qpid/trunk/qpid/cpp/examples/verify
qpid/trunk/qpid/cpp/examples/old_api/verify_all
- copied, changed from r1075698, qpid/trunk/qpid/cpp/examples/verify_all
qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/
- copied from r1075698, qpid/trunk/qpid/cpp/examples/xml-exchange/
Removed:
qpid/trunk/qpid/cpp/examples/README.verify
qpid/trunk/qpid/cpp/examples/direct/
qpid/trunk/qpid/cpp/examples/failover/
qpid/trunk/qpid/cpp/examples/fanout/
qpid/trunk/qpid/cpp/examples/pub-sub/
qpid/trunk/qpid/cpp/examples/request-response/
qpid/trunk/qpid/cpp/examples/tradedemo/
qpid/trunk/qpid/cpp/examples/verify
qpid/trunk/qpid/cpp/examples/verify_all
qpid/trunk/qpid/cpp/examples/xml-exchange/
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/examples/CMakeLists.txt
qpid/trunk/qpid/cpp/examples/Makefile.am
Modified: qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1075883&r1=1075882&r2=1075883&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Tue Mar 1 16:23:56 2011
@@ -521,18 +521,19 @@ AM_PATH_PYTHON()
builddir_lib_suffix="/.libs"
AC_SUBST([builddir_lib_suffix])
-# Files to generate
+# Files to generate
AC_CONFIG_FILES([
Makefile
examples/Makefile
- examples/direct/Makefile
- examples/fanout/Makefile
- examples/pub-sub/Makefile
- examples/request-response/Makefile
- examples/failover/Makefile
- examples/xml-exchange/Makefile
+ examples/old_api/Makefile
+ examples/old_api/direct/Makefile
+ examples/old_api/fanout/Makefile
+ examples/old_api/pub-sub/Makefile
+ examples/old_api/request-response/Makefile
+ examples/old_api/failover/Makefile
+ examples/old_api/xml-exchange/Makefile
examples/qmf-console/Makefile
- examples/tradedemo/Makefile
+ examples/old_api/tradedemo/Makefile
examples/messaging/Makefile
bindings/qpid/Makefile
bindings/qpid/ruby/Makefile
Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=1075883&r1=1075882&r2=1075883&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Tue Mar 1 16:23:56 2011
@@ -89,13 +89,6 @@ if (MSVC)
COMPONENT ${QPID_COMPONENT_EXAMPLES})
endif (MSVC)
-add_subdirectory(direct)
-add_subdirectory(failover)
-add_subdirectory(fanout)
-add_subdirectory(pub-sub)
-#add_subdirectory(qmf-agent)
add_subdirectory(qmf-console)
-add_subdirectory(request-response)
-add_subdirectory(tradedemo)
-add_subdirectory(xml-exchange)
add_subdirectory(messaging)
+add_subdirectory(old_api)
Modified: qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=1075883&r1=1075882&r2=1075883&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/Makefile.am Tue Mar 1 16:23:56 2011
@@ -16,15 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-SUBDIRS = direct fanout pub-sub request-response failover qmf-console
tradedemo messaging
-if HAVE_XML
- SUBDIRS += xml-exchange
- broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module
$(top_builddir)/src/.libs/xml.so"
-endif
-if !HAVE_XML
- exclude_examples_regexp="xml" # Exclude XML examples.
- broker_args = "--no-module-dir --data-dir \"\" --auth no"
-endif
+SUBDIRS = qmf-console messaging old_api
MAKEDIST=.libs/Makefile
@@ -37,13 +29,9 @@ $(MAKEDIST): Makefile
examplesdir=$(pkgdatadir)/examples
dist_examples_DATA = README.txt $(MAKEDIST)
-EXTRA_DIST = README.verify verify verify_all examples.sln CMakeLists.txt
+EXTRA_DIST = examples.sln CMakeLists.txt
# For older versions of automake
abs_top_srcdir = @abs_top_srcdir@
abs_top_builddir = @abs_top_builddir@
-# Verify the examples in the buid tree.
-check-local:
- $(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)
$(broker_args) $(exclude_examples_regexp)
-
Added: qpid/trunk/qpid/cpp/examples/old_api/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/Makefile.am?rev=1075883&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/Makefile.am (added)
+++ qpid/trunk/qpid/cpp/examples/old_api/Makefile.am Tue Mar 1 16:23:56 2011
@@ -0,0 +1,46 @@
+#
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# 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
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+SUBDIRS = direct pub-sub fanout request-response failover tradedemo
+if HAVE_XML
+ SUBDIRS += xml-exchange
+ broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module
$(top_builddir)/src/.libs/xml.so"
+endif
+if !HAVE_XML
+ exclude_examples_regexp="xml" # Exclude XML examples.
+ broker_args = "--no-module-dir --data-dir \"\" --auth no"
+endif
+
+MAKEDIST=.libs/Makefile
+
+$(MAKEDIST): Makefile
+ mkdir -p .libs
+ @(echo 'all clean:' ; \
+ echo ' for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done' ; \
+ ) > $(MAKEDIST)
+
+EXTRA_DIST = README.verify verify verify_all
+
+# For older versions of automake
+abs_top_srcdir = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+# Verify the examples in the buid tree.
+check-local:
+ $(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)
$(broker_args) $(exclude_examples_regexp)
+
Copied: qpid/trunk/qpid/cpp/examples/old_api/verify_all (from r1075698,
qpid/trunk/qpid/cpp/examples/verify_all)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/verify_all?p2=qpid/trunk/qpid/cpp/examples/old_api/verify_all&p1=qpid/trunk/qpid/cpp/examples/verify_all&r1=1075698&r2=1075883&rev=1075883&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/verify_all Tue Mar 1 16:23:56 2011
@@ -32,7 +32,7 @@ trap "$qpidd -q" exit
QPID_PORT=`$qpidd -dp0 $broker_args` || { echo "Can't run qpidd" ; exit 1; }
export QPID_PORT
-find="find $topsrcdir/cpp/examples"
+find="find $topsrcdir/cpp/examples/old_api"
find="$find -mindepth 2 -name verify"
all_examples=`$find`
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
