2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@481159 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 0 insertions, 135 deletions

diff --git a/cpp/test/bin/broker b/cpp/test/bin/broker
deleted file mode 100755
index c49e967466..0000000000
--- a/cpp/test/bin/broker
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-. `dirname $0`/env
-
-brokerpid() {
-    netstat -tpl 2> /dev/null | awk '/amqp/ {print gensub("/.*$","","g",$7) }'
-}
-
-killbroker () {
-    PID=`brokerpid`
-    if [ -n "$PID" ] ; then kill $PID ; fi
-    for ((i=5;i--;)) {
-	if [ -z "`brokerpid`" ] ; then exit 0 ; fi
-	sleep 1
-    }
-    echo "Broker `brokerpid` refuses to die."
-}
-
-waitbroker () {
-    while [ -z `brokerpid` ] ; do sleep 1 ; done
-}
-
-startbroker() {
-    case $1 in
-	j)   
-	    export AMQJ_LOGGING_LEVEL=fatal
-	    export JDPA_OPTS=
-	    export QPID_OPTS=-Xmx1024M
-	    export debug=1
-	    CMD="qpid-server"
-	    qpid-run -run:print-command # Show the command line.
-	    ;;
-	c)  CMD=qpidd ;;
-    esac
-    nohup $CMD  > /dev/null 2>&1 &
-    waitbroker
-    echo Broker started: $CMD
-}
-
-
-case $1 in
-    j|c) startbroker $1 ;;
-    stop|kill) killbroker ;;
-    wait) waitbroker ;;
-    pid) brokerpid ;;
-esac
diff --git a/cpp/test/bin/env b/cpp/test/bin/env
deleted file mode 100755
index 76797b1ef7..0000000000
--- a/cpp/test/bin/env
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Set environment variables for test scripts.
-
-pathmunge () {
-    if ! echo $PATH | /bin/egrep -q "(^|:)$1($|:)" ; then
-	if [ "$2" = "after" ] ; then
-	    PATH=$PATH:$1
-	else
-	    PATH=$1:$PATH
-	fi
-    fi
-}
-
-if [ -z QPID_ROOT ] ; then echo "You must set QPID_ROOT" ; fi
- 
-pathmunge $QPID_ROOT/cpp/test/bin
-pathmunge $QPID_ROOT/cpp/build/*/bin
-pathmunge $QPID_ROOT/cpp/build/*/test
-
-export QPID_HOME=${QPID_HOME:-$QPID_ROOT/java/build}
-pathmunge $QPID_HOME/bin
-
-
diff --git a/cpp/test/bin/topicall b/cpp/test/bin/topicall
deleted file mode 100755
index bde04a5b30..0000000000
--- a/cpp/test/bin/topicall
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Do 3 runs of topictests for C++ and Java brokers with reduced output.
-
-. `dirname $0`/env
-
-# Run a short topictest to warm up the broker and iron out startup effects.
-flush() {
-    topic_listener >/dev/null 2>&1 &
-    topic_publisher >/dev/null 2>&1 
-}
-
-echo Java broker
-broker j ; flush
-topictest c | tail -n1
-topictest c | tail -n1
-topictest c | tail -n1
-
-echo C++ broker
-broker c ; flush
-topictest c | tail -n1
-topictest c | tail -n1
-topictest c | tail -n1
-
-# Don't bother with java clients we know they're slower.
-
diff --git a/cpp/test/bin/topictest b/cpp/test/bin/topictest
deleted file mode 100755
index 792f063bea..0000000000
--- a/cpp/test/bin/topictest
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Run the c++ or java topic test
-
-. `dirname $0`/env
-
-# Edit parameters here:
-
-# Big test:
-# LISTENERS=10
-# MESSAGES=10000
-# BATCHES=20
-
-LISTENERS=10
-MESSAGES=2000
-BATCHES=10
-
-cppcmds() {
-    LISTEN_CMD=topic_listener
-    PUBLISH_CMD="topic_publisher -messages $MESSAGES -batches $BATCHES -subscribers $LISTENERS"
-}
-
-javacmds() {
-    DEF=-Damqj.logging.level="error"
-    LISTEN_CMD="qpid-run $DEF org.apache.qpid.topic.Listener"
-    PUBLISH_CMD="qpid-run $DEF org.apache.qpid.topic.Publisher -messages $MESSAGES -batch $BATCHES -clients $LISTENERS"
-}
-
-case $1 in
-    c) cppcmds ;;
-    j) javacmds ;;
-    *) cppcmds ;;
-esac
-
-for ((i=$LISTENERS ; i--; )); do
-    $LISTEN_CMD  > /dev/null 2>&1 &
-done
-sleep 1
-echo $PUBLISH_CMD $OPTIONS
-
-STATS=~/bin/topictest.times
-echo "---- topictest `date`" >> $STATS
-$PUBLISH_CMD $OPTIONS | tee -a $STATS