From 760ecc745470919ecde45a610c2f02411183b620 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Fri, 22 Aug 2008 14:34:33 +0000 Subject: QPID-1258: Remove crufty duplicates of DISCLAIMER, LICENSE, NOTICE and README. Update RELEASE_NOTES.txt. Ensure legal files are included in the jar and archives. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@688088 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/build.xml | 18 ++- qpid/java/module.xml | 4 +- qpid/java/release-docs/RELEASE_NOTES.txt | 112 ++++----------- qpid/java/resources/DISCLAIMER | 12 +- qpid/java/resources/LICENSE.txt | 203 ---------------------------- qpid/java/resources/META-INF/DISCLAIMER | 10 -- qpid/java/resources/META-INF/DISCLAIMER.txt | 7 - qpid/java/resources/META-INF/LICENSE | 203 ---------------------------- qpid/java/resources/META-INF/NOTICE | 105 -------------- qpid/java/resources/NOTICE.txt | 36 ----- qpid/java/resources/README.txt | 40 ------ 11 files changed, 53 insertions(+), 697 deletions(-) delete mode 100755 qpid/java/resources/LICENSE.txt delete mode 100644 qpid/java/resources/META-INF/DISCLAIMER delete mode 100644 qpid/java/resources/META-INF/DISCLAIMER.txt delete mode 100644 qpid/java/resources/META-INF/LICENSE delete mode 100644 qpid/java/resources/META-INF/NOTICE delete mode 100644 qpid/java/resources/NOTICE.txt delete mode 100644 qpid/java/resources/README.txt diff --git a/qpid/java/build.xml b/qpid/java/build.xml index 375fbbac94..4f7a26dfb2 100644 --- a/qpid/java/build.xml +++ b/qpid/java/build.xml @@ -33,14 +33,16 @@ + + - - - - + + + + @@ -116,6 +118,7 @@ + @@ -144,7 +147,14 @@ + + + + + + + diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 50b68ee633..cdc260399c 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -279,7 +279,9 @@ - + + + diff --git a/qpid/java/release-docs/RELEASE_NOTES.txt b/qpid/java/release-docs/RELEASE_NOTES.txt index 1004ec62b4..cdddbc4254 100644 --- a/qpid/java/release-docs/RELEASE_NOTES.txt +++ b/qpid/java/release-docs/RELEASE_NOTES.txt @@ -1,105 +1,47 @@ -Apache Incubator Qpid Java M2 Release Notes +Apache Qpid Incubating Java M3 Release Notes ------------------------------------------- -The Qpid M2 release contains support the for AMQP 0-8 specification. -You can access the 0-8 specification using the following link. +The Qpid M3 release contains support for AMQP 0-8, 0-9 and 0-10. You +can access the specifications from http://www.amqp.org/tikiwiki/tiki-index.php?page=Download -For full details of Qpid capabilities, as they currently stand, see our -detailed project documentation at: +For full details of Apache Qpid's capabilities see our detailed +project documentation at: http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation From the link above you can access our Getting Started Guide, FAQ, Build How To and detailed developer documentation. +New features, Improvements and Bug fixes +---------------------- -Known Issues/Outstanding Work ------------------------------ - -You can view the outstanding task list for Qpid by visiting our JIRA: -http://issues.apache.org/jira/browse/QPID - -These issues are moved to M3 release. - -Here is a filtered list for your convinience ---------------------------------------- -New Feature QPID-274 add connection configuratble timeout on waituntilStateHasChanged -New Feature QPID-156 Implement persistence to disk for Qpid -New Feature QPID-155 Add ability to configure (on/off) queue creation on demand -New Feature QPID-43 Multiple-AMQP version support in the broker -New Feature QPID-28 Allow user to select policy for undeliverable message handling -New Feature QPID-27 Introduce user configurable redlivery delay -New Feature QPID-22 Provide run scripts for clustered broker - -Improvement QPID-430 Message Age Alerting should not depend upon queue activity -Improvement QPID-19 Add protocol logging capability to client and broker -Improvement QPID-11 Move protocol literals from code to AMQConstant +AMQP 0-10 support (client only) +Apache Derby persistent message store +Transient transactional performance has greatly increased. -Bug QPID-539 HeadersExchange doesnot correctly implement isBound -Bug QPID-517 Broker doesn't return NO_CONSUMERS code for an immediate message, when the consumer is disconnected. -Bug QPID-469 Redelivered information is currently recorded per message it should be per message per queue. -Bug QPID-463 Java client doesn't close connection gracefully when faced with broker with unsuported protocol version -Bug QPID-462 Exclusive queues and with subscription that 'filtersMessages' will build up messages it doesn't hasInterest() in. +A full list can be found: +http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12312117&styleName=Text&projectId=12310520 -Bug QPID-397 Client closeure can be processed before final message ack. -Bug QPID-396 Broker OutOfMemory Error handling -Bug QPID-377 NumberFormatException thrown by broker when running one performance test -Bug QPID-293 setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery queue. - -Bug QPID-185 Amend Java Broker handling of ifUnused & ifEmpty flags -Bug QPID-168 qpid-server.bat needs updated to support same arguments/features as qpid-server (via qpid-run) bash script - - -M2 Tasks Completed -------------------- - -The set of JIRA tasks completed as part of the M2 effort is available at: -https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310520&styleName=Html&version=12312116 +Known Issues/Outstanding Work +----------------------------- -Here is a filtered (by Java components) version of the JIRA items +QPID-959: Fail over between a 0-9 and a 0-10 broker is not supported. -Task QPID-190 refactoring the java broker mbean classes -Task QPID-125 Moving eclipse plugin for broker management to Maven -Task QPID-93 Delete the old management modules (trunk\qpid\java\management) +QPID-1190: A "protocol not supported" exception is logged when a Java client +connects to a Java broker because it initially attempts to negotiate +AMQP 0-10. -New Feature QPID-428 Add login functionality for a qpid server from the management console -New Feature QPID-418 Add ability to save user preferences to Java Management Console -New Feature QPID-170 Enhance Management features to support moving a message from one queue to another +QPID-1251: On windows platforms the following run time exception is thrown and displayed when initiating a connection with an 0.9 broker: + Exception in thread "IoReceiver - localhost/localhost:5672" + java.lang.RuntimeException: connection closed -Improvement QPID-482 [Java] Small performance tweaks -Improvement QPID-466 Create STRICT_AMQP System property to disable JMS extensions in Java client -Improvement QPID-453 AMQShortString should implement Comparable -Improvement QPID-422 Consolidate notification view to display all user configured notifications on one view -Improvement QPID-421 Provide enumerated description for static constants including delivery mode -Improvement QPID-420 Add client id to information displayed about connections on management console -Improvement QPID-419 Introduce read-only and modify authorisation for all objects in a virtual host -Improvement QPID-129 improving Broker MBeans + Moreover, when closing JMS connections the JMS exception listener may + receive the following JMS exception: -Bug QPID-540 Transient Broker throws NullPointerException and locks up. -Bug QPID-538 [Memory Leak] Connecting lots of consumers causes the broker memory to leak -Bug QPID-537 Make AMQMessage.incrementReference public -Bug QPID-531 [Memory Leak] Broker retains messages that are consumed with NO_ACK -Bug QPID-527 encoding issue -Bug QPID-508 [Memory Leak] Broker does not return mandatory messages sent outside of a transaction. -Bug QPID-476 AMQProtocolSession channelId2SessionMap does not have sessions removed -Bug QPID-472 Creation of TemporaryQueues will not guarantee unqiue queue names if created rapidly. -Bug QPID-471 UserManagement panel lists all users but only after a View Users has been executed and is not updated on Create/Delete User + javax.jms.JMSException: connection was closed at + org.apache.qpid.client.AMQConnectionDelegate_0_10.onClosed(AMQConnectionDelegate_0_10.java:164) -Bug QPID-467 Complete Interop Testing -Bug QPID-465 Incorrect Exception thrown from send() method. -Bug QPID-459 Broker doesn't correctly handle noLocal consumers when messages are pre-exisiting on queues. -Bug QPID-458 Queue Browsing Broken -Bug QPID-454 Message 'taken' notion is per message. But should be per message per queue -Bug QPID-443 Abruptly disconnecting client on transaction publish causes error -Bug QPID-440 Can create dangling transactions on unroutable messages. -Bug QPID-436 topic exchange doesn't obey the mandatory flag -Bug QPID-414 Authentication requires plain text passwords in password file -Bug QPID-408 Queue Depth data incorrect -Bug QPID-290 Java broker does not honor maximum number of channels threshold -Bug QPID-276 Potential race condition in AMQChannel -Bug QPID-200 set/get Destination not implemented in JMSMessage impl -Bug QPID-166 Check for pre conditions to satisfy JMS spec requirments -Bug QPID-162 over 600 warnings when building under Eclipse -Bug QPID-159 The following Interface implementations do not throw Exceptions as required by the spec +You can view the outstanding task list for Qpid by visiting our JIRA: +http://issues.apache.org/jira/browse/QPID diff --git a/qpid/java/resources/DISCLAIMER b/qpid/java/resources/DISCLAIMER index c321113c9e..024d7c2679 100644 --- a/qpid/java/resources/DISCLAIMER +++ b/qpid/java/resources/DISCLAIMER @@ -1,5 +1,11 @@ -Apache Qpid is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. +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. +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. +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/qpid/java/resources/LICENSE.txt b/qpid/java/resources/LICENSE.txt deleted file mode 100755 index 6b0b1270ff..0000000000 --- a/qpid/java/resources/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. - diff --git a/qpid/java/resources/META-INF/DISCLAIMER b/qpid/java/resources/META-INF/DISCLAIMER deleted file mode 100644 index 1ca63e46e2..0000000000 --- a/qpid/java/resources/META-INF/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -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/qpid/java/resources/META-INF/DISCLAIMER.txt b/qpid/java/resources/META-INF/DISCLAIMER.txt deleted file mode 100644 index d33c54a807..0000000000 --- a/qpid/java/resources/META-INF/DISCLAIMER.txt +++ /dev/null @@ -1,7 +0,0 @@ -Qpid is an effort undergoing incubation at the Apache Software Foundation -(ASF). 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. \ No newline at end of file diff --git a/qpid/java/resources/META-INF/LICENSE b/qpid/java/resources/META-INF/LICENSE deleted file mode 100644 index 6b0b1270ff..0000000000 --- a/qpid/java/resources/META-INF/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. - diff --git a/qpid/java/resources/META-INF/NOTICE b/qpid/java/resources/META-INF/NOTICE deleted file mode 100644 index f62ec14896..0000000000 --- a/qpid/java/resources/META-INF/NOTICE +++ /dev/null @@ -1,105 +0,0 @@ -// ------------------------------------------------------------------ -// NOTICE file corresponding to the section 4d of The Apache License, -// Version 2.0, in this case for Qpid Common Utilities -// ------------------------------------------------------------------ - -Apache Qpid -Copyright 2006-2007 Apache Software Foundation - -This product includes software developed at -Apache Software Foundation (http://www.apache.org/) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - relaxngDatatype:relaxngDatatype:jar:20020414 (http://sourceforge.net/projects/relaxng) -License: BSD License (http://www.opensource.org/licenses/bsd-license.php) - -This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - isorelax:isorelax:jar:20020414 -License: MIT license (http://www.opensource.org/licenses/mit-license.html) - -This product includes/uses software, SLF4J API Module (http://www.slf4j.org), -developed by QOS.ch (http://www.qos.ch) -License: MIT License (http://www.slf4j.org/license.html) - -This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1, -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Digester - commons-digester:commons-digester:jar:1.6 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0 -Ideveloped by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - msv:msv:jar:20020414 -developed by (https://msv.dev.java.net/) -License: - -This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/), -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/), -developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/) -License: Public Domain (http://creativecommons.org/licenses/publicdomain) - -This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl) -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - xerces:xercesImpl:jar:2.2.1 -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, - javax.servlet:servlet-api:jar:2.3 - -This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/), -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Apache MINA Java5 Extensions (http://directory.apache.org/subprojects/mina/mina-java5) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Jaxen - jaxen:jaxen:jar:1.0-FCS -License: Apache License (http://jaxen.org/faq.html) - -This product includes/uses software, BeanUtils (http://jakarta.apache.org/commons/beanutils/) -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, XML Commons External Components XML APIs (http://xml.apache.org/commons/#external), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Commons Beanutils Core - commons-beanutils:commons-beanutils-core:jar:1.7.0 -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4 -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Dom4j - dom4j:dom4j:jar:1.4 -developed by MetaStuff, Ltd. (http://www.dom4j.org/) -License: BSD License (http://www.dom4j.org/license.html) - -This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS -developed by Michael Kay (http://saxon.sourceforge.net/) -License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php) - diff --git a/qpid/java/resources/NOTICE.txt b/qpid/java/resources/NOTICE.txt deleted file mode 100644 index 82d3dbc632..0000000000 --- a/qpid/java/resources/NOTICE.txt +++ /dev/null @@ -1,36 +0,0 @@ -========================================================================= -== NOTICE file corresponding to the section 4 d of == -== the Apache License, Version 2.0, == -== in this case for the Apache Qpid distribution. == -========================================================================= - -This product includes software developed by the Apache Software Foundation -(http://www.apache.org/). - -Please read the LICENSE.txt file present in the root directory of this -distribution. - - -Aside from contributions to the Apache Qpid project, this software also -includes (binary only): - - - The SAXON XSLT Processor from Michael Kay distributed under the - Mozilla Public License v1.0, which is available for download at - http://saxon.sourceforge.net/ - - - The JUnit regression testing framework written by Erich Gamma - and Kent Beck and distributed under the Common Public License v1.0. - JUnit is available for download at - http://sourceforge.net/projects/junit/ - - - The Simple Logging Facade For Java (slf4j), Copyright (c) - 2004-2005 SLF4J.ORG, Copyright (c) 2004-2005 QOS.ch. slf4j is - licensed under identical terms to the MIT/X11 license and - available for download at http://www.slf4j.org/ - - - Software from the Eclipse project. The binaries from this project are - distributed under the Eclipse Public License and can be donwloaded - from http://www.eclipse.org/ - - - diff --git a/qpid/java/resources/README.txt b/qpid/java/resources/README.txt deleted file mode 100644 index 1d52d487fb..0000000000 --- a/qpid/java/resources/README.txt +++ /dev/null @@ -1,40 +0,0 @@ - -Documentation --------------- -All of our user documentation for the Qpid Java components can be accessed on our wiki at: - -http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation - -This includes a Getting Started Guide and FAQ as well as detailed developer documentation. -However, here's a VERY quick guide to running the installed Qpid broker, once you have installed it somewhere ! - - -Running the Broker ------------------- - -To run the broker, set the QPID_HOME environment variable to -distribution directory and add $QPID_HOME/bin to your PATH. Then run -the qpid-server shell script or qpid-server.bat batch file to start -the broker. By default, the broker will use $QPID_HOME/etc to find -the configuration files. You can supply a custom configuration using -the -c argument. - -For example: - -qpid-server -c ~/etc/config.xml - -You can get a list of all command line arguments by using the -h argument. - - -Developing ----------- - -In order to build Qpid you need Ant 1.6.5. Use ant -p to list the -available targets. The default ant target, build, creates a working -development-mode distribution in the build directory. To run the -scripts in build/bin set QPID_HOME to the build directory and put -${QPID_HOME}/bin on your PATH. The scripts in that directory include -the standard ones in the distribution and a number of testing scripts. - - - -- cgit v1.2.1