Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line
  
  QPID-685 : Update to address dependency issues and update the NOTICE file.
........
  r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line
  
  moved the keys file to the parent folder
........
  r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line
  
  removed the KEYS file, as now it is in the parent folder
........
  r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line
  
  Fixed runtime dependency in the management console.
........
  r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line
  
  added eclipse license details to the NOTICE file
........
  r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line
  
  Added the full text of the additional licenses.
........
  r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines
  
  Added the full text of the additional licenses.
  Moved ICU licence text from NOTICE to LICENSE
........
  r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines
  
  Added boost license
........
  r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line
  
  Added source links for EPL and MPL libraries
........
  r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Added incubator disclaimer.
........
  r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Added AMQP licence information.
........
  r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line
  
  added disclaimers and AMP license to all languages
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@599806 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 152 insertions, 0 deletions

diff --git a/cpp/DISCLAIMER b/cpp/DISCLAIMER
new file mode 100644
index 0000000000..c321113c9e
--- /dev/null
+++ b/cpp/DISCLAIMER
@@ -0,0 +1,5 @@
+Apache Qpid is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/cpp/LICENSE b/cpp/LICENSE
index 6b0b1270ff..8211e7c96e 100644
--- a/cpp/LICENSE
+++ b/cpp/LICENSE
@@ -201,3 +201,150 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+=========================================================================
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+==========================================================================
+                        AMQP License
+=========================================================================
+    Copyright Notice
+    ================
+    (c) Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
+    iMatix Corporation, IONA\ufffd Technologies, Red Hat, Inc.,
+    TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
+    
+    License
+    =======
+    JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix 
+    Corporation, IONA Technologies, Red Hat, Inc., TWIST Process Innovations, and 
+    29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
+    perpetual, royalty-free, nontransferable, nonexclusive license to
+    (i) copy, display, distribute and implement the Advanced Messaging Queue Protocol
+    ("AMQP") Specification and (ii) the Licensed Claims that are held by
+    the Authors, all for the purpose of implementing the Advanced Messaging
+    Queue Protocol Specification. Your license and any rights under this
+    Agreement will terminate immediately without notice from
+    any Author if you bring any claim, suit, demand, or action related to
+    the Advanced Messaging Queue Protocol Specification against any Author.
+    Upon termination, you shall destroy all copies of the Advanced Messaging
+    Queue Protocol Specification in your possession or control.
+
+    As used hereunder, "Licensed Claims" means those claims of a patent or
+    patent application, throughout the world, excluding design patents and
+    design registrations, owned or controlled, or that can be sublicensed
+    without fee and in compliance with the requirements of this
+    Agreement, by an Author or its affiliates now or at any
+    future time and which would necessarily be infringed by implementation
+    of the Advanced Messaging Queue Protocol Specification. A claim is
+    necessarily infringed hereunder only when it is not possible to avoid
+    infringing it because there is no plausible non-infringing alternative
+    for implementing the required portions of the Advanced Messaging Queue
+    Protocol Specification. Notwithstanding the foregoing, Licensed Claims
+    shall not include any claims other than as set forth above even if
+    contained in the same patent as Licensed Claims; or that read solely
+    on any implementations of any portion of the Advanced Messaging Queue
+    Protocol Specification that are not required by the Advanced Messaging
+    Queue Protocol Specification, or that, if licensed, would require a
+    payment of royalties by the licensor to unaffiliated third parties.
+    Moreover, Licensed Claims shall not include (i) any enabling technologies
+    that may be necessary to make or use any Licensed Product but are not
+    themselves expressly set forth in the Advanced Messaging Queue Protocol
+    Specification (e.g., semiconductor manufacturing technology, compiler
+    technology, object oriented technology, networking technology, operating
+    system technology, and the like); or (ii) the implementation of other
+    published standards developed elsewhere and merely referred to in the
+    body of the Advanced Messaging Queue Protocol Specification, or
+    (iii) any Licensed Product and any combinations thereof the purpose or
+    function of which is not required for compliance with the Advanced
+    Messaging Queue Protocol Specification. For purposes of this definition,
+    the Advanced Messaging Queue Protocol Specification shall be deemed to
+    include both architectural and interconnection requirements essential
+    for interoperability and may also include supporting source code artifacts
+    where such architectural, interconnection requirements and source code
+    artifacts are expressly identified as being required or documentation to
+    achieve compliance with the Advanced Messaging Queue Protocol Specification.
+    
+    As used hereunder, "Licensed Products" means only those specific portions
+    of products (hardware, software or combinations thereof) that implement
+    and are compliant with all relevant portions of the Advanced Messaging
+    Queue Protocol Specification.
+    
+    The following disclaimers, which you hereby also acknowledge as to any
+    use you may make of the Advanced Messaging Queue Protocol Specification:
+    
+    THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
+    AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+    IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
+    CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
+    SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
+    MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY 
+    PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+    
+    THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+    INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+    USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
+    PROTOCOL SPECIFICATION.
+    
+    The name and trademarks of the Authors may NOT be used in any manner,
+    including advertising or publicity pertaining to the Advanced Messaging
+    Queue Protocol Specification or its contents without specific, written
+    prior permission. Title to copyright in the Advanced Messaging Queue
+    Protocol Specification will at all times remain with the Authors.
+    
+    No other rights are granted by implication, estoppel or otherwise.
+    
+    Upon termination of your license or rights under this Agreement, you
+    shall destroy all copies of the Advanced Messaging Queue Protocol
+    Specification in your possession or control.
+    
+    Trademarks
+    ==========
+    "JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the
+    Octagon Symbol are trademarks of JPMorgan Chase & Co.
+    
+    IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
+    
+    IONA, IONA Technologies, and the IONA logos are trademarks of IONA
+    Technologies PLC and/or its subsidiaries.
+    
+    LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered
+    trademarks of Red Hat, Inc. in the US and other countries.
+    
+    Java, all Java-based trademarks and OpenOffice.org are trademarks of
+    Sun Microsystems, Inc. in the United States, other countries, or both.
+    
+    Other company, product, or service names may be trademarks or service
+    marks of others.
+    
+    Links to full AMQP specification:
+    =================================
+    http://www.envoytech.org/spec/amq/
+    http://www.iona.com/opensource/amqp/
+    http://www.redhat.com/solutions/specifications/amqp/
+    http://www.twiststandards.org/tiki-index.php?page=AMQ
+    http://www.imatix.com/amqp