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

1 files changed, 0 insertions, 83 deletions

diff --git a/cpp/src/qpid/apr/Socket.cpp b/cpp/src/qpid/apr/Socket.cpp
deleted file mode 100644
index 3cf510872f..0000000000
--- a/cpp/src/qpid/apr/Socket.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-
-#include <qpid/sys/Socket.h>
-#include <qpid/apr/APRBase.h>
-#include <qpid/apr/APRPool.h>
-
-
-using namespace qpid::sys;
-
-Socket Socket::createTcp() {
-    Socket s;
-    CHECK_APR_SUCCESS(
-        apr_socket_create(
-            &s.socket, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
-            APRPool::get()));
-    return s;
-}
-
-Socket::Socket(apr_socket_t* s) {
-    socket = s;
-}
-
-void Socket::setTimeout(Time interval) {
-    apr_socket_timeout_set(socket, interval/TIME_USEC);
-}
-
-void Socket::connect(const std::string& host, int port) {
-    apr_sockaddr_t* address;
-    CHECK_APR_SUCCESS(
-        apr_sockaddr_info_get(
-            &address, host.c_str(), APR_UNSPEC, port, APR_IPV4_ADDR_OK,
-            APRPool::get()));
-    CHECK_APR_SUCCESS(apr_socket_connect(socket, address));
-}
-
-void Socket::close() {
-    if (socket == 0) return;
-    CHECK_APR_SUCCESS(apr_socket_close(socket));
-    socket = 0;
-}
-
-ssize_t Socket::send(const void* data, size_t size)
-{
-    apr_size_t sent = size;
-    apr_status_t status =
-        apr_socket_send(socket, reinterpret_cast<const char*>(data), &sent);
-    if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
-    if (APR_STATUS_IS_EOF(status)) return SOCKET_EOF;
-    CHECK_APR_SUCCESS(status);
-    return sent;
-}
-
-ssize_t Socket::recv(void* data, size_t size)
-{
-    apr_size_t received = size;
-    apr_status_t status =
-        apr_socket_recv(socket, reinterpret_cast<char*>(data), &received);
-    if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
-    CHECK_APR_SUCCESS(status);
-     return received;
-}
-
-