From c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 16 Oct 2006 13:50:26 +0000 Subject: Build system reorg, see README and Makefile comments for details. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@464494 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/amqp_client.xsl | 155 ++++++++ .../etc/stylesheets/amqp_client_handler_impl.xsl | 187 ++++++++++ .../cpp/etc/stylesheets/amqp_client_operations.xsl | 105 ++++++ qpid/cpp/etc/stylesheets/amqp_consts.xsl | 77 ++++ qpid/cpp/etc/stylesheets/amqp_server.xsl | 187 ++++++++++ .../etc/stylesheets/amqp_server_handler_impl.xsl | 187 ++++++++++ .../cpp/etc/stylesheets/amqp_server_operations.xsl | 113 ++++++ qpid/cpp/etc/stylesheets/code_gen.xsl | 91 +++++ qpid/cpp/etc/stylesheets/code_utils.xsl | 210 +++++++++++ qpid/cpp/etc/stylesheets/convert_0.81.xsl | 407 +++++++++++++++++++++ qpid/cpp/etc/stylesheets/cpp.xsl | 315 ++++++++++++++++ qpid/cpp/etc/stylesheets/framing.xsl | 49 +++ qpid/cpp/etc/stylesheets/prepare1.xsl | 104 ++++++ qpid/cpp/etc/stylesheets/prepare2.xsl | 54 +++ qpid/cpp/etc/stylesheets/prepare3.xsl | 54 +++ qpid/cpp/etc/stylesheets/registry.xsl | 12 + qpid/cpp/etc/stylesheets/utils.xsl | 194 ++++++++++ 17 files changed, 2501 insertions(+) create mode 100644 qpid/cpp/etc/stylesheets/amqp_client.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_client_operations.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_consts.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_server.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl create mode 100644 qpid/cpp/etc/stylesheets/amqp_server_operations.xsl create mode 100644 qpid/cpp/etc/stylesheets/code_gen.xsl create mode 100644 qpid/cpp/etc/stylesheets/code_utils.xsl create mode 100644 qpid/cpp/etc/stylesheets/convert_0.81.xsl create mode 100644 qpid/cpp/etc/stylesheets/cpp.xsl create mode 100644 qpid/cpp/etc/stylesheets/framing.xsl create mode 100644 qpid/cpp/etc/stylesheets/prepare1.xsl create mode 100644 qpid/cpp/etc/stylesheets/prepare2.xsl create mode 100644 qpid/cpp/etc/stylesheets/prepare3.xsl create mode 100644 qpid/cpp/etc/stylesheets/registry.xsl create mode 100644 qpid/cpp/etc/stylesheets/utils.xsl (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/amqp_client.xsl b/qpid/cpp/etc/stylesheets/amqp_client.xsl new file mode 100644 index 0000000000..4673d44316 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_client.xsl @@ -0,0 +1,155 @@ + + + + + + + + + + + +#ifndef _AMQP_ServerProxy_ +#define _AMQP_ServerProxy_ + +#include "AMQP_ServerOperations.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/framing/OutputHandler.h" + +namespace qpid { +namespace framing { + +class AMQP_ServerProxy : virtual public AMQP_ServerOperations +{ + OutputHandler* out; + + public: + AMQP_ServerProxy(OutputHandler* _out); + virtual ~AMQP_ServerProxy() {} + + + + /** ===== Class: ===== + + */ + + class : virtual public AMQP_ServerOperations::Handler + { + OutputHandler* out; + + public: + /* Constructors and destructors */ + (OutputHandler* _out); + virtual ~(); + + /* Protocol methods */ + + + + + /** ----- Method: . ----- + + */ + + + /** + Rule "": + */ + + virtual void + ( u_int16_t channel, + + + + + , + + + + ); + + + }; /* class */ + + }; /* class AMQP_ServerProxy */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + + + + + + + + +#include "AMQP_ServerProxy.h" + +namespace qpid { +namespace framing { + +AMQP_ServerProxy::AMQP_ServerProxy(OutputHandler* _out) : + out(_out) +{ +} + + + /* ++++++++++ Class: ++++++++++ */ + +AMQP_ServerProxy::::(OutputHandler* _out) : + out(_out) +{ +} + +AMQP_ServerProxy::::~() {} + + + void AMQP_ServerProxy:::: + ( u_int16_t channel + , + + + + + , + + + + ) +{ + out->send( new AMQFrame( channel, + new ( + + + + , + + + ) ) ); +} + + + + + +} /* namespace framing */ +} /* namespace qpid */ + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl new file mode 100644 index 0000000000..cc636ea846 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl @@ -0,0 +1,187 @@ + + + + + + + + + + + +#ifndef _AMQP_ClientHandlerImpl_ +#define _AMQP_ClientHandlerImpl_ + +#include "AMQP_ClientOperations.h" +#include "qpid/framing/FieldTable.h" + +namespace qpid { +namespace framing { + +class AMQP_ClientHandlerImpl : virtual public AMQP_ClientOperations +{ + + + + + AMQP_ClientOperations::* + Ptr; + + + public: + AMQP_ClientHandlerImpl(); + virtual ~AMQP_ClientHandlerImpl(); + + + + + inline AMQP_ClientOperations:: + * get + () { return Ptr; } + + + + + + + + + + /** + ===== Class: Impl ===== + + */ + + + + class + Impl : virtual public AMQP_ClientOperations:: + { + public: + /* Constructors and destructors */ + Impl(); + virtual ~Impl(); + + /* Protocol methods */ + + + + + + + + + /** + ----- Method: + Impl. ----- + + */ + + + /** + Rule "": + + */ + + + + virtual void + ( u_int16_t channel + + + + , + + + + + , + + + + ); + + + }; /* class Impl */ + + }; /* AMQP_ClientHandlerImpl */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + + + + + + +#include "AMQP_ClientHandlerImpl.h" + +namespace qpid { +namespace framing { + +AMQP_ClientHandlerImpl::AMQP_ClientHandlerImpl() : + + + + HandlerPtr( new HandlerImpl() ) + + , + + + +{ +} + +AMQP_ClientHandlerImpl::~AMQP_ClientHandlerImpl() +{ + + delete HandlerPtr; + } + + + + /* ===== Class: HandlerImpl ===== */ + AMQP_ClientHandlerImpl::HandlerImpl:: + HandlerImpl() { } + AMQP_ClientHandlerImpl::HandlerImpl::~ + HandlerImpl() { } + + + void AMQP_ClientHandlerImpl::HandlerImpl:: + ( u_int16_t /*channel*/ + + , + + + + + , + + + ) { } + + + + + +} /* namespace framing */ +} /* namespace qpid */ + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl new file mode 100644 index 0000000000..ee87cac56a --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl @@ -0,0 +1,105 @@ + + + + + + + + + + + +#ifndef _AMQP_ClientOperations_ +#define _AMQP_ClientOperations_ + +#include "AMQP_Constants.h" +#include "qpid/framing/FieldTable.h" + +namespace qpid { +namespace framing { + +class AMQP_ClientOperations +{ + public: + AMQP_ClientOperations() {} + virtual ~AMQP_ClientOperations() {} + inline u_int16_t getAmqpMajor() { return (u_int16_t); } + inline u_int16_t getAmqpMinor() { return (u_int16_t); } + + + + + + + + /** ===== Class: ===== + + */ + + + + class + { + public: + /* Constructors and destructors */ + () {} + virtual ~() {} + + /* Protocol methods */ + + + + + + + + + /** ----- Method: . + ----- + + */ + + + /** + Rule "": + + */ + + + + virtual void + ( u_int16_t channel + + + + , + + + + + , + + + + ) = 0; + + + }; /* class */ + + }; /* class AMQP_ClientOperations */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_consts.xsl b/qpid/cpp/etc/stylesheets/amqp_consts.xsl new file mode 100644 index 0000000000..783f9f5271 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_consts.xsl @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#ifndef _AMQP_Constants_ +#define _AMQP_Constants_ + +#include "qpid/framing/amqp_types.h" + +namespace qpid { +namespace framing { + +/**** Constants ****/ + + + /* + + */ + + const u_int16_t ; + + + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_server.xsl b/qpid/cpp/etc/stylesheets/amqp_server.xsl new file mode 100644 index 0000000000..ee50d7f331 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_server.xsl @@ -0,0 +1,187 @@ + + + + + + + + + + +#ifndef _AMQP_ClientProxy_ +#define _AMQP_ClientProxy_ + +#include "AMQP_ClientOperations.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/framing/OutputHandler.h" + +namespace qpid { +namespace framing { + +class AMQP_ClientProxy : virtual public AMQP_ClientOperations +{ + public: + + AMQP_ClientProxy(OutputHandler* _out); + virtual ~AMQP_ClientProxy() {}; + + + + + + /** ===== Class: ===== + + */ + + class : virtual public AMQP_ClientOperations::Handler + { + OutputHandler* out; + + public: + /* Constructors and destructors */ + (OutputHandler* _out); + virtual ~(); + + /* Protocol methods */ + + + + + /** ----- Method: . ----- + + */ + + + /** + Rule "": + */ + + virtual void + ( u_int16_t channel, + + + + + , + + + + ); + + + }; /* class */ + + + + + ; + + + private: + + OutputHandler* out; + + + + ; + + + + + }; /* class AMQP_ClientProxy */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + + + + + + + +#include "AMQP_ClientProxy.h" + +namespace qpid { +namespace framing { + +AMQP_ClientProxy::AMQP_ClientProxy(OutputHandler* _out) : + out(_out), + + + + , + + + +{ +} + + + + /* ++++++++++ Class: ++++++++++ */ + +AMQP_ClientProxy::::(OutputHandler* _out) : + out(_out) +{ +} + +AMQP_ClientProxy::::~() {} + + + void AMQP_ClientProxy:::: + ( u_int16_t channel + , + + + + + , + + + + ) +{ + out->send( new AMQFrame( channel, + new ( + + + + , + + + ) ) ); +} + + + + + + + { + ; + } + + + + +} /* namespace framing */ +} /* namespace qpid */ + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl new file mode 100644 index 0000000000..c55e3f7cd1 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl @@ -0,0 +1,187 @@ + + + + + + + + + + + +#ifndef _AMQP_ServerHandlerImpl_ +#define _AMQP_ServerHandlerImpl_ + +#include "AMQP_ServerOperations.h" +#include "qpid/framing/FieldTable.h" + +namespace qpid { +namespace framing { + +class AMQP_ServerHandlerImpl : virtual public AMQP_ServerOperations +{ + + + + + AMQP_ServerOperations::* + Ptr; + + + public: + AMQP_ServerHandlerImpl(); + virtual ~AMQP_ServerHandlerImpl(); + + + + + virtual inline AMQP_ServerOperations:: + * get + () { return Ptr; } + + + + + + + + + + /** + ===== Class: Impl ===== + + */ + + + + class + Impl : virtual public AMQP_ServerOperations:: + { + public: + /* Constructors and destructors */ + Impl(); + virtual ~Impl(); + + /* Protocol methods */ + + + + + + + + + /** + ----- Method: + Impl. ----- + + */ + + + /** + Rule "": + + */ + + + + virtual void + ( u_int16_t channel + + + + , + + + + + , + + + + ); + + + }; /* class Impl */ + + }; /* AMQP_ServerHandlerImpl */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + + + + + + +#include "AMQP_ServerHandlerImpl.h" + +namespace qpid { +namespace framing { + +AMQP_ServerHandlerImpl::AMQP_ServerHandlerImpl() : + + + + HandlerPtr( new HandlerImpl() ) + + , + + + +{ +} + +AMQP_ServerHandlerImpl::~AMQP_ServerHandlerImpl() +{ + + delete HandlerPtr; + } + + + + /* ===== Class: HandlerImpl ===== */ + AMQP_ServerHandlerImpl::HandlerImpl:: + HandlerImpl() { } + AMQP_ServerHandlerImpl::HandlerImpl::~ + HandlerImpl() { } + + + void AMQP_ServerHandlerImpl::HandlerImpl:: + ( u_int16_t /*channel*/ + + , + + + + + , + + + ) { } + + + + + +} /* namespace framing */ +} /* namespace qpid */ + + + + diff --git a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl new file mode 100644 index 0000000000..aad474295c --- /dev/null +++ b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl @@ -0,0 +1,113 @@ + + + + + + + + + + + +#ifndef _AMQP_ServerOperations_ +#define _AMQP_ServerOperations_ + +#include "AMQP_Constants.h" +#include "qpid/framing/FieldTable.h" + +namespace qpid { +namespace framing { + +class AMQP_ServerOperations +{ + public: + AMQP_ServerOperations() {} + virtual ~AMQP_ServerOperations() {} + inline u_int16_t getAmqpMajor() { return (u_int16_t); } + inline u_int16_t getAmqpMinor() { return (u_int16_t); } + + + + + + + + /** ===== Class: ===== + + */ + + + + class + { + public: + /* Constructors and destructors */ + () {} + virtual ~() {} + + /* Protocol methods */ + + + + + + + + + /** ----- Method: . + ----- + + */ + + + /** + Rule "": + + */ + + + + virtual void + ( u_int16_t channel + + + + , + + + + + , + + + + ) = 0; + + + }; /* class */ + + + + + virtual AMQP_ServerOperations:: + * get + () = 0; + + + }; /* class AMQP_ServerOperations */ + +} /* namespace framing */ +} /* namespace qpid */ + +#endif + + + + diff --git a/qpid/cpp/etc/stylesheets/code_gen.xsl b/qpid/cpp/etc/stylesheets/code_gen.xsl new file mode 100644 index 0000000000..5e9f4ef8f0 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/code_gen.xsl @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/code_utils.xsl b/qpid/cpp/etc/stylesheets/code_utils.xsl new file mode 100644 index 0000000000..f4a0f6e5ce --- /dev/null +++ b/qpid/cpp/etc/stylesheets/code_utils.xsl @@ -0,0 +1,210 @@ + + + + + /** +* +* Copyright (c) 2006 The Apache Software Foundation +* +* Licensed 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. +* +*/ + +/** +* +* NOTE: This file is generated directly from the AMQP XML specification. +* === DO NOT EDIT === +* +*/ + + + + + + + + + + + + + delete_ + return_ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + u_int8_t + u_int16_t + string + string + bool + u_int32_t + u_int64_t + u_int64_t + + FieldTable + + unknown_type /* WARNING: undefined type */ + + + + + + + + & + & + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/convert_0.81.xsl b/qpid/cpp/etc/stylesheets/convert_0.81.xsl new file mode 100644 index 0000000000..9924f165da --- /dev/null +++ b/qpid/cpp/etc/stylesheets/convert_0.81.xsl @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + ==================== + Constants + ==================== + + + + + + + + + + ==================== + Domains + ==================== + + + + + + + + + Elementary domains + + bit + bit + single bit + + + octet + octet + single octet + + + short + short + 16-bit integer + + + long + long + 32-bit integer + + + longlong + longlong + 64-bit integer + + + shortstr + shortstr + short string + + + longstr + longstr + long string + + + timestamp + timestamp + 64-bit timestamp + + + table + table + field table + + + + + + ==================== + Classes + ==================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +rule__ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +doc_rule__ + + + + + + + + + + + +grammar + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/cpp.xsl b/qpid/cpp/etc/stylesheets/cpp.xsl new file mode 100644 index 0000000000..51facee294 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/cpp.xsl @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + +#include "qpid/framing/amqp_framing.h" + + + + + + + + + + + + +#include "qpid/framing/amqp_types.h" +#include "AMQP_ServerOperations.h" +#include "qpid/framing/AMQMethodBody.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/FieldTable.h" + +#ifndef __ +#define __ + +namespace qpid { +namespace framing { + + + + +} +} + +#endif + + + + + + + + +/** + * This class is autogenerated, do not modify. [From ] + */ +class : virtual public AMQMethodBody +{ + + + + ; + + +public: + typedef std::tr1::shared_ptr<> shared_ptr; + + virtual ~() {} + + + inline ; } + + + + inline void print(std::ostream& out) const{ + out << "" + + << ", + ="<< + + + ; + } + + inline u_int16_t amqpClassId() const { + return ; + } + + inline u_int16_t amqpMethodId() const { + return ; + } + + inline u_int32_t bodySize() const { + + + return + + + + + + + ; + + return 0; + + } + + + inline void invoke(AMQP_ServerOperations& target, u_int16_t channel) { + + + ); + + + ; + + } + + + inline void encodeContent(Buffer& buffer) const + { + + u_int8_t flags = 0; + + ; + + + + + ; + + + buffer.putOctet(flags); + + + } + + inline void decodeContent(Buffer& buffer) + { + + + + u_int8_t flags = buffer.getOctet(); + ; + + + ; + + + + } + + + + inline () : + { + } + + + inline () + { + } +}; + + + + + +/** + * This file is autogenerated, do not modify. + */ + +#ifndef AMQ_METHODS_H +#define AMQ_METHODS_H + + +#include ".h" + + +namespace qpid { +namespace framing { + + +const ; + + +AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId); + +} +} + +#endif + + + + + +#include "amqp_methods.h" +#include "qpid/QpidError.h" + +namespace qpid { +namespace framing { +/** + * This method is autogenerated, do not modify. + */ +AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId){ + switch(classId * 1000 + methodId) + { + + case + + * 1000 + + + : return new + (); + + } + THROW_QPID_ERROR(FRAMING_ERROR, "Unknown method"); +} + +} +} + + + + + +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/FieldTable.h" + +#ifndef _AMQPServer_ +#define _AMQPServer_ + +namespace qpid { +namespace framing { + +class AMQPServer +{ + public: + + + class { + public: + + + virtual void (u_int16_t channel, ) = 0; + + + virtual void (u_int16_t channel) = 0; + + + virtual ~(){} + }; + + virtual () = 0; + + + virtual ~AMQPServer(){} +}; + +} +} + +#endif + + + +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/FieldTable.h" + +#ifndef _AMQPClient_ +#define _AMQPClient_ + +namespace qpid { +namespace framing { + +class AMQPClient +{ + public: + + + class { + public: + + + virtual void (u_int16_t channel, ) = 0; + + + virtual void (u_int16_t channel) = 0; + + + virtual ~(){} + }; + + virtual () = 0; + + + + virtual ~AMQPClient(){} +}; + +} +} + +#endif + + + + + diff --git a/qpid/cpp/etc/stylesheets/framing.xsl b/qpid/cpp/etc/stylesheets/framing.xsl new file mode 100644 index 0000000000..c63e719a77 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/framing.xsl @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/prepare1.xsl b/qpid/cpp/etc/stylesheets/prepare1.xsl new file mode 100644 index 0000000000..2aeda89677 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/prepare1.xsl @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + ( + major= + , minor= + ) + + + + + + + + + + + + + + + + + + + + + + + + Could not inherit from ; file not found. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/prepare2.xsl b/qpid/cpp/etc/stylesheets/prepare2.xsl new file mode 100644 index 0000000000..331319de57 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/prepare2.xsl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/prepare3.xsl b/qpid/cpp/etc/stylesheets/prepare3.xsl new file mode 100644 index 0000000000..27a4764e4f --- /dev/null +++ b/qpid/cpp/etc/stylesheets/prepare3.xsl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/registry.xsl b/qpid/cpp/etc/stylesheets/registry.xsl new file mode 100644 index 0000000000..a818a0a871 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/registry.xsl @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/qpid/cpp/etc/stylesheets/utils.xsl b/qpid/cpp/etc/stylesheets/utils.xsl new file mode 100644 index 0000000000..70743112a9 --- /dev/null +++ b/qpid/cpp/etc/stylesheets/utils.xsl @@ -0,0 +1,194 @@ + + + + + + + + + + u_int8_t + u_int16_t + string + string + bool + u_int32_t + u_int64_t + FieldTable + Object /*WARNING: undefined type*/ + + + + + + u_int8_t + u_int16_t + const string& + const string& + bool + u_int32_t + u_int64_t + FieldTable& + Object /*WARNING: undefined type*/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* WARNING: COULD NOT DETERMINE FIELD SIZE */ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* WARNING: COULD NOT DETERMINE ENCODER */ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* WARNING: COULD NOT DETERMINE DECODER */ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From eaa15b0210b4888b1a107d0d804dc6edf67804f8 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 20 Oct 2006 13:02:53 +0000 Subject: Updated stylesheet for generator such that a const reference is used where a FieldTable is passed as an argument to a method body. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@466100 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/utils.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/utils.xsl b/qpid/cpp/etc/stylesheets/utils.xsl index 70743112a9..54b2e56f23 100644 --- a/qpid/cpp/etc/stylesheets/utils.xsl +++ b/qpid/cpp/etc/stylesheets/utils.xsl @@ -28,7 +28,7 @@ bool u_int32_t u_int64_t - FieldTable& + const FieldTable& Object /*WARNING: undefined type*/ -- cgit v1.2.1 From 9afea8fd28e61b21ab707518cfd89395b7627c5f Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 23 Oct 2006 13:01:03 +0000 Subject: Tidy-up of generated code git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@466979 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/amqp_server_operations.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl index aad474295c..ea91e6277e 100644 --- a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl @@ -94,11 +94,12 @@ class AMQP_ServerOperations }; /* class */ + virtual AMQP_ServerOperations:: * get - () = 0; + () = 0; }; /* class AMQP_ServerOperations */ -- cgit v1.2.1 From 7853774b9e2451cb4722eb63c53fc25a51c27b1a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 24 Oct 2006 13:29:05 +0000 Subject: QPID-52: use of tr1 and unordered_map break build or RHEL4. Replaced unordered_map with std::map. Use boost::shared_ptr instead of std::tr1::shared_ptr. Since we're using boost for other things now anyway it's simpler & more portable. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@467329 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/cpp.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/cpp.xsl b/qpid/cpp/etc/stylesheets/cpp.xsl index 51facee294..033e342c51 100644 --- a/qpid/cpp/etc/stylesheets/cpp.xsl +++ b/qpid/cpp/etc/stylesheets/cpp.xsl @@ -68,7 +68,7 @@ class : virtual public AMQMethodBody public: - typedef std::tr1::shared_ptr<> shared_ptr; + typedef boost::shared_ptr<> shared_ptr; virtual ~() {} -- cgit v1.2.1 From c5aad40e61ed53cfbfd8198672fa7d3b0ffcb4ae Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Oct 2006 23:47:19 +0000 Subject: Reworked Makefile to support multiple builds, see README for details git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@469319 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/code_utils.xsl | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/code_utils.xsl b/qpid/cpp/etc/stylesheets/code_utils.xsl index f4a0f6e5ce..2db98c2d0d 100644 --- a/qpid/cpp/etc/stylesheets/code_utils.xsl +++ b/qpid/cpp/etc/stylesheets/code_utils.xsl @@ -7,30 +7,30 @@ ======================== Print out a standard Apache copyright notice and generated code warning. --> - /** -* -* Copyright (c) 2006 The Apache Software Foundation -* -* Licensed 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. -* -*/ + // +// +// Copyright (c) 2006 The Apache Software Foundation +// +// Licensed 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. +// + -/** -* -* NOTE: This file is generated directly from the AMQP XML specification. -* === DO NOT EDIT === -* -*/ +// +// +// NOTE: This file is generated directly from the AMQP XML specification. +// === DO NOT EDIT === +// +// diff --git a/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl index cc636ea846..0472f5d8f8 100644 --- a/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl index ee87cac56a..8eb62c4244 100644 --- a/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/amqp_consts.xsl b/qpid/cpp/etc/stylesheets/amqp_consts.xsl index 783f9f5271..6d16f5703a 100644 --- a/qpid/cpp/etc/stylesheets/amqp_consts.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_consts.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/amqp_server.xsl b/qpid/cpp/etc/stylesheets/amqp_server.xsl index ee50d7f331..ffadb01210 100644 --- a/qpid/cpp/etc/stylesheets/amqp_server.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_server.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl index c55e3f7cd1..2351f634d7 100644 --- a/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl index ea91e6277e..884036a2ea 100644 --- a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl +++ b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/code_gen.xsl b/qpid/cpp/etc/stylesheets/code_gen.xsl index 5e9f4ef8f0..055c40e9ea 100644 --- a/qpid/cpp/etc/stylesheets/code_gen.xsl +++ b/qpid/cpp/etc/stylesheets/code_gen.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/code_utils.xsl b/qpid/cpp/etc/stylesheets/code_utils.xsl index 2db98c2d0d..d2bbea2cdc 100644 --- a/qpid/cpp/etc/stylesheets/code_utils.xsl +++ b/qpid/cpp/etc/stylesheets/code_utils.xsl @@ -9,19 +9,22 @@ --> // // -// Copyright (c) 2006 The Apache Software Foundation -// -// Licensed 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. +// 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. // diff --git a/qpid/cpp/etc/stylesheets/convert_0.81.xsl b/qpid/cpp/etc/stylesheets/convert_0.81.xsl index 9924f165da..c9e969661e 100644 --- a/qpid/cpp/etc/stylesheets/convert_0.81.xsl +++ b/qpid/cpp/etc/stylesheets/convert_0.81.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/cpp.xsl b/qpid/cpp/etc/stylesheets/cpp.xsl index 033e342c51..a9ab30e078 100644 --- a/qpid/cpp/etc/stylesheets/cpp.xsl +++ b/qpid/cpp/etc/stylesheets/cpp.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/framing.xsl b/qpid/cpp/etc/stylesheets/framing.xsl index c63e719a77..baf643d682 100644 --- a/qpid/cpp/etc/stylesheets/framing.xsl +++ b/qpid/cpp/etc/stylesheets/framing.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/prepare1.xsl b/qpid/cpp/etc/stylesheets/prepare1.xsl index 2aeda89677..e59a4f5267 100644 --- a/qpid/cpp/etc/stylesheets/prepare1.xsl +++ b/qpid/cpp/etc/stylesheets/prepare1.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/prepare2.xsl b/qpid/cpp/etc/stylesheets/prepare2.xsl index 331319de57..1425c71195 100644 --- a/qpid/cpp/etc/stylesheets/prepare2.xsl +++ b/qpid/cpp/etc/stylesheets/prepare2.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/prepare3.xsl b/qpid/cpp/etc/stylesheets/prepare3.xsl index 27a4764e4f..e04632ae84 100644 --- a/qpid/cpp/etc/stylesheets/prepare3.xsl +++ b/qpid/cpp/etc/stylesheets/prepare3.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/registry.xsl b/qpid/cpp/etc/stylesheets/registry.xsl index a818a0a871..350f1ea1d6 100644 --- a/qpid/cpp/etc/stylesheets/registry.xsl +++ b/qpid/cpp/etc/stylesheets/registry.xsl @@ -1,4 +1,24 @@ + diff --git a/qpid/cpp/etc/stylesheets/utils.xsl b/qpid/cpp/etc/stylesheets/utils.xsl index 54b2e56f23..cbf0562686 100644 --- a/qpid/cpp/etc/stylesheets/utils.xsl +++ b/qpid/cpp/etc/stylesheets/utils.xsl @@ -1,4 +1,24 @@ + -- cgit v1.2.1 From c4f0ef019178f50631a6f03da29445ae9071418e Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Wed, 29 Nov 2006 20:33:06 +0000 Subject: Removed old xslt generation files no longer used. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@480711 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/stylesheets/amqp_client.xsl | 175 --------- .../etc/stylesheets/amqp_client_handler_impl.xsl | 207 ---------- .../cpp/etc/stylesheets/amqp_client_operations.xsl | 125 ------ qpid/cpp/etc/stylesheets/amqp_consts.xsl | 97 ----- qpid/cpp/etc/stylesheets/amqp_server.xsl | 207 ---------- .../etc/stylesheets/amqp_server_handler_impl.xsl | 207 ---------- .../cpp/etc/stylesheets/amqp_server_operations.xsl | 134 ------- qpid/cpp/etc/stylesheets/code_gen.xsl | 111 ------ qpid/cpp/etc/stylesheets/code_utils.xsl | 213 ---------- qpid/cpp/etc/stylesheets/convert_0.81.xsl | 427 --------------------- qpid/cpp/etc/stylesheets/cpp.xsl | 335 ---------------- qpid/cpp/etc/stylesheets/framing.xsl | 69 ---- qpid/cpp/etc/stylesheets/prepare1.xsl | 124 ------ qpid/cpp/etc/stylesheets/prepare2.xsl | 74 ---- qpid/cpp/etc/stylesheets/prepare3.xsl | 74 ---- qpid/cpp/etc/stylesheets/registry.xsl | 32 -- qpid/cpp/etc/stylesheets/utils.xsl | 214 ----------- 17 files changed, 2825 deletions(-) delete mode 100644 qpid/cpp/etc/stylesheets/amqp_client.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_client_operations.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_consts.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_server.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl delete mode 100644 qpid/cpp/etc/stylesheets/amqp_server_operations.xsl delete mode 100644 qpid/cpp/etc/stylesheets/code_gen.xsl delete mode 100644 qpid/cpp/etc/stylesheets/code_utils.xsl delete mode 100644 qpid/cpp/etc/stylesheets/convert_0.81.xsl delete mode 100644 qpid/cpp/etc/stylesheets/cpp.xsl delete mode 100644 qpid/cpp/etc/stylesheets/framing.xsl delete mode 100644 qpid/cpp/etc/stylesheets/prepare1.xsl delete mode 100644 qpid/cpp/etc/stylesheets/prepare2.xsl delete mode 100644 qpid/cpp/etc/stylesheets/prepare3.xsl delete mode 100644 qpid/cpp/etc/stylesheets/registry.xsl delete mode 100644 qpid/cpp/etc/stylesheets/utils.xsl (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/stylesheets/amqp_client.xsl b/qpid/cpp/etc/stylesheets/amqp_client.xsl deleted file mode 100644 index 7a669da19a..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_client.xsl +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - -#ifndef _AMQP_ServerProxy_ -#define _AMQP_ServerProxy_ - -#include "AMQP_ServerOperations.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/OutputHandler.h" - -namespace qpid { -namespace framing { - -class AMQP_ServerProxy : virtual public AMQP_ServerOperations -{ - OutputHandler* out; - - public: - AMQP_ServerProxy(OutputHandler* _out); - virtual ~AMQP_ServerProxy() {} - - - - /** ===== Class: ===== - - */ - - class : virtual public AMQP_ServerOperations::Handler - { - OutputHandler* out; - - public: - /* Constructors and destructors */ - (OutputHandler* _out); - virtual ~(); - - /* Protocol methods */ - - - - - /** ----- Method: . ----- - - */ - - - /** - Rule "": - */ - - virtual void - ( u_int16_t channel, - - - - - , - - - - ); - - - }; /* class */ - - }; /* class AMQP_ServerProxy */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - - - - - - - - -#include "AMQP_ServerProxy.h" - -namespace qpid { -namespace framing { - -AMQP_ServerProxy::AMQP_ServerProxy(OutputHandler* _out) : - out(_out) -{ -} - - - /* ++++++++++ Class: ++++++++++ */ - -AMQP_ServerProxy::::(OutputHandler* _out) : - out(_out) -{ -} - -AMQP_ServerProxy::::~() {} - - - void AMQP_ServerProxy:::: - ( u_int16_t channel - , - - - - - , - - - - ) -{ - out->send( new AMQFrame( channel, - new ( - - - - , - - - ) ) ); -} - - - - - -} /* namespace framing */ -} /* namespace qpid */ - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl deleted file mode 100644 index 0472f5d8f8..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - -#ifndef _AMQP_ClientHandlerImpl_ -#define _AMQP_ClientHandlerImpl_ - -#include "AMQP_ClientOperations.h" -#include "qpid/framing/FieldTable.h" - -namespace qpid { -namespace framing { - -class AMQP_ClientHandlerImpl : virtual public AMQP_ClientOperations -{ - - - - - AMQP_ClientOperations::* - Ptr; - - - public: - AMQP_ClientHandlerImpl(); - virtual ~AMQP_ClientHandlerImpl(); - - - - - inline AMQP_ClientOperations:: - * get - () { return Ptr; } - - - - - - - - - - /** - ===== Class: Impl ===== - - */ - - - - class - Impl : virtual public AMQP_ClientOperations:: - { - public: - /* Constructors and destructors */ - Impl(); - virtual ~Impl(); - - /* Protocol methods */ - - - - - - - - - /** - ----- Method: - Impl. ----- - - */ - - - /** - Rule "": - - */ - - - - virtual void - ( u_int16_t channel - - - - , - - - - - , - - - - ); - - - }; /* class Impl */ - - }; /* AMQP_ClientHandlerImpl */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - - - - - - -#include "AMQP_ClientHandlerImpl.h" - -namespace qpid { -namespace framing { - -AMQP_ClientHandlerImpl::AMQP_ClientHandlerImpl() : - - - - HandlerPtr( new HandlerImpl() ) - - , - - - -{ -} - -AMQP_ClientHandlerImpl::~AMQP_ClientHandlerImpl() -{ - - delete HandlerPtr; - } - - - - /* ===== Class: HandlerImpl ===== */ - AMQP_ClientHandlerImpl::HandlerImpl:: - HandlerImpl() { } - AMQP_ClientHandlerImpl::HandlerImpl::~ - HandlerImpl() { } - - - void AMQP_ClientHandlerImpl::HandlerImpl:: - ( u_int16_t /*channel*/ - - , - - - - - , - - - ) { } - - - - - -} /* namespace framing */ -} /* namespace qpid */ - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl deleted file mode 100644 index 8eb62c4244..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - -#ifndef _AMQP_ClientOperations_ -#define _AMQP_ClientOperations_ - -#include "AMQP_Constants.h" -#include "qpid/framing/FieldTable.h" - -namespace qpid { -namespace framing { - -class AMQP_ClientOperations -{ - public: - AMQP_ClientOperations() {} - virtual ~AMQP_ClientOperations() {} - inline u_int16_t getAmqpMajor() { return (u_int16_t); } - inline u_int16_t getAmqpMinor() { return (u_int16_t); } - - - - - - - - /** ===== Class: ===== - - */ - - - - class - { - public: - /* Constructors and destructors */ - () {} - virtual ~() {} - - /* Protocol methods */ - - - - - - - - - /** ----- Method: . - ----- - - */ - - - /** - Rule "": - - */ - - - - virtual void - ( u_int16_t channel - - - - , - - - - - , - - - - ) = 0; - - - }; /* class */ - - }; /* class AMQP_ClientOperations */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_consts.xsl b/qpid/cpp/etc/stylesheets/amqp_consts.xsl deleted file mode 100644 index 6d16f5703a..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_consts.xsl +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#ifndef _AMQP_Constants_ -#define _AMQP_Constants_ - -#include "qpid/framing/amqp_types.h" - -namespace qpid { -namespace framing { - -/**** Constants ****/ - - - /* - - */ - - const u_int16_t ; - - - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_server.xsl b/qpid/cpp/etc/stylesheets/amqp_server.xsl deleted file mode 100644 index ffadb01210..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_server.xsl +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - -#ifndef _AMQP_ClientProxy_ -#define _AMQP_ClientProxy_ - -#include "AMQP_ClientOperations.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/OutputHandler.h" - -namespace qpid { -namespace framing { - -class AMQP_ClientProxy : virtual public AMQP_ClientOperations -{ - public: - - AMQP_ClientProxy(OutputHandler* _out); - virtual ~AMQP_ClientProxy() {}; - - - - - - /** ===== Class: ===== - - */ - - class : virtual public AMQP_ClientOperations::Handler - { - OutputHandler* out; - - public: - /* Constructors and destructors */ - (OutputHandler* _out); - virtual ~(); - - /* Protocol methods */ - - - - - /** ----- Method: . ----- - - */ - - - /** - Rule "": - */ - - virtual void - ( u_int16_t channel, - - - - - , - - - - ); - - - }; /* class */ - - - - - ; - - - private: - - OutputHandler* out; - - - - ; - - - - - }; /* class AMQP_ClientProxy */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - - - - - - - -#include "AMQP_ClientProxy.h" - -namespace qpid { -namespace framing { - -AMQP_ClientProxy::AMQP_ClientProxy(OutputHandler* _out) : - out(_out), - - - - , - - - -{ -} - - - - /* ++++++++++ Class: ++++++++++ */ - -AMQP_ClientProxy::::(OutputHandler* _out) : - out(_out) -{ -} - -AMQP_ClientProxy::::~() {} - - - void AMQP_ClientProxy:::: - ( u_int16_t channel - , - - - - - , - - - - ) -{ - out->send( new AMQFrame( channel, - new ( - - - - , - - - ) ) ); -} - - - - - - - { - ; - } - - - - -} /* namespace framing */ -} /* namespace qpid */ - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl deleted file mode 100644 index 2351f634d7..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - -#ifndef _AMQP_ServerHandlerImpl_ -#define _AMQP_ServerHandlerImpl_ - -#include "AMQP_ServerOperations.h" -#include "qpid/framing/FieldTable.h" - -namespace qpid { -namespace framing { - -class AMQP_ServerHandlerImpl : virtual public AMQP_ServerOperations -{ - - - - - AMQP_ServerOperations::* - Ptr; - - - public: - AMQP_ServerHandlerImpl(); - virtual ~AMQP_ServerHandlerImpl(); - - - - - virtual inline AMQP_ServerOperations:: - * get - () { return Ptr; } - - - - - - - - - - /** - ===== Class: Impl ===== - - */ - - - - class - Impl : virtual public AMQP_ServerOperations:: - { - public: - /* Constructors and destructors */ - Impl(); - virtual ~Impl(); - - /* Protocol methods */ - - - - - - - - - /** - ----- Method: - Impl. ----- - - */ - - - /** - Rule "": - - */ - - - - virtual void - ( u_int16_t channel - - - - , - - - - - , - - - - ); - - - }; /* class Impl */ - - }; /* AMQP_ServerHandlerImpl */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - - - - - - -#include "AMQP_ServerHandlerImpl.h" - -namespace qpid { -namespace framing { - -AMQP_ServerHandlerImpl::AMQP_ServerHandlerImpl() : - - - - HandlerPtr( new HandlerImpl() ) - - , - - - -{ -} - -AMQP_ServerHandlerImpl::~AMQP_ServerHandlerImpl() -{ - - delete HandlerPtr; - } - - - - /* ===== Class: HandlerImpl ===== */ - AMQP_ServerHandlerImpl::HandlerImpl:: - HandlerImpl() { } - AMQP_ServerHandlerImpl::HandlerImpl::~ - HandlerImpl() { } - - - void AMQP_ServerHandlerImpl::HandlerImpl:: - ( u_int16_t /*channel*/ - - , - - - - - , - - - ) { } - - - - - -} /* namespace framing */ -} /* namespace qpid */ - - - - diff --git a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl deleted file mode 100644 index 884036a2ea..0000000000 --- a/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - -#ifndef _AMQP_ServerOperations_ -#define _AMQP_ServerOperations_ - -#include "AMQP_Constants.h" -#include "qpid/framing/FieldTable.h" - -namespace qpid { -namespace framing { - -class AMQP_ServerOperations -{ - public: - AMQP_ServerOperations() {} - virtual ~AMQP_ServerOperations() {} - inline u_int16_t getAmqpMajor() { return (u_int16_t); } - inline u_int16_t getAmqpMinor() { return (u_int16_t); } - - - - - - - - /** ===== Class: ===== - - */ - - - - class - { - public: - /* Constructors and destructors */ - () {} - virtual ~() {} - - /* Protocol methods */ - - - - - - - - - /** ----- Method: . - ----- - - */ - - - /** - Rule "": - - */ - - - - virtual void - ( u_int16_t channel - - - - , - - - - - , - - - - ) = 0; - - - }; /* class */ - - - - - - virtual AMQP_ServerOperations:: - * get - () = 0; - - - }; /* class AMQP_ServerOperations */ - -} /* namespace framing */ -} /* namespace qpid */ - -#endif - - - - diff --git a/qpid/cpp/etc/stylesheets/code_gen.xsl b/qpid/cpp/etc/stylesheets/code_gen.xsl deleted file mode 100644 index 055c40e9ea..0000000000 --- a/qpid/cpp/etc/stylesheets/code_gen.xsl +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/code_utils.xsl b/qpid/cpp/etc/stylesheets/code_utils.xsl deleted file mode 100644 index d2bbea2cdc..0000000000 --- a/qpid/cpp/etc/stylesheets/code_utils.xsl +++ /dev/null @@ -1,213 +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. -// - - -// -// -// NOTE: This file is generated directly from the AMQP XML specification. -// === DO NOT EDIT === -// -// - - - - - - - - - - - - - delete_ - return_ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - u_int8_t - u_int16_t - string - string - bool - u_int32_t - u_int64_t - u_int64_t - - FieldTable - - unknown_type /* WARNING: undefined type */ - - - - - - - - & - & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/convert_0.81.xsl b/qpid/cpp/etc/stylesheets/convert_0.81.xsl deleted file mode 100644 index c9e969661e..0000000000 --- a/qpid/cpp/etc/stylesheets/convert_0.81.xsl +++ /dev/null @@ -1,427 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - ==================== - Constants - ==================== - - - - - - - - - - ==================== - Domains - ==================== - - - - - - - - - Elementary domains - - bit - bit - single bit - - - octet - octet - single octet - - - short - short - 16-bit integer - - - long - long - 32-bit integer - - - longlong - longlong - 64-bit integer - - - shortstr - shortstr - short string - - - longstr - longstr - long string - - - timestamp - timestamp - 64-bit timestamp - - - table - table - field table - - - - - - ==================== - Classes - ==================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -rule__ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -doc_rule__ - - - - - - - - - - - -grammar - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/cpp.xsl b/qpid/cpp/etc/stylesheets/cpp.xsl deleted file mode 100644 index a9ab30e078..0000000000 --- a/qpid/cpp/etc/stylesheets/cpp.xsl +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - -#include "qpid/framing/amqp_framing.h" - - - - - - - - - - - - -#include "qpid/framing/amqp_types.h" -#include "AMQP_ServerOperations.h" -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/Buffer.h" -#include "qpid/framing/FieldTable.h" - -#ifndef __ -#define __ - -namespace qpid { -namespace framing { - - - - -} -} - -#endif - - - - - - - - -/** - * This class is autogenerated, do not modify. [From ] - */ -class : virtual public AMQMethodBody -{ - - - - ; - - -public: - typedef boost::shared_ptr<> shared_ptr; - - virtual ~() {} - - - inline ; } - - - - inline void print(std::ostream& out) const{ - out << "" - - << ", - ="<< - - - ; - } - - inline u_int16_t amqpClassId() const { - return ; - } - - inline u_int16_t amqpMethodId() const { - return ; - } - - inline u_int32_t bodySize() const { - - - return - - + - - - - ; - - return 0; - - } - - - inline void invoke(AMQP_ServerOperations& target, u_int16_t channel) { - - - ); - - - ; - - } - - - inline void encodeContent(Buffer& buffer) const - { - - u_int8_t flags = 0; - - ; - - - - - ; - - - buffer.putOctet(flags); - - - } - - inline void decodeContent(Buffer& buffer) - { - - - - u_int8_t flags = buffer.getOctet(); - ; - - - ; - - - - } - - - - inline () : - { - } - - - inline () - { - } -}; - - - - - -/** - * This file is autogenerated, do not modify. - */ - -#ifndef AMQ_METHODS_H -#define AMQ_METHODS_H - - -#include ".h" - - -namespace qpid { -namespace framing { - - -const ; - - -AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId); - -} -} - -#endif - - - - - -#include "amqp_methods.h" -#include "qpid/QpidError.h" - -namespace qpid { -namespace framing { -/** - * This method is autogenerated, do not modify. - */ -AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId){ - switch(classId * 1000 + methodId) - { - - case - - * 1000 + - - : return new - (); - - } - THROW_QPID_ERROR(FRAMING_ERROR, "Unknown method"); -} - -} -} - - - - - -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/FieldTable.h" - -#ifndef _AMQPServer_ -#define _AMQPServer_ - -namespace qpid { -namespace framing { - -class AMQPServer -{ - public: - - - class { - public: - - - virtual void (u_int16_t channel, ) = 0; - - - virtual void (u_int16_t channel) = 0; - - - virtual ~(){} - }; - - virtual () = 0; - - - virtual ~AMQPServer(){} -}; - -} -} - -#endif - - - -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/FieldTable.h" - -#ifndef _AMQPClient_ -#define _AMQPClient_ - -namespace qpid { -namespace framing { - -class AMQPClient -{ - public: - - - class { - public: - - - virtual void (u_int16_t channel, ) = 0; - - - virtual void (u_int16_t channel) = 0; - - - virtual ~(){} - }; - - virtual () = 0; - - - - virtual ~AMQPClient(){} -}; - -} -} - -#endif - - - - - diff --git a/qpid/cpp/etc/stylesheets/framing.xsl b/qpid/cpp/etc/stylesheets/framing.xsl deleted file mode 100644 index baf643d682..0000000000 --- a/qpid/cpp/etc/stylesheets/framing.xsl +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/prepare1.xsl b/qpid/cpp/etc/stylesheets/prepare1.xsl deleted file mode 100644 index e59a4f5267..0000000000 --- a/qpid/cpp/etc/stylesheets/prepare1.xsl +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - ( - major= - , minor= - ) - - - - - - - - - - - - - - - - - - - - - - - - Could not inherit from ; file not found. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/prepare2.xsl b/qpid/cpp/etc/stylesheets/prepare2.xsl deleted file mode 100644 index 1425c71195..0000000000 --- a/qpid/cpp/etc/stylesheets/prepare2.xsl +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/prepare3.xsl b/qpid/cpp/etc/stylesheets/prepare3.xsl deleted file mode 100644 index e04632ae84..0000000000 --- a/qpid/cpp/etc/stylesheets/prepare3.xsl +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/registry.xsl b/qpid/cpp/etc/stylesheets/registry.xsl deleted file mode 100644 index 350f1ea1d6..0000000000 --- a/qpid/cpp/etc/stylesheets/registry.xsl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - diff --git a/qpid/cpp/etc/stylesheets/utils.xsl b/qpid/cpp/etc/stylesheets/utils.xsl deleted file mode 100644 index cbf0562686..0000000000 --- a/qpid/cpp/etc/stylesheets/utils.xsl +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - u_int8_t - u_int16_t - string - string - bool - u_int32_t - u_int64_t - FieldTable - Object /*WARNING: undefined type*/ - - - - - - u_int8_t - u_int16_t - const string& - const string& - bool - u_int32_t - u_int64_t - const FieldTable& - Object /*WARNING: undefined type*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE FIELD SIZE */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE ENCODER */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE DECODER */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1 From 4e1735463fdb63f87d03541c33a816a5c7af563f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 12 Dec 2006 16:05:01 +0000 Subject: 2006-12-11 Alan Conway * SPECS/qpid-cpp.spec: Draft RPM spec file for C++. Based on initial draft provided by David Lutterkort * cpp Makefiles: Renamed libraries with qpid prefix: libqpidclient etc. * cpp/man/: moved to docs/man/ * docs/api/usr.doxygen: more restricted, user-oriented doc settings. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@486207 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/init.d/qpidd | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 qpid/cpp/etc/init.d/qpidd (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/init.d/qpidd b/qpid/cpp/etc/init.d/qpidd new file mode 100755 index 0000000000..0c6041b063 --- /dev/null +++ b/qpid/cpp/etc/init.d/qpidd @@ -0,0 +1,83 @@ +#!/bin/bash +# +# qpidd Startup script for the Qpid messaging daemon. +# +# chkconfig: - 85 15 +# description: Qpidd is an AMQP broker. It receives, stores and routes +# messages sent using the AMQP protcol. +# processname: qpidd +# pidfile: /var/run/qpidd.pid +# +# NB: add config: entries here when qpidd gets a config file. + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/qpidd ]; then + . /etc/sysconfig/qpidd +fi + +# Start qpidd in the C locale by default. +QPIDD_LANG=${QPIDD_LANG-"C"} + +qpidd=${QPIDD-/usr/sbin/qpidd} +prog=qpidd +pidfile=${PIDFILE-/var/run/qpidd.pid} +lockfile=${LOCKFILE-/var/lock/subsys/qpidd} +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + LANG=$QPIDD_LANG daemon $qpidd $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc 2 $qpidd + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} + +reload() { + echo -n $"Reloading $prog: " + killproc $qpidd -HUP + RETVAL=$? + echo +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $qpidd + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f ${pidfile} ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.1 From c7dc1bdb194bc455f1fbb6a1b941275855a042d7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 20 Dec 2006 14:40:09 +0000 Subject: make rpm in cpp directory builds qpidc RPMs in default locations. Note: you need to chown or chmod the directories under /usr/src/redhat/RPMS/i386 to be writable for this to work, there is probably a better solution. Building RPMs as root is a Bad Idea. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489103 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/init.d/qpidd | 83 ----------------------------------------------- qpid/cpp/etc/qpidd | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 83 deletions(-) delete mode 100755 qpid/cpp/etc/init.d/qpidd create mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/init.d/qpidd b/qpid/cpp/etc/init.d/qpidd deleted file mode 100755 index 0c6041b063..0000000000 --- a/qpid/cpp/etc/init.d/qpidd +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -# -# qpidd Startup script for the Qpid messaging daemon. -# -# chkconfig: - 85 15 -# description: Qpidd is an AMQP broker. It receives, stores and routes -# messages sent using the AMQP protcol. -# processname: qpidd -# pidfile: /var/run/qpidd.pid -# -# NB: add config: entries here when qpidd gets a config file. - -# Source function library. -. /etc/rc.d/init.d/functions - -if [ -f /etc/sysconfig/qpidd ]; then - . /etc/sysconfig/qpidd -fi - -# Start qpidd in the C locale by default. -QPIDD_LANG=${QPIDD_LANG-"C"} - -qpidd=${QPIDD-/usr/sbin/qpidd} -prog=qpidd -pidfile=${PIDFILE-/var/run/qpidd.pid} -lockfile=${LOCKFILE-/var/lock/subsys/qpidd} -RETVAL=0 - -start() { - echo -n $"Starting $prog: " - LANG=$QPIDD_LANG daemon $qpidd $OPTIONS - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - killproc 2 $qpidd - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} - -reload() { - echo -n $"Reloading $prog: " - killproc $qpidd -HUP - RETVAL=$? - echo -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $qpidd - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi - ;; - reload) - reload - ;; - *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" - exit 1 -esac - -exit $RETVAL diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd new file mode 100755 index 0000000000..0c6041b063 --- /dev/null +++ b/qpid/cpp/etc/qpidd @@ -0,0 +1,83 @@ +#!/bin/bash +# +# qpidd Startup script for the Qpid messaging daemon. +# +# chkconfig: - 85 15 +# description: Qpidd is an AMQP broker. It receives, stores and routes +# messages sent using the AMQP protcol. +# processname: qpidd +# pidfile: /var/run/qpidd.pid +# +# NB: add config: entries here when qpidd gets a config file. + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/qpidd ]; then + . /etc/sysconfig/qpidd +fi + +# Start qpidd in the C locale by default. +QPIDD_LANG=${QPIDD_LANG-"C"} + +qpidd=${QPIDD-/usr/sbin/qpidd} +prog=qpidd +pidfile=${PIDFILE-/var/run/qpidd.pid} +lockfile=${LOCKFILE-/var/lock/subsys/qpidd} +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + LANG=$QPIDD_LANG daemon $qpidd $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc 2 $qpidd + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} + +reload() { + echo -n $"Reloading $prog: " + killproc $qpidd -HUP + RETVAL=$? + echo +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $qpidd + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f ${pidfile} ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.1 From 1a5f3f72cc85d88e23d47d4b7ccb52c281205942 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 23 Dec 2006 17:20:37 +0000 Subject: - rpm: make rpm now builds RPMs under rpm/ directory. - src/qpidd.cpp: added --daemon option to run as daemon. - etc/qpidd: fixed bugs in init.rc script. - qpidc.spec: fixed rpmlint warnings, added apache URL git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489905 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 0c6041b063..cfd6049c9b 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -3,32 +3,21 @@ # qpidd Startup script for the Qpid messaging daemon. # # chkconfig: - 85 15 -# description: Qpidd is an AMQP broker. It receives, stores and routes -# messages sent using the AMQP protcol. +# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. # processname: qpidd -# pidfile: /var/run/qpidd.pid # -# NB: add config: entries here when qpidd gets a config file. + +prog=qpidd +lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions -if [ -f /etc/sysconfig/qpidd ]; then - . /etc/sysconfig/qpidd -fi - -# Start qpidd in the C locale by default. -QPIDD_LANG=${QPIDD_LANG-"C"} - -qpidd=${QPIDD-/usr/sbin/qpidd} -prog=qpidd -pidfile=${PIDFILE-/var/run/qpidd.pid} -lockfile=${LOCKFILE-/var/lock/subsys/qpidd} RETVAL=0 start() { - echo -n $"Starting $prog: " - LANG=$QPIDD_LANG daemon $qpidd $OPTIONS + echo -n $"Starting Qpid AMQP daemon: " + daemon $prog --daemon RETVAL=$? echo [ $RETVAL = 0 ] && touch ${lockfile} @@ -36,18 +25,16 @@ start() { } stop() { - echo -n $"Stopping $prog: " - killproc 2 $qpidd + echo -n $"Stopping Qpid AMQP daemon: " + killproc $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } -reload() { - echo -n $"Reloading $prog: " - killproc $qpidd -HUP - RETVAL=$? - echo +restart() { + stop + start } # See how we were called. @@ -59,24 +46,20 @@ case "$1" in stop ;; status) - status $qpidd + status $prog RETVAL=$? ;; - restart) - stop - start + restart|reload) + restart ;; condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi + if [ -e $lockfile ] ; then restart ; fi ;; reload) reload ;; *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac -- cgit v1.2.1 From 732544fe86089ab86c03fcc48d5ca4c72667c275 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:05:56 +0000 Subject: * cpp: svn removed, will rename cpp-0-9 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520705 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 66 ------------------------------------------------------ 1 file changed, 66 deletions(-) delete mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd deleted file mode 100755 index cfd6049c9b..0000000000 --- a/qpid/cpp/etc/qpidd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# qpidd Startup script for the Qpid messaging daemon. -# -# chkconfig: - 85 15 -# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. -# processname: qpidd -# - -prog=qpidd -lockfile=/var/lock/subsys/$prog - -# Source function library. -. /etc/rc.d/init.d/functions - -RETVAL=0 - -start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon $prog --daemon - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -stop() { - echo -n $"Stopping Qpid AMQP daemon: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $prog - RETVAL=$? - ;; - restart|reload) - restart - ;; - condrestart) - if [ -e $lockfile ] ; then restart ; fi - ;; - reload) - reload - ;; - *) - echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" - exit 1 -esac - -exit $RETVAL -- cgit v1.2.1 From d2eb3361494710466280341c98f76c03536d2ebe Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:08:18 +0000 Subject: Renamed cpp-0-9 to cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520706 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd new file mode 100755 index 0000000000..cfd6049c9b --- /dev/null +++ b/qpid/cpp/etc/qpidd @@ -0,0 +1,66 @@ +#!/bin/bash +# +# qpidd Startup script for the Qpid messaging daemon. +# +# chkconfig: - 85 15 +# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. +# processname: qpidd +# + +prog=qpidd +lockfile=/var/lock/subsys/$prog + +# Source function library. +. /etc/rc.d/init.d/functions + +RETVAL=0 + +start() { + echo -n $"Starting Qpid AMQP daemon: " + daemon $prog --daemon + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping Qpid AMQP daemon: " + killproc $prog + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $prog + RETVAL=$? + ;; + restart|reload) + restart + ;; + condrestart) + if [ -e $lockfile ] ; then restart ; fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.1 From f05f30bf883e66a5281847ccb1094f0a921de6aa Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 9 Jul 2007 14:26:42 +0000 Subject: Update for Fedora init-scripts guidelines: * etc/qpidd: Provide an LSB header. Allow options to be specified via QPIDD_OPTIONS=... in /etc/sysconfig/qpidd. Diagnose and 'exit 3' for the unsupported "reload". Don't mention unused $pidfile. Remove useless curly braces: ${lockfile} -> $lockfile. Write usage and error diagnostics to stderr, not stdout. Change spelling: condrestart -> try-restart. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@554659 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 57 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 21 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index cfd6049c9b..ed9a3ececb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -2,10 +2,21 @@ # # qpidd Startup script for the Qpid messaging daemon. # + +### BEGIN INIT INFO +# Provides: qpidd +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start or stop qpidd +# Description: Qpidd is an AMQP broker. It receives, stores, routes and +# forwards messages using the AMQP protcol. +### END INIT INFO + # chkconfig: - 85 15 # description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. # processname: qpidd -# prog=qpidd lockfile=/var/lock/subsys/$prog @@ -13,15 +24,20 @@ lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions +QPIDD_OPTIONS= +if [ -f /etc/sysconfig/$prog ] ; then + . /etc/sysconfig/$prog +fi + RETVAL=0 start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon $prog --daemon - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL + echo -n $"Starting Qpid AMQP daemon: " + daemon --check $prog $prog --daemon $QPIDD_OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch $lockfile + return $RETVAL } stop() { @@ -29,7 +45,12 @@ stop() { killproc $prog RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} + [ $RETVAL = 0 ] && rm -f $lockfile +} + +reload() { + echo 1>&2 $"$0: reload not supported" + exit 3 } restart() { @@ -39,27 +60,21 @@ restart() { # See how we were called. case "$1" in - start) - start - ;; - stop) - stop + start|stop|restart|reload) + $1 ;; status) - status $prog + status $prog RETVAL=$? ;; - restart|reload) + force-reload) restart ;; - condrestart) - if [ -e $lockfile ] ; then restart ; fi - ;; - reload) - reload + try-restart) + [ -e $lockfile ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" + echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac -- cgit v1.2.1 From ccc97ff1b41f0b952888b24735238b39e0fe882d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 20 Aug 2007 13:09:46 +0000 Subject: * qpidc.spec.in: Fix rpmlint "macro in changelog" warning. * etc/qpidd: Put description on one line. Continuation line causing rpmlint to barf with "wrong-line-in-lsb-tag * configure.ac: Fix typo. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@567683 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index ed9a3ececb..6aa79339d7 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -10,8 +10,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: start or stop qpidd -# Description: Qpidd is an AMQP broker. It receives, stores, routes and -# forwards messages using the AMQP protcol. +# Description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. ### END INIT INFO # chkconfig: - 85 15 -- cgit v1.2.1 From ef54864bf80d631f4d24e5d6e81843c9ae27045a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 3 Oct 2007 22:19:41 +0000 Subject: From Nuno Santos , fix options in qpidd startup script. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@581739 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 1 - 1 file changed, 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 6aa79339d7..821e50a9a2 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -23,7 +23,6 @@ lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions -QPIDD_OPTIONS= if [ -f /etc/sysconfig/$prog ] ; then . /etc/sysconfig/$prog fi -- cgit v1.2.1 From f6afed79c8618f02431bdd9d3ca25e75deef184e Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 4 Oct 2007 15:32:45 +0000 Subject: * docs/man/qpidd.x: Explain configuration options. * etc/qpidd.conf: Placeholder configuration file. * qpidc.spec.in: Install qpidd.conf * Makefile.am: Install qpidd.conf * src/qpid/Options.cpp, h, src/qpidd.cpp: Option formatting fixes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@581951 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 qpid/cpp/etc/qpidd.conf (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf new file mode 100644 index 0000000000..8064767e78 --- /dev/null +++ b/qpid/cpp/etc/qpidd.conf @@ -0,0 +1,2 @@ +# Configuration file for qpidd. +# Using default settings, qpidd --help to see defaults. -- cgit v1.2.1 From d376cf7c6d58f27aa38f4f986e87f9579816e255 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Tue, 1 Apr 2008 15:23:01 +0000 Subject: QPID-892: Make qpidd daemon not run as root (rpm install) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@643442 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 821e50a9a2..55d885ef66 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -31,7 +31,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --check $prog $prog --daemon $QPIDD_OPTIONS + daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon $QPIDD_OPTIONS\"" RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From eb34891fb4886a975039df3aa58ecbffa299acd6 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Tue, 1 Apr 2008 21:41:23 +0000 Subject: QPID-892 - use daemon params instead of runuser; store pid of qpidd daemon to kill single instance git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@643597 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 55d885ef66..d9076191d6 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -19,6 +19,7 @@ prog=qpidd lockfile=/var/lock/subsys/$prog +pidfile=/var/run/qpidd.pid # Source function library. . /etc/rc.d/init.d/functions @@ -31,19 +32,24 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon $QPIDD_OPTIONS\"" + daemon --pidfile $pidfile --check $prog --user qpidd $prog --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile + if [ $RETVAL = 0 ]; then + touch $pidfile + chown qpidd.qpidd $pidfile + runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile" + fi return $RETVAL } stop() { echo -n $"Stopping Qpid AMQP daemon: " - killproc $prog + killproc -p ${pidfile} $prog RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f $lockfile + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } reload() { -- cgit v1.2.1 From b5202b04f4fffdd22f5815485f075225d614bd73 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Thu, 17 Apr 2008 14:31:01 +0000 Subject: add full path to qpidd in init script, as it fails in some environments with just the command name git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@649126 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index d9076191d6..aae65853cb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,7 +32,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd $prog --daemon $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From 506e9145d1be22eb13560ec34658334d5211e5c7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 24 Apr 2008 15:04:45 +0000 Subject: emacs/qpid-c++-mode.el: qpid-c++-mode for Emacs. qpid-style indentation plus some useful commands for inserting copyrights etc. Feel free to improve it, there's lots of room. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@651287 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/emacs/qpid-c++-mode.el | 226 ++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 qpid/cpp/etc/emacs/qpid-c++-mode.el (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/emacs/qpid-c++-mode.el b/qpid/cpp/etc/emacs/qpid-c++-mode.el new file mode 100644 index 0000000000..102966f86b --- /dev/null +++ b/qpid/cpp/etc/emacs/qpid-c++-mode.el @@ -0,0 +1,226 @@ +;;; qpid-c++-mode.el --- Qpid specific c++-mode customizations. + +;; +;; 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. +;; + +;;;===================================================================== +;;; Commentary: +;; +;; C++ customizations to make c++ mode follow the Qpid style guidelines, +;; along with some other handy functions to generate initial starting point +;; .h and .cpp files etc. +;; +;; I have this in my .emacs: +;; (add-to-list 'auto-mode-alist '("\\.h$" . c++-mode)) +;; (require 'qpid-c++-mode) +;; +;; Written by Alan Conway: aconway@redhat.com +;; +;; For latest version, check +;; http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/cpp/etc/emacs/qpid-c++.el +;; + +(require 'cc-mode) + +;; Increment the version number if you change this file. +(defconst qpid-c++-version "1.00" "Qpid C++ style support version number.") + +(defun qpid-c++-version () + "Echo the current version of qpid-c++-mode in the minibuffer." + (interactive) + (message "Using qpid-c++-mode version %s" qpid-c++-version)) + +(defun qpid-c++-mode () + "Qpid C++ mode customizations" + (c-add-style "qpid-c++" + '("gnu" + (indent-tabs-mode . nil) + (c-basic-offset . 4) + (c-offsets-alist . + ((statement-case-intro . *) + (statement-case-open . *) + (substatement-open . 0) + (case-label . *) + (access-label . /) + (friend . /) + (arglist-intro . +) + (arglist-cont . 0) + (arglist-close . 0) + (inline-open . 0) + (brace-list-open . 0) + (innamespace . 0) + ))) ) + (c-set-style "qpid-c++") + (setq c-hungry-delete-key t) + (setq c-tab-always-indent t) + (setq c-hanging-braces-alist '((substatement-open . (after)) + (extern-lang-open . (after)) + (defun-open . (after)) + (class-open . (after)) + (block-open . (after)) + + (inline-open . (after)) + (defun-block-intro . (after)) + (inclass . (after)) + (topmost-intro . (after)) + + (brace-list-open) + (brace-list-close) + (namespace-open) + )) + (setq c-hanging-colons-alist '((member-init-intro) + (inher-intro) + (case-label) + (label) + (access-label))) + (setq mode-name "Qpid C++")) + + +(defun copyright () + (interactive) + (insert "/* + * + * 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. + * + */")) + +(defun indent-buffer () + (interactive) + (indent-region (point-min) (point-max) nil)) + +(defun path-to-namespace (path) + (replace-regexp-in-string "/" "::" (replace-regexp-in-string "/$" "" path))) + +(defun src-subpath (path) + (if (string-match "/src/\\(.*\\)$" path) (match-string 1 path) "")) + +(defun namespace-for-file (file) + (path-to-namespace (src-subpath (file-name-directory file)))) + +(defun cpp-guard-for-file (file) + (upcase (replace-regexp-in-string "[/.-]" "_" (src-subpath file)))) + +(defun ask-for-namespace () + (read-from-minibuffer "Namespace: " (namespace-for-file (buffer-file-name)))) + +;;; Generate starting point code for new files + +(defun insert-ns-open (namespaces) + (mapcar (lambda (ns) (insert "namespace " ns " {\n")) namespaces)) + +(defun insert-ns-close (namespaces) + (mapcar (lambda (ns) (insert "}")) namespaces) + (insert " // namespace " (mapconcat 'identity namespaces "::") "\n")) + +(defun ns-around-region (namespace) + (interactive (list (ask-for-namespace))) + (save-excursion + (let ((namespaces (split-string namespace "::"))) + (if (< (mark) (point)) (exchange-point-and-mark)) + (insert "\n") + (insert-ns-open namespaces) + (goto-char (mark)) + (insert "\n") + (insert-ns-close namespaces)))) + +(defun insert-class.h (class namespaces) + "Insert class skeleton in .h file" + (insert-ns-open namespaces) + (insert "\n" + "/**\n *\n */\n" + " class " class "\n" + " {\n public:\nprivate:\n};\n" + ) + (insert-ns-close namespaces)) + +(defun insert-platform.h (class namespaces) + "Insert platform #include for platform class." + (insert "#include \n" + "#include QPID_PLATFORM_H(" class ".h)\n")) + +(defun .h (namespace &optional content) + "Initialize a .h file with Qpid copyright etc." + (interactive (list (ask-for-namespace))) + (copyright) + (let ((content (or content 'insert-class.h)) + (class (file-name-nondirectory + (file-name-sans-extension(buffer-file-name)))) + (namespaces (split-string namespace "::"))) + + (insert "\n") + (apply content class namespaces nil) + (insert "\n")) + (previous-line 1) + (beginning-of-line) + (indent-buffer) + (save-excursion (cpp-guard))) + +(defun .cpp (namespace) + "Initialize an empty .cpp file with Qpid copyright etc." + (interactive (list (ask-for-namespace))) + (copyright) + (insert "\n#include \"" (file-name-sans-extension + (file-name-nondirectory buffer-file-name)) + ".h\"\n\n") + (let ((namespaces (split-string namespace "::"))) + (insert-ns-open namespaces) + (insert-ns-close namespaces)) + (indent-buffer)) + +(defun cpp-guard () + "Insert C preprocessor macro guard to prevent file rescanning. +The guard macro is defined from the name of the immediate containing +directory and the name of the file." + (interactive) + (let ((name (cpp-guard-for-file (buffer-file-name)))) + (goto-char (point-min)) + (save-excursion + (if (looking-at "#ifndef .*\n#define .*\n\n") + (let ((ifndef (match-data 0))) + (goto-char (point-max)) + (previous-line 1) + (beginning-of-line) + (if (looking-at "#endif") + (progn + (kill-line 1) + (kill-region (car ifndef) (cadr ifndef))))))) + (insert "#ifndef " name "\n#define " name "\n\n") + (goto-char (point-max)) + (beginning-of-line) + (insert (format "#endif /*!%s*/\n" name)))) + +(add-hook 'c++-mode-hook 'qpid-c++-mode) + +(provide 'qpid-c++-mode) + + -- cgit v1.2.1 From 485022ac7cd72b40cb4c99f2e27389d016a31371 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 9 May 2008 18:09:43 +0000 Subject: QPID-648: Patch from Matt Farrellee - support for realms - updates to packaging to create a default db and the necessary conf files for plain and anon git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@654902 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ qpid/cpp/etc/sasl2/qpidd.conf | 24 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 qpid/cpp/etc/Makefile.am create mode 100644 qpid/cpp/etc/sasl2/qpidd.conf (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am new file mode 100644 index 0000000000..34a1a0062d --- /dev/null +++ b/qpid/cpp/etc/Makefile.am @@ -0,0 +1,34 @@ +SASL_CONF = sasl2/qpidd.conf + +EXTRA_DIST = \ + $(SASL_CONF) \ + qpidd qpidd.conf + +nobase_sysconf_DATA = \ + qpidd.conf + +if HAVE_SASL +SASL_DB = sasl2/qpidd.sasldb + +nobase_sysconf_DATA += \ + $(SASL_CONF) + +sasldbdir = $(localstatedir)/lib/qpidd +sasldb_DATA = $(SASL_DB) + +# Setup the default sasldb file with a single user, guest, with an +# obvious password. This user and password are the default for many +# clients. +# +# The realm specified by -u is very important, and QPID is the default +# for the broker so we use it here. The realm is important because it +# defaults to the local hostname of the machine running the +# broker. This may not seem to bad at first glance, but it means that +# the sasldb has to be tailored to each machine that would be running +# a broker, and if the machine ever changed its name the +# authentication would stop working until the sasldb was updated. For +# these reasons we always want the broker to specify a realm where its +# users live, and we want the users to exist in that realm as well. +$(SASL_DB): + echo guest | /usr/sbin/saslpasswd2 -c -p -f $(SASL_DB) -u QPID guest +endif diff --git a/qpid/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf new file mode 100644 index 0000000000..42466b60cb --- /dev/null +++ b/qpid/cpp/etc/sasl2/qpidd.conf @@ -0,0 +1,24 @@ +# +# This configuation allows for either SASL PLAIN or ANONYMOUS +# authentication. The PLAIN authentication is done on a +# username+password, which is stored in the sasldb_path +# file. Usernames and passwords can be added to the file using the +# command: +# +# saslpasswd2 -f /var/lib/qpidd/qpidd.sasldb -u +# +# The REALM is important and should be the same as the --auth-realm +# option to the broker. This lets the broker properly find the user in +# the sasldb file. +# +# Existing user accounts may be listed with: +# +# sasldblistusers2 -f /var/lib/qpidd/qpidd.sasldb +# +# NOTE: The sasldb file must be readable by the user running the qpidd +# daemon, and should be readable only by that user. +# +mech_list: plain anonymous +pwcheck_method: auxprop +auxprop_plugin: sasldb +sasldb_path: /var/lib/qpidd/qpidd.sasldb -- cgit v1.2.1 From c217711e8fc633aa1c6ca1690a8ccc970fe3b693 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 12 May 2008 18:45:17 +0000 Subject: Fix to allow VPATH builds to work after checkin for QPID-648 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@655597 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 34a1a0062d..6c7fa13c29 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -8,7 +8,7 @@ nobase_sysconf_DATA = \ qpidd.conf if HAVE_SASL -SASL_DB = sasl2/qpidd.sasldb +SASL_DB = qpidd.sasldb nobase_sysconf_DATA += \ $(SASL_CONF) -- cgit v1.2.1 From a3c4c567d0d1c616f3f9fcefe12f5c24d71a27c6 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 2 Jun 2008 21:20:35 +0000 Subject: QPID-1114 Daemon mode improvements git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662570 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- qpid/cpp/etc/qpidd.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index aae65853cb..62b92b223a 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -39,7 +39,7 @@ start() { if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile" + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index 8064767e78..64126be454 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -1,2 +1,3 @@ # Configuration file for qpidd. # Using default settings, qpidd --help to see defaults. +pid-dir=/var/run/qpidd -- cgit v1.2.1 From 689ad38a3f4c5ff468bc3c7ae095019f79c97f9d Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 3 Jun 2008 15:13:01 +0000 Subject: QPID-1114 moved --pid-dir from config file to startup script git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662821 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 4 ++-- qpid/cpp/etc/qpidd.conf | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 62b92b223a..1071ddbffe 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,14 +32,14 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" fi return $RETVAL } diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index 64126be454..8064767e78 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -1,3 +1,2 @@ # Configuration file for qpidd. # Using default settings, qpidd --help to see defaults. -pid-dir=/var/run/qpidd -- cgit v1.2.1 From a60d332b358f41205f1f862dc2de9d15b2802ded Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 3 Jun 2008 18:19:29 +0000 Subject: QPID-1114 Change defaults for data-dir and pid-dir to /home/ross/.qpidd git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662854 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 1071ddbffe..912cd64ecb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,7 +32,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From ec2a87c8b4d5873c3ea4e88e7c02e1b6200400ea Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 12 Jun 2008 19:19:22 +0000 Subject: Propagate error messages across the Demux between network & user threads. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@667205 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index 8064767e78..0ace726f26 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -1,2 +1,3 @@ -# Configuration file for qpidd. -# Using default settings, qpidd --help to see defaults. +# Configuration file for qpidd. Entries are of the form: +# name = value +# Using default settings: "qpidd --help" or "man qpidd" for more details. -- cgit v1.2.1 From d843260b5ca7b8945144c27e584777c9b6da276a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 20 Jun 2008 21:23:23 +0000 Subject: Patch from Manuel Teira: https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038 - Use standard automake makefiles to build cpp/examples. - Rationalize examples directory structure. Additions to patch: - Fix for VPATH builds. - Fix make distcheck (finally!) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@670066 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 6c7fa13c29..f683459cd4 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -31,4 +31,7 @@ sasldb_DATA = $(SASL_DB) # users live, and we want the users to exist in that realm as well. $(SASL_DB): echo guest | /usr/sbin/saslpasswd2 -c -p -f $(SASL_DB) -u QPID guest + +CLEANFILES=$(SASL_DB) + endif -- cgit v1.2.1 From 01708e9a8d635c816cc6ad115e018deea2b5e940 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 11 Sep 2008 04:45:26 +0000 Subject: Refactored c++ client library to allow multiple protocols to be used simultaneously: - Added in capability for client library plugins: Client library will load in plugin modules from the client library module directory on library load. - Add protocol option into the standard client command line options - Split plugin module load area into daemon and client; default daemon module directory is now /qpid/daemon, default client module directory is /qpid/client. - Changed names of plugins to leave out libqpid prefix git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@694113 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 4 ++++ qpid/cpp/etc/qpidc.conf | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 qpid/cpp/etc/qpidc.conf (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index f683459cd4..d3dd67d35e 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -4,6 +4,10 @@ EXTRA_DIST = \ $(SASL_CONF) \ qpidd qpidd.conf +confdir=$(sysconfdir)/qpid +nobase_conf_DATA=\ + qpidc.conf + nobase_sysconf_DATA = \ qpidd.conf diff --git a/qpid/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf new file mode 100644 index 0000000000..065442399e --- /dev/null +++ b/qpid/cpp/etc/qpidc.conf @@ -0,0 +1,2 @@ +# Configuration file for the qpid client library. Entries are of the form: +# name = value -- cgit v1.2.1 From 4a6d773e42d470a7440cef55ced1d381ba7c33c1 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 11 Sep 2008 19:11:09 +0000 Subject: Add qpidc.conf to the distfile list git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@694426 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index d3dd67d35e..0d6574d171 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -2,7 +2,7 @@ SASL_CONF = sasl2/qpidd.conf EXTRA_DIST = \ $(SASL_CONF) \ - qpidd qpidd.conf + qpidd qpidd.conf qpidc.conf confdir=$(sysconfdir)/qpid nobase_conf_DATA=\ -- cgit v1.2.1 From 134b171215d8a8cb648d75d64d25b6f420e90a2f Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 4 Dec 2008 15:31:22 +0000 Subject: Example config files are misleading as spaces on either side of the '=' prevent the options being parsed correctly. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@723356 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidc.conf | 7 +++++-- qpid/cpp/etc/qpidd.conf | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf index 065442399e..bb68e59168 100644 --- a/qpid/cpp/etc/qpidc.conf +++ b/qpid/cpp/etc/qpidc.conf @@ -1,2 +1,5 @@ -# Configuration file for the qpid client library. Entries are of the form: -# name = value +# Configuration file for the qpid c++ client library. Entries are of +# the form: +# name=value +# +# (Note: no spaces on either side of '=') diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index 0ace726f26..8007606e02 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -1,3 +1,5 @@ -# Configuration file for qpidd. Entries are of the form: -# name = value -# Using default settings: "qpidd --help" or "man qpidd" for more details. +# Configuration file for qpidd. Entries are of the form: +# name=value +# +# (Note: no spaces on either side of '='). Using default settings: +# "qpidd --help" or "man qpidd" for more details. -- cgit v1.2.1 From c576dfafe5f336c51e277e9961c200b1d1723b17 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 15 Dec 2008 11:21:43 +0000 Subject: Added missing ASF license to conf files and init script git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@726681 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidc.conf | 18 ++++++++++++++++++ qpid/cpp/etc/qpidd | 18 ++++++++++++++++++ qpid/cpp/etc/qpidd.conf | 18 ++++++++++++++++++ qpid/cpp/etc/sasl2/qpidd.conf | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf index bb68e59168..588999c074 100644 --- a/qpid/cpp/etc/qpidc.conf +++ b/qpid/cpp/etc/qpidc.conf @@ -1,3 +1,21 @@ +# +# 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. +# # Configuration file for the qpid c++ client library. Entries are of # the form: # name=value diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 912cd64ecb..f168430069 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -1,5 +1,23 @@ #!/bin/bash # +# 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. +# +# # qpidd Startup script for the Qpid messaging daemon. # diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index 8007606e02..d5d9344281 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -1,3 +1,21 @@ +# +# 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. +# # Configuration file for qpidd. Entries are of the form: # name=value # diff --git a/qpid/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf index 42466b60cb..05bfbdd5a9 100644 --- a/qpid/cpp/etc/sasl2/qpidd.conf +++ b/qpid/cpp/etc/sasl2/qpidd.conf @@ -1,4 +1,22 @@ # +# 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. +# +# # This configuation allows for either SASL PLAIN or ANONYMOUS # authentication. The PLAIN authentication is done on a # username+password, which is stored in the sasldb_path -- cgit v1.2.1 From 62910b3fa3691d3d159f22fba349541b5cd83cac Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 15 Dec 2008 15:17:40 +0000 Subject: Added ASF license to makefiles git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@726710 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 0d6574d171..5df3a1ae2e 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -1,3 +1,21 @@ +# +# 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. +# SASL_CONF = sasl2/qpidd.conf EXTRA_DIST = \ -- cgit v1.2.1 From de26a37fe587e9ddd8814c0fb9193617daf5dbc5 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 7 Jan 2009 12:22:05 +0000 Subject: Remove mechanism restrictions from default sasl config file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@732317 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/sasl2/qpidd.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf index 05bfbdd5a9..45eea4592b 100644 --- a/qpid/cpp/etc/sasl2/qpidd.conf +++ b/qpid/cpp/etc/sasl2/qpidd.conf @@ -36,7 +36,6 @@ # NOTE: The sasldb file must be readable by the user running the qpidd # daemon, and should be readable only by that user. # -mech_list: plain anonymous pwcheck_method: auxprop auxprop_plugin: sasldb sasldb_path: /var/lib/qpidd/qpidd.sasldb -- cgit v1.2.1 From 9c08dfdadaa01a71c7814eb356757322f631867f Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 20 Feb 2009 17:11:40 +0000 Subject: Add dummy option to example conf file that suppresses a spurious cyrus sasl warning. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@746296 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/sasl2/qpidd.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf index 45eea4592b..933926d817 100644 --- a/qpid/cpp/etc/sasl2/qpidd.conf +++ b/qpid/cpp/etc/sasl2/qpidd.conf @@ -39,3 +39,7 @@ pwcheck_method: auxprop auxprop_plugin: sasldb sasldb_path: /var/lib/qpidd/qpidd.sasldb + +#following line stops spurious 'sql_select option missing' errors when +#cyrus-sql-sasl plugin is installed +sql_select: dummy select \ No newline at end of file -- cgit v1.2.1 From 45858e9eafbbf4470851959e1b36255a9079c1a6 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 20 Feb 2009 17:13:01 +0000 Subject: Added missing new line to end of conf file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@746297 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/sasl2/qpidd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf index 933926d817..3197d7792a 100644 --- a/qpid/cpp/etc/sasl2/qpidd.conf +++ b/qpid/cpp/etc/sasl2/qpidd.conf @@ -42,4 +42,4 @@ sasldb_path: /var/lib/qpidd/qpidd.sasldb #following line stops spurious 'sql_select option missing' errors when #cyrus-sql-sasl plugin is installed -sql_select: dummy select \ No newline at end of file +sql_select: dummy select -- cgit v1.2.1 From b4a8deeb520451eb429fe5360752a9918c49ff1a Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Wed, 7 Oct 2009 23:43:27 +0000 Subject: Added more install-related content to the CMake structure. Adds changes requested in QPID-2123, modified somewhat. Also adds Windows-specific installer content in cpp/packaging. Other specific packaging things can be added there as well. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@822965 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 qpid/cpp/etc/CMakeLists.txt (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt new file mode 100644 index 0000000000..03121b364a --- /dev/null +++ b/qpid/cpp/etc/CMakeLists.txt @@ -0,0 +1,20 @@ +# +# 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. +# + +install(FILES qpidd.conf qpidc.conf DESTINATION ${QPID_INSTALL_CONFDIR}) -- cgit v1.2.1 From d50c0097f81d4a026d6345a29b8a94c157e53d27 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 29 Oct 2009 10:17:45 +0000 Subject: condrestart was mentioned in usage but not supported in case; made it a synonym for existing try-restart. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@830879 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index f168430069..8e6e74b33c 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -92,7 +92,7 @@ case "$1" in force-reload) restart ;; - try-restart) + try-restart|condrestart) [ -e $lockfile ] && restart || : ;; *) -- cgit v1.2.1 From 3eec514af793a6de8e4b64c831e813d4817d8694 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 9 Nov 2009 17:27:28 +0000 Subject: Set default mechanism for cluster updates to be ANONYMOUS git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@834153 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf index d5d9344281..8082660f6f 100644 --- a/qpid/cpp/etc/qpidd.conf +++ b/qpid/cpp/etc/qpidd.conf @@ -21,3 +21,4 @@ # # (Note: no spaces on either side of '='). Using default settings: # "qpidd --help" or "man qpidd" for more details. +cluster-mechanism=ANONYMOUS -- cgit v1.2.1 From 950f4b40bfc05db37d91d960cda163f557dd5e50 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 20 Nov 2009 01:04:03 +0000 Subject: Removed the Visual Studio solution/project files, as these are now generated by CMake. Added CMakeLists.txt files to Makefile.am, and all other needed support files so that the 'make dist' supplies all needed items for building a release kit on Windows. Fixes QPID-2134 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@882373 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 5df3a1ae2e..8731641360 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -20,7 +20,7 @@ SASL_CONF = sasl2/qpidd.conf EXTRA_DIST = \ $(SASL_CONF) \ - qpidd qpidd.conf qpidc.conf + qpidd qpidd.conf qpidc.conf CMakeLists.txt confdir=$(sysconfdir)/qpid nobase_conf_DATA=\ -- cgit v1.2.1 From 2ed9600279e9b84584f6013f63ff3aa58a6225e0 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 19 Apr 2010 15:44:02 +0000 Subject: Add restorecon to qpid init script to allow SELinux to correctly handle pidfile attributes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@935629 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 8e6e74b33c..b4118f0866 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -57,6 +57,7 @@ start() { if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile + [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" fi return $RETVAL -- cgit v1.2.1 From 8b62e0738891e73e4b09fb0b2be3080906738b7a Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 26 Apr 2010 12:50:22 +0000 Subject: QPID-1811: Look for saslpasswd2 at configure time instead of hardcoding its location (autotools build only as cmake build doesn't currently build a custom sasl passwd file) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@938026 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 8731641360..c91dbcbbad 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/cpp/etc/Makefile.am @@ -52,7 +52,7 @@ sasldb_DATA = $(SASL_DB) # these reasons we always want the broker to specify a realm where its # users live, and we want the users to exist in that realm as well. $(SASL_DB): - echo guest | /usr/sbin/saslpasswd2 -c -p -f $(SASL_DB) -u QPID guest + echo guest | $(SASL_PASSWD) -c -p -f $(SASL_DB) -u QPID guest CLEANFILES=$(SASL_DB) -- cgit v1.2.1 From 845fa1600142ab5c9b7b44589b3e531626e1393b Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 30 Apr 2010 16:01:11 +0000 Subject: Added a couple of tests to init script and use env var for data dir if set git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@939726 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index b4118f0866..f391da3cde 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -48,17 +48,31 @@ fi RETVAL=0 +#ensure binary is present and executable +if [[ !(-x /usr/sbin/$prog) ]] ; then + echo "/usr/sbin/$prog not found or not executable" + exit 5 +fi + +#ensure user has sufficient permissions +runuser -s /bin/sh qpidd -c "echo x > /dev/null" 2> /dev/null || RETVAL=4 +if [ $RETVAL = 4 ]; then + echo "user had insufficient privilege"; + exit $RETVAL +fi + start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS + [[ $QPID_DATA_DIR ]] || QPID_DATA_DIR=/var/lib/qpidd + echo -n $"Starting Qpid AMQP daemon: " + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --data-dir $QPID_DATA_DIR --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" + [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } @@ -97,8 +111,8 @@ case "$1" in [ -e $lockfile ] && restart || : ;; *) - echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 + echo 1>&2 $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}" + exit 2 esac exit $RETVAL -- cgit v1.2.1 From 032866de5d7cccafac52faeaa333b9dae4811761 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 11 Jun 2010 12:49:52 +0000 Subject: QPID-2666: Fix for init script problem where config file has "log-to-file" set with a relative path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@953687 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index f391da3cde..07cbb825d5 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -72,7 +72,7 @@ start() { touch $pidfile chown qpidd.qpidd $pidfile [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" + runuser - -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } -- cgit v1.2.1 From 7ccf7dbd8d1695e6ace648850aa079e9f7407b5b Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 12 Jul 2010 20:50:35 +0000 Subject: QPID-2709: update references to the old incubator mailing lists and svn repository addresses Applied patch from Emmanuel Bourg git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963482 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/emacs/qpid-c++-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/emacs/qpid-c++-mode.el b/qpid/cpp/etc/emacs/qpid-c++-mode.el index 102966f86b..ed1b4aa44b 100644 --- a/qpid/cpp/etc/emacs/qpid-c++-mode.el +++ b/qpid/cpp/etc/emacs/qpid-c++-mode.el @@ -32,7 +32,7 @@ ;; Written by Alan Conway: aconway@redhat.com ;; ;; For latest version, check -;; http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/cpp/etc/emacs/qpid-c++.el +;; http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/etc/emacs/qpid-c++-mode.el ;; (require 'cc-mode) -- cgit v1.2.1 From 1d986872fe4f00a0f502fa334f67def44977cb30 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 15 Jul 2010 19:42:23 +0000 Subject: Selinux policy module needed to run a qpid cluster with selinux in enforcing mode. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964551 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpidd.te | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 qpid/cpp/etc/selinux/qpidd.te (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te new file mode 100644 index 0000000000..9163c55acf --- /dev/null +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -0,0 +1,16 @@ +# selinux policy module needed to run a qpid cluster with selinux in enforcing mode. + +policy_module(qpidd, 1.1) +require { + type initrc_t; + type ccs_t; + type aisexec_t; +} +#============= ccs_t ============== +fs_rw_tmpfs_files(ccs_t) +allow ccs_t initrc_t:sem rw_sem_perms; +allow ccs_t initrc_t:shm rw_shm_perms; +allow ccs_t self:capability ipc_owner; +allow aisexec_t initrc_t:sem rw_sem_perms; +allow aisexec_t initrc_t:shm rw_shm_perms; +allow aisexec_t self:capability { ipc_owner dac_override }; -- cgit v1.2.1 From b9b8004b7b13530d70502f0cf947037a6c265525 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 20 Jul 2010 13:28:14 +0000 Subject: Added compile instructions to selinux policy source file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@965840 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpidd.te | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te index 9163c55acf..92ff3043bd 100644 --- a/qpid/cpp/etc/selinux/qpidd.te +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -1,4 +1,6 @@ -# selinux policy module needed to run a qpid cluster with selinux in enforcing mode. +# selinux policy needed to run a qpid cluster with selinux in enforcing mode. +# To build the compiled .pp file in this directory do: +# make -f /usr/share/selinux/devel/Makefile policy_module(qpidd, 1.1) require { -- cgit v1.2.1 From 0f1e39bcfc971ddbcc3bf1a3a62e177c1d714b0f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Jul 2010 16:37:04 +0000 Subject: Added selinux policy so developers can run cluster tests with enforcing=1 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@966302 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpidd.te | 10 +++++++--- qpid/cpp/etc/selinux/qpiddevel.te | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 qpid/cpp/etc/selinux/qpiddevel.te (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te index 92ff3043bd..322645531e 100644 --- a/qpid/cpp/etc/selinux/qpidd.te +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -1,6 +1,10 @@ -# selinux policy needed to run a qpid cluster with selinux in enforcing mode. -# To build the compiled .pp file in this directory do: -# make -f /usr/share/selinux/devel/Makefile +# selinux policy needed to run the qpidd service with clustering +# enabled and selinux in enforcing mode. +# +# To build the qpid.pp module in this directory do: +# sudo make -f /usr/share/selinux/devel/Makefile +# To install the compiled qpidd.pp +# sudo semodule -i qpidd.pp policy_module(qpidd, 1.1) require { diff --git a/qpid/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te new file mode 100644 index 0000000000..092b9fc203 --- /dev/null +++ b/qpid/cpp/etc/selinux/qpiddevel.te @@ -0,0 +1,23 @@ +# selinux policy for qpid developers. +# If you have configured a qpid source tree with cluster support, you will need +# this policy to run the make check tests with with selinux in enforcing mode. +# +# To build the qpid.pp module in this directory do: +# sudo make -f /usr/share/selinux/devel/Makefile +# To install the compiled qpiddevel.pp +# sudo semodule -i qpiddevel.pp + +module qpiddevel 1.0; + +require { + type unconfined_t; + type aisexec_t; + class capability sys_admin; + class sem { write unix_read unix_write associate read destroy }; + class shm { unix_read write unix_write associate read destroy }; +} + +#============= aisexec_t ============== +allow aisexec_t self:capability sys_admin; +allow aisexec_t unconfined_t:sem { write unix_read unix_write associate read destroy }; +allow aisexec_t unconfined_t:shm { unix_read write unix_write associate read destroy }; -- cgit v1.2.1 From e4c52614d3b80e0068422b20b45a8bba1239e57a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Jul 2010 17:29:08 +0000 Subject: Added makefile to build & install selinux policy modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@966323 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/.gitignore | 7 +++++++ qpid/cpp/etc/selinux/Makefile | 14 ++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 qpid/cpp/etc/selinux/.gitignore create mode 100644 qpid/cpp/etc/selinux/Makefile (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/.gitignore b/qpid/cpp/etc/selinux/.gitignore new file mode 100644 index 0000000000..9e81f21cbd --- /dev/null +++ b/qpid/cpp/etc/selinux/.gitignore @@ -0,0 +1,7 @@ +/qpidd.fc +/qpidd.if +/qpidd.pp +/qpiddevel.fc +/qpiddevel.if +/qpiddevel.pp +/tmp diff --git a/qpid/cpp/etc/selinux/Makefile b/qpid/cpp/etc/selinux/Makefile new file mode 100644 index 0000000000..440879d1ed --- /dev/null +++ b/qpid/cpp/etc/selinux/Makefile @@ -0,0 +1,14 @@ +# Makefile to build and install the selinux policies in this directory. +# Needs to be run as root. + +POLICIES = qpidd.pp qpiddevel.pp +SOURCES = $(POLICIES:.pp=.te) + +install: $(POLICIES) + for p in $(POLICIES); do /usr/sbin/semodule -i $$p; done + +$(POLICIES): $(SOURCES) + make -f /usr/share/selinux/devel/Makefile + +clean: + rm -rf *~ *.pp *.fc *.if tmp -- cgit v1.2.1 From 862f986a4ab70a12df8f0d200f7a38d48936dfd2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 28 Jul 2010 20:32:36 +0000 Subject: Updated developer SELinux policy to also allow tests run under valgrind. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@980198 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpiddevel.te | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te index 092b9fc203..0968f6eeb1 100644 --- a/qpid/cpp/etc/selinux/qpiddevel.te +++ b/qpid/cpp/etc/selinux/qpiddevel.te @@ -12,6 +12,7 @@ module qpiddevel 1.0; require { type unconfined_t; type aisexec_t; + type unconfined_execmem_t; class capability sys_admin; class sem { write unix_read unix_write associate read destroy }; class shm { unix_read write unix_write associate read destroy }; @@ -21,3 +22,5 @@ require { allow aisexec_t self:capability sys_admin; allow aisexec_t unconfined_t:sem { write unix_read unix_write associate read destroy }; allow aisexec_t unconfined_t:shm { unix_read write unix_write associate read destroy }; +allow aisexec_t unconfined_execmem_t:sem { write unix_read unix_write associate read destroy }; +allow aisexec_t unconfined_execmem_t:shm { write unix_read unix_write associate read destroy }; -- cgit v1.2.1 From 7e86bd7adcfa93064c65ae22c92df15ecc0f7e90 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 9 Aug 2010 19:29:10 +0000 Subject: Add missing destroy permissions to qpidd selinux module. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983784 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpidd.te | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te index 322645531e..05721db812 100644 --- a/qpid/cpp/etc/selinux/qpidd.te +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -19,4 +19,6 @@ allow ccs_t initrc_t:shm rw_shm_perms; allow ccs_t self:capability ipc_owner; allow aisexec_t initrc_t:sem rw_sem_perms; allow aisexec_t initrc_t:shm rw_shm_perms; +allow aisexec_t initrc_t:sem destroy; +allow aisexec_t initrc_t:shm destroy; allow aisexec_t self:capability { ipc_owner dac_override }; -- cgit v1.2.1 From c97f626955e2a78af2b14d478d9eff308e53a44b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 12 Aug 2010 16:43:27 +0000 Subject: Updated selinux policy to work on versions lacking aisexec_t. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984858 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/Makefile | 6 ++++-- qpid/cpp/etc/selinux/qpidd.te | 32 +++++++++++++++++++------------- qpid/cpp/etc/selinux/qpiddevel.te | 27 ++++++++++++++++----------- 3 files changed, 39 insertions(+), 26 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/Makefile b/qpid/cpp/etc/selinux/Makefile index 440879d1ed..e44ec2224b 100644 --- a/qpid/cpp/etc/selinux/Makefile +++ b/qpid/cpp/etc/selinux/Makefile @@ -4,11 +4,13 @@ POLICIES = qpidd.pp qpiddevel.pp SOURCES = $(POLICIES:.pp=.te) -install: $(POLICIES) - for p in $(POLICIES); do /usr/sbin/semodule -i $$p; done +all: $(POLICIES) $(POLICIES): $(SOURCES) make -f /usr/share/selinux/devel/Makefile +install: $(POLICIES) + for p in $(POLICIES); do /usr/sbin/semodule -i $$p; done + clean: rm -rf *~ *.pp *.fc *.if tmp diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te index 05721db812..e830575fd1 100644 --- a/qpid/cpp/etc/selinux/qpidd.te +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -6,19 +6,25 @@ # To install the compiled qpidd.pp # sudo semodule -i qpidd.pp -policy_module(qpidd, 1.1) -require { +policy_module(qpidd, 1.2) + +gen_require(` type initrc_t; type ccs_t; - type aisexec_t; -} -#============= ccs_t ============== + class sem { write unix_read unix_write associate read destroy }; + class shm { unix_read write unix_write associate read destroy }; +') + fs_rw_tmpfs_files(ccs_t) -allow ccs_t initrc_t:sem rw_sem_perms; -allow ccs_t initrc_t:shm rw_shm_perms; -allow ccs_t self:capability ipc_owner; -allow aisexec_t initrc_t:sem rw_sem_perms; -allow aisexec_t initrc_t:shm rw_shm_perms; -allow aisexec_t initrc_t:sem destroy; -allow aisexec_t initrc_t:shm destroy; -allow aisexec_t self:capability { ipc_owner dac_override }; +allow ccs_t initrc_t:sem { read write unix_read unix_write associate destroy }; +allow ccs_t initrc_t:shm { read write unix_read unix_write associate destroy }; +allow ccs_t self:capability { ipc_owner dac_override }; + +optional_policy(` + gen_require(` + type aisexec_t; + ') + allow aisexec_t initrc_t:sem { read write unix_read unix_write associate destroy }; + allow aisexec_t initrc_t:shm { read write unix_read unix_write associate destroy }; + allow aisexec_t self:capability { sys_admin ipc_owner dac_override }; +') diff --git a/qpid/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te index 0968f6eeb1..5b280288f7 100644 --- a/qpid/cpp/etc/selinux/qpiddevel.te +++ b/qpid/cpp/etc/selinux/qpiddevel.te @@ -7,20 +7,25 @@ # To install the compiled qpiddevel.pp # sudo semodule -i qpiddevel.pp -module qpiddevel 1.0; +policy_module(qpiddevel, 1.1) -require { +gen_require(` type unconfined_t; - type aisexec_t; - type unconfined_execmem_t; + type ccs_t; class capability sys_admin; class sem { write unix_read unix_write associate read destroy }; class shm { unix_read write unix_write associate read destroy }; -} +') -#============= aisexec_t ============== -allow aisexec_t self:capability sys_admin; -allow aisexec_t unconfined_t:sem { write unix_read unix_write associate read destroy }; -allow aisexec_t unconfined_t:shm { unix_read write unix_write associate read destroy }; -allow aisexec_t unconfined_execmem_t:sem { write unix_read unix_write associate read destroy }; -allow aisexec_t unconfined_execmem_t:shm { write unix_read unix_write associate read destroy }; +allow ccs_t self:capability sys_admin; +allow ccs_t unconfined_t:sem { write unix_read unix_write associate read destroy }; +allow ccs_t unconfined_t:shm { unix_read write unix_write associate read destroy }; + +optional_policy(` + gen_require(` + type aisexec_t; + ') + allow aisexec_t self:capability sys_admin; + allow aisexec_t unconfined_t:sem { read write unix_read unix_write associate destroy }; + allow aisexec_t unconfined_t:shm { read write unix_read unix_write associate destroy }; +') -- cgit v1.2.1 From b6a46afb970b0e9f8b87a1ec26b94e93fc0828c0 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 13 Aug 2010 20:41:33 +0000 Subject: Fix qpiddevel selinux policy to work with valgrind. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@985356 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpiddevel.te | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te index 5b280288f7..95e1c934b6 100644 --- a/qpid/cpp/etc/selinux/qpiddevel.te +++ b/qpid/cpp/etc/selinux/qpiddevel.te @@ -11,6 +11,7 @@ policy_module(qpiddevel, 1.1) gen_require(` type unconfined_t; + type unconfined_execmem_t; type ccs_t; class capability sys_admin; class sem { write unix_read unix_write associate read destroy }; @@ -28,4 +29,7 @@ optional_policy(` allow aisexec_t self:capability sys_admin; allow aisexec_t unconfined_t:sem { read write unix_read unix_write associate destroy }; allow aisexec_t unconfined_t:shm { read write unix_read unix_write associate destroy }; + allow aisexec_t unconfined_execmem_t:sem { write unix_read unix_write associate read destroy }; + allow aisexec_t unconfined_execmem_t:shm { write unix_read unix_write associate read destroy }; + ') -- cgit v1.2.1 From c4bafa4c2a626c0c7a952f6b19fc2a7f15c23793 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 27 Oct 2010 09:44:57 +0000 Subject: Added some missing licenses; added FedOps.h to distribution list git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1027879 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/Makefile b/qpid/cpp/etc/selinux/Makefile index e44ec2224b..1ab6337114 100644 --- a/qpid/cpp/etc/selinux/Makefile +++ b/qpid/cpp/etc/selinux/Makefile @@ -1,3 +1,21 @@ +# +# 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. +# # Makefile to build and install the selinux policies in this directory. # Needs to be run as root. -- cgit v1.2.1 From 368c86d008aabb122d6b1b034e497bfb56c73e2b Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 28 Oct 2010 20:58:44 +0000 Subject: Add ASF licence to the git ignore files git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1028476 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/.gitignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/.gitignore b/qpid/cpp/etc/selinux/.gitignore index 9e81f21cbd..aca772170b 100644 --- a/qpid/cpp/etc/selinux/.gitignore +++ b/qpid/cpp/etc/selinux/.gitignore @@ -1,3 +1,22 @@ +# +# 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. +# + /qpidd.fc /qpidd.if /qpidd.pp -- cgit v1.2.1 From 4978d516e39c7862934bed5eb0cdcfb528f0390e Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 31 Oct 2010 23:39:39 +0000 Subject: add ASF licence to various files in the cpp tree git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029521 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/selinux/qpidd.te | 19 +++++++++++++++++++ qpid/cpp/etc/selinux/qpiddevel.te | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te index e830575fd1..52b8e29509 100644 --- a/qpid/cpp/etc/selinux/qpidd.te +++ b/qpid/cpp/etc/selinux/qpidd.te @@ -1,3 +1,22 @@ +# +# 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. +# + # selinux policy needed to run the qpidd service with clustering # enabled and selinux in enforcing mode. # diff --git a/qpid/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te index 95e1c934b6..10c5dfc880 100644 --- a/qpid/cpp/etc/selinux/qpiddevel.te +++ b/qpid/cpp/etc/selinux/qpiddevel.te @@ -1,3 +1,22 @@ +# +# 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. +# + # selinux policy for qpid developers. # If you have configured a qpid source tree with cluster support, you will need # this policy to run the make check tests with with selinux in enforcing mode. -- cgit v1.2.1