You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/13 15:49:27 UTC
qpid-jms-amqp-0-x git commit: QPID-8034: [Qpid JMS AMQP 0-x]
Standardise artefact/component names
Repository: qpid-jms-amqp-0-x
Updated Branches:
refs/heads/master 1c0f9fd63 -> c4f5cd7b7
QPID-8034: [Qpid JMS AMQP 0-x] Standardise artefact/component names
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/c4f5cd7b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/c4f5cd7b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/c4f5cd7b
Branch: refs/heads/master
Commit: c4f5cd7b7928e19abf91dfeeb83fa792d1f7bbcf
Parents: 1c0f9fd
Author: Keith Wall <kw...@apache.org>
Authored: Mon Nov 13 15:49:00 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Mon Nov 13 15:49:19 2017 +0000
----------------------------------------------------------------------
apache-qpid-jms-amqp-0-x/pom.xml | 98 ++++++++
.../src/main/assembly/LICENSE | 233 +++++++++++++++++++
.../src/main/assembly/NOTICE | 15 ++
.../src/main/assembly/README.txt | 3 +
.../src/main/assembly/bin.xml | 70 ++++++
.../DEPENDENCIES_REFERENCE | 33 +++
.../src/main/assembly/src.xml | 89 +++++++
client/example/pom.xml | 9 +-
client/pom.xml | 23 +-
client/src/main/assembly/LICENSE | 233 -------------------
client/src/main/assembly/NOTICE | 15 --
client/src/main/assembly/README.txt | 3 -
.../DEPENDENCIES_REFERENCE | 33 ---
client/src/main/assembly/qpid-client-bin.xml | 70 ------
.../qpid/client/AMQConnectionDelegate_8_0.java | 2 +-
.../qpid/configuration/ClientProperties.java | 2 +-
doc/jms-client-0-10/pom.xml | 4 +-
.../src/docbkx/JMS-Client-0-10-Book.xml | 2 +-
doc/jms-client-0-8/pom.xml | 4 +-
.../src/docbkx/JMS-Client-Binding-URL.xml | 2 +-
.../src/docbkx/JMS-Client-Book.xml | 2 +-
.../src/docbkx/JMS-Client-Introduction.xml | 4 +-
.../docbkx/JMS-Client-Message-Encryption.xml | 6 +-
.../src/docbkx/JMS-Client-Understanding.xml | 10 +-
doc/pom.xml | 2 +-
pom.xml | 17 +-
26 files changed, 581 insertions(+), 403 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/pom.xml
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/pom.xml b/apache-qpid-jms-amqp-0-x/pom.xml
new file mode 100644
index 0000000..d9db65f
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>apache-qpid-jms-amqp-0-x-parent</artifactId>
+ <version>6.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>apache-qpid-jms-amqp-0-x</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Qpid JMS AMQP 0-x Bundles</name>
+
+ <properties>
+ <dependency-change-verification>true</dependency-change-verification>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-src-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/LICENSE
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/LICENSE b/apache-qpid-jms-amqp-0-x/src/main/assembly/LICENSE
new file mode 100644
index 0000000..06833dc
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/LICENSE
@@ -0,0 +1,233 @@
+
+ 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.
+
+
+
+###############################################
+# Third Party Dependency Licensing Information:
+###############################################
+
+This product bundles the SLF4J API, which is distributed under
+the MIT licence:
+
+Copyright (c) 2004-2014 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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 AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/NOTICE
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/NOTICE b/apache-qpid-jms-amqp-0-x/src/main/assembly/NOTICE
new file mode 100644
index 0000000..314b973
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/NOTICE
@@ -0,0 +1,15 @@
+Apache Qpid JMS AMQP 0-x
+Copyright 2006-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+###############################################
+
+Apache Geronimo JMS 1.1 Spec
+Copyright 2003-2008 The Apache Software Foundation
+
+###############################################
+
+slf4j-api
+Copyright (c) 2004-2014 QOS.ch
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/README.txt
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/README.txt b/apache-qpid-jms-amqp-0-x/src/main/assembly/README.txt
new file mode 100644
index 0000000..eec46a5
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/README.txt
@@ -0,0 +1,3 @@
+Documentation for the Qpid components can be accessed on our website at:
+
+http://qpid.apache.org/documentation.html
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/bin.xml b/apache-qpid-jms-amqp-0-x/src/main/assembly/bin.xml
new file mode 100644
index 0000000..baf413e
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/bin.xml
@@ -0,0 +1,70 @@
+<?xml version='1.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.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>apache-qpid-jms-0-x-${project.version}-bin</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/src/main/assembly/</directory>
+ <outputDirectory/>
+ <includes>
+ <include>README.txt</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../client/example</directory>
+ <outputDirectory>example</outputDirectory>
+ <includes>
+ <include>src/**</include>
+ <include>pom.xml</include>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <scope>provided</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
+
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
new file mode 100644
index 0000000..c1be04c
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+
+#// ------------------------------------------------------------------
+# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
+#// ------------------------------------------------------------------
+
+Apache Qpid JMS Client for AMQP 0-9-1/0-10
+
+
+From: 'QOS.ch' (http://www.qos.ch)
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+
+
+
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/apache-qpid-jms-amqp-0-x/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/apache-qpid-jms-amqp-0-x/src/main/assembly/src.xml b/apache-qpid-jms-amqp-0-x/src/main/assembly/src.xml
new file mode 100644
index 0000000..f57635c
--- /dev/null
+++ b/apache-qpid-jms-amqp-0-x/src/main/assembly/src.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>apache-qpid-jms-0-x-${project.version}-src</baseDirectory>
+ <fileSets>
+ <!-- main project directory structure -->
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+ </exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the
+ release plugin checks out project sources into a location like
+ target/checkout, then runs the build from there. The result is
+ a source-release archive that comes from a pretty clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra goals
+ or generate a project website, it's definitely possible that some
+ of these files will be present. So, it's safer to exclude them.
+ -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+
+ <!-- misc -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+
+ <!-- jenkins workspace local repo -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.repository(/.*)?]</exclude>
+
+ <!-- log files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.log]</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <!-- Only include the generated dependencies file, we maintain license and notice ourselves -->
+ <include>DEPENDENCIES</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/example/pom.xml
----------------------------------------------------------------------
diff --git a/client/example/pom.xml b/client/example/pom.xml
index 905541e..1e13c29 100644
--- a/client/example/pom.xml
+++ b/client/example/pom.xml
@@ -20,32 +20,29 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
+ <artifactId>apache-qpid-jms-amqp-0-x-parent</artifactId>
<version>6.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>qpid-client-examples</artifactId>
- <name>Apache Qpid Client for AMQP 0-9-1/0-10 Examples</name>
- <description>JMS client examples.</description>
+ <name>Apache Qpid JMS AMQP 0-x Examples</name>
+ <description>Apache Qpid JMS AMQP 0-x Examples</description>
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 2447faa..313df23 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
+ <artifactId>apache-qpid-jms-amqp-0-x-parent</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-client</artifactId>
- <name>Apache Qpid JMS Client for AMQP 0-9-1/0-10</name>
+ <name>Apache Qpid JMS AMQP 0-x</name>
<description>JMS client supporting AMQP 0-8, 0-9, 0-9-1 and 0-10.</description>
<properties>
@@ -119,25 +119,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <!--version specified in parent pluginManagement -->
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/qpid-client-bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/assembly/LICENSE
----------------------------------------------------------------------
diff --git a/client/src/main/assembly/LICENSE b/client/src/main/assembly/LICENSE
deleted file mode 100644
index 06833dc..0000000
--- a/client/src/main/assembly/LICENSE
+++ /dev/null
@@ -1,233 +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.
-
-
-
-###############################################
-# Third Party Dependency Licensing Information:
-###############################################
-
-This product bundles the SLF4J API, which is distributed under
-the MIT licence:
-
-Copyright (c) 2004-2014 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-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 AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/assembly/NOTICE
----------------------------------------------------------------------
diff --git a/client/src/main/assembly/NOTICE b/client/src/main/assembly/NOTICE
deleted file mode 100644
index 88f318c..0000000
--- a/client/src/main/assembly/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-Qpid AMQP 0-x JMS Client
-Copyright 2006-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-###############################################
-
-Apache Geronimo JMS 1.1 Spec
-Copyright 2003-2008 The Apache Software Foundation
-
-###############################################
-
-slf4j-api
-Copyright (c) 2004-2014 QOS.ch
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/assembly/README.txt
----------------------------------------------------------------------
diff --git a/client/src/main/assembly/README.txt b/client/src/main/assembly/README.txt
deleted file mode 100644
index eec46a5..0000000
--- a/client/src/main/assembly/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Documentation for the Qpid components can be accessed on our website at:
-
-http://qpid.apache.org/documentation.html
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
deleted file mode 100644
index c1be04c..0000000
--- a/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ /dev/null
@@ -1,33 +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.
-#
-
-#// ------------------------------------------------------------------
-# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
-#// ------------------------------------------------------------------
-
-Apache Qpid JMS Client for AMQP 0-9-1/0-10
-
-
-From: 'QOS.ch' (http://www.qos.ch)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
- License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-
-
-
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/assembly/qpid-client-bin.xml
----------------------------------------------------------------------
diff --git a/client/src/main/assembly/qpid-client-bin.xml b/client/src/main/assembly/qpid-client-bin.xml
deleted file mode 100644
index d4eacac..0000000
--- a/client/src/main/assembly/qpid-client-bin.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.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.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <baseDirectory>qpid-client/${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/assembly/</directory>
- <outputDirectory/>
- <includes>
- <include>README.txt</include>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${basedir}/example</directory>
- <outputDirectory>example</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>README.txt</include>
- </includes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <scope>provided</scope>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
-
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index 383f551..bc2d375 100644
--- a/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
@@ -457,7 +457,7 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate
*/
public boolean isSupportedServerFeature(String featureName)
{
- // The Apache Qpid Broker for Java does not advertise features by the qpid.features property
+ // The Apache Qpid Broker-J does not advertise features by the qpid.features property
// for AMQP protocols 0-8..0-9-1 , so for now we just hardcode JMS selectors as supported.
return ServerPropertyNames.FEATURE_QPID_JMS_SELECTOR.equals(featureName);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/client/src/main/java/org/apache/qpid/configuration/ClientProperties.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/client/src/main/java/org/apache/qpid/configuration/ClientProperties.java
index daacb03..76c30a9 100644
--- a/client/src/main/java/org/apache/qpid/configuration/ClientProperties.java
+++ b/client/src/main/java/org/apache/qpid/configuration/ClientProperties.java
@@ -267,7 +267,7 @@ public class ClientProperties
* behaviour.
*
* Setting this system property true restores the old behaviour. It also avoids the isBound with a null exchange
- * that causes an error in the Apache Qpid Broker for Java (0.28 and earlier).
+ * that causes an error in the Apache Qpid Broker-J (0.28 and earlier).
*/
public static final String QPID_USE_LEGACY_GETQUEUEDEPTH_BEHAVIOUR = "qpid.use_legacy_getqueuedepth_behavior";
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-10/pom.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-10/pom.xml b/doc/jms-client-0-10/pom.xml
index 79c2a30..3bb1260 100644
--- a/doc/jms-client-0-10/pom.xml
+++ b/doc/jms-client-0-10/pom.xml
@@ -30,8 +30,8 @@
</parent>
<artifactId>qpid-java-doc-jms-client-0-10</artifactId>
- <name>Apache Qpid JMS Client for AMQP 0-10 Docbook</name>
- <description>Apache Qpid JMS client for AMQP 0-10 Documentation</description>
+ <name>Apache Qpid JMS AMQP 0-10 Docbook</name>
+ <description>Apache Qpid JMS AMQP 0-10 Documentation</description>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml b/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
index 912850b..6343306 100644
--- a/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
+++ b/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
@@ -2128,7 +2128,7 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather
The delay (in milliseconds) between the time a message is sent by a MessageProducer, and
the earliest time it becomes visible to consumers on any queue onto which it has been placed. Note that
this value only has an affect on brokers which support the feature (currently only the Apache Qpid
- Broker for Java), and only on queues where delivery delay has been enabled.
+ Broker-J), and only on queues where delivery delay has been enabled.
</entry>
</row>
</tbody>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/pom.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/pom.xml b/doc/jms-client-0-8/pom.xml
index 6824a62..eade22e 100644
--- a/doc/jms-client-0-8/pom.xml
+++ b/doc/jms-client-0-8/pom.xml
@@ -30,8 +30,8 @@
</parent>
<artifactId>qpid-java-doc-jms-client-0-8</artifactId>
- <name>Apache Qpid JMS Client for AMQP 0-8, 0-9 and 0-9-1 Docbook</name>
- <description>Apache Qpid JMS client for AMQP 0-8, 0-9 and 0-9-1 Documentation</description>
+ <name>Apache Qpid JMS AMQP 0-8, 0-9 and 0-9-1 Docbook</name>
+ <description>Apache Qpid JMS AMQP 0-8, 0-9 and 0-9-1 Documentation</description>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
index c0671f8..e695537 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
@@ -157,7 +157,7 @@
<entry><para>The delay (in milliseconds) between the time a message is sent by a MessageProducer, and
the earliest time it becomes visible to consumers on any queue onto which it has been placed. Note that
this value only has an affect on brokers which support the feature (currently only the Apache Qpid
- Broker for Java), and only on queues where delivery delay has been enabled.</para></entry>
+ Broker-J), and only on queues where delivery delay has been enabled.</para></entry>
</row>
</tbody>
</tgroup>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
index 454cc04..76e584d 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
@@ -21,7 +21,7 @@
-->
<book xmlns="http://docbook.org/ns/docbook" version="5.0">
- <title>Apache Qpid JMS Client for AMQP protocols 0-8, 0-9 and 0-9-1</title>
+ <title>Apache Qpid JMS AMQP 0-8/0-9/0-9-1</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="JMS-Client-Introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="JMS-Client-Document-Scope-And-Intended-Audience.xml"/>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
index 95dbdb9..26548aa 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
@@ -22,11 +22,11 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Introduction">
<title>Introduction</title>
- <para>Apache Qpid JMS client for AMQP 0-9-1/0-10 is an implementation of <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsSpec}">JMS specification
+ <para>Apache Qpid JMS AMQP 0-8/0-9-1/0-10 is an implementation of <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsSpec}">JMS specification
1.1</link>. It utilises an <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${amqpSrc}">AMQP</link> transport layer for the performing of messaging operations.
The client is intended to be used for writing of JMS compatible messaging applications. Such
applications can send and receive messages via any AMQP-compatible brokers like RabbitMQ,
- Apache Qpid Broker for Java which supports AMQP protocols 0-8, 0-9, or 0-9-1.</para>
+ Apache Qpid Broker-J which supports AMQP protocols 0-8, 0-9, or 0-9-1.</para>
<para>The Client hides the details of AMQP transport implementation behind the JMS API.
Thus, the developers need only to be familiar with JMS API in order to use the client. However,
the knowledge of the basic concepts of AMQP protocols can help developers in writing reliable
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
index 654cead..90e4766 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
@@ -53,7 +53,7 @@
</para>
<para>
In order to send an encrypted message it is necessary to know the Certificates of the intended recipients.
- Certificates can be distributed either through out-of-band mechanisms, or the Apache Qpid Broker for Java can be used
+ Certificates can be distributed either through out-of-band mechanisms, or the Apache Qpid Broker-J can be used
to distribute them to clients.
</para>
<para>
@@ -87,7 +87,7 @@
<programlisting>amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672?encryption_trust_store='/home/qpid/certificates.jks'&encryption_trust_store_password='password''</programlisting>
<para>
Alternatively, where available, you can configure the broker to distribute certificates from a trust
- store (this is currently only available in the Apache Qpid Broker for Java). In order to use this method, the broker
+ store (this is currently only available in the Apache Qpid Broker-J). In order to use this method, the broker
details in the connection url must contain the correctly configured
<link linkend="JMS-Client-0-8-Connection-URL-BrokerOptions-EncryptionRemoteTrustStore">encryption_remote_trust_store</link>
option. Such a connection URL might look somthing like:
@@ -187,7 +187,7 @@
<section xml:id="JMS-Client-Message-Encryption-Example-Introduction">
<title>Introduction</title>
<para>
- In this example we will setup the Qpid Broker for Java and two clients who will send each other encrypted messages.
+ In this example we will setup the Qpid Broker-J and two clients who will send each other encrypted messages.
The clients will use self signed certificates and the certificates will be distributed by the Broker.
</para>
</section>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
index 0867d4f..1a9669d 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
@@ -65,7 +65,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Note that the Apache Qpid Broker for Java does not present a JNDI interface to the application.</para>
+ <para>Note that the Apache Qpid Broker-J does not present a JNDI interface to the application.</para>
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Connection">
<title>Connection</title>
@@ -343,7 +343,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?client_cert_path='/path/
and a <emphasis>routing key</emphasis> included with each message.</para>
<para>To understand how this mechanism is used to deliver messages to queues and topics, see
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Concepts-Exchanges.html">Exchanges</link>
- within the Apache Qpid Broker for Java book.</para>
+ within the Apache Qpid Broker-J book.</para>
<para>It is important to understand that when synchronous publish is not exlicitly enabled,
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/MessageProducer.html#send(javax.jms.Message)">MessageProducer#send()</link> is <emphasis>asynchronous</emphasis> in nature. When #send()
returns to the application, the application cannot be certain if the Broker has received the
@@ -387,7 +387,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?client_cert_path='/path/
requires support for the corresponding feature by the Broker.</para>
<para>To enable or disable from the client, use the Connection URL option <link linkend="JMS-Client-0-8-Connection-URL-ConnectionOptions-CloseWhenNoRoute"><literal>closeWhenNoRoute</literal></link>.</para>
<para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Close-Connection-When-No-Route.html">
- Closing client connections on unroutable mandatory messages</link> within the Apache Qpid Broker for Java
+ Closing client connections on unroutable mandatory messages</link> within the Apache Qpid Broker-J
book for full details of the functioning of this feature.</para>
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-MessageProducer-ImmediateMessage">
@@ -414,7 +414,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?client_cert_path='/path/
feature requires support for the corresponding feature by the Broker.</para>
<para>To control the timeout use System property <link linkend="JMS-Client-0-8-System-Properties-FlowControlWaitFailure"><literal>qpid.flow_control_wait_failure</literal></link>. To control the frequency with
which warnings are logged whilst a Session is blocked, use System property <link linkend="JMS-Client-0-8-System-Properties-FlowControlWaitNotifyPeriod"><literal>qpid.flow_control_wait_notify_period</literal></link></para>
- <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control"> Producer Flow Control</link> within the Apache Qpid Broker for Java book for full details of the
+ <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control"> Producer Flow Control</link> within the Apache Qpid Broker-Java book for full details of the
functioning of this feature.</para>
</section>
</section>
@@ -480,7 +480,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?client_cert_path='/path/
<para>When using this feature, the application must either set system property <link linkend="JMS-Client-0-8-System-Properties-RejectBehaviour">qpid.reject.behaviour</link> or
the Binding URL option <link linkend="JMS-Client-0-8-Binding-URL-Options-RejectBehaviour"><literal>rejectbehaviour</literal></link> to the value
<literal>server</literal>.</para>
- <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"> Handling Undeliverable Messages</link> within the Apache Qpid Broker for Java book for full details of
+ <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"> Handling Undeliverable Messages</link> within the Apache Qpid Broker-J book for full details of
the functioning of this feature.</para>
<note>
<para>The optional JMS message header <literal>JMSXDeliveryCount</literal> is
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/doc/pom.xml
----------------------------------------------------------------------
diff --git a/doc/pom.xml b/doc/pom.xml
index a9e4913..601a9b2 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
+ <artifactId>apache-qpid-jms-amqp-0-x-parent</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/c4f5cd7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ff2c673..2b870b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,11 +25,11 @@
</parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
+ <artifactId>apache-qpid-jms-amqp-0-x-parent</artifactId>
<version>6.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Qpid JMS AMQP 0-x</name>
+ <name>Apache Qpid JMS AMQP 0-x Parent</name>
<url>http://qpid.apache.org/components</url>
<description>Apache Qpid JMS AMQP 0-x</description>
<inceptionYear>2006</inceptionYear>
@@ -113,6 +113,7 @@
</properties>
<modules>
+ <module>apache-qpid-jms-amqp-0-x</module>
<module>client</module>
<module>client/example</module>
<module>doc</module>
@@ -121,6 +122,18 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client-examples</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo-jms-1-1-version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org