You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/08/11 12:41:44 UTC
svn commit: r1617244 - in /qpid/trunk/qpid/tools/src/java: ./
qpid-broker-plugins-management-qmf2/
qpid-broker-plugins-management-qmf2/src/main/assembly/
qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/
qpid-qmf2-tools/ qp...
Author: robbie
Date: Mon Aug 11 10:41:43 2014
New Revision: 1617244
URL: http://svn.apache.org/r1617244
Log:
QPID-5610: add/update LICENSE,NOTICE,README.txt and dep check reference files for the source tree/archive and the binary assembly releases
Added:
qpid/trunk/qpid/tools/src/java/LICENSE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/LICENSE
qpid/trunk/qpid/tools/src/java/NOTICE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/README.txt
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/README.txt
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
- copied, changed from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
Removed:
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/LICENSE
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE
Modified:
qpid/trunk/qpid/tools/src/java/README.txt
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
Copied: qpid/trunk/qpid/tools/src/java/LICENSE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/LICENSE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/LICENSE?p2=qpid/trunk/qpid/tools/src/java/LICENSE&p1=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/LICENSE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/LICENSE (original)
+++ qpid/trunk/qpid/tools/src/java/LICENSE Mon Aug 11 10:41:43 2014
@@ -200,3 +200,67 @@
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:
+###############################################
+
+qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js
+
+The QMF2 tools bundle jquery.js which is under the MIT licence:
+
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+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.
+
+###############################################
+
+qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js
+
+The QMF2 tools bundle iscroll.js which is under the MIT licence:
+
+
+Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/
+
+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.
+
+###############################################
Copied: qpid/trunk/qpid/tools/src/java/NOTICE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/NOTICE?p2=qpid/trunk/qpid/tools/src/java/NOTICE&p1=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE (original)
+++ qpid/trunk/qpid/tools/src/java/NOTICE Mon Aug 11 10:41:43 2014
@@ -1,4 +1,4 @@
-Apache Qpid QMF2 Tools
+Apache Qpid QMF2 Java
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
Modified: qpid/trunk/qpid/tools/src/java/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/README.txt?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/README.txt (original)
+++ qpid/trunk/qpid/tools/src/java/README.txt Mon Aug 11 10:41:43 2014
@@ -37,10 +37,10 @@ the combined tools package and the broke
There is fairly comprehensive JavaDoc available, which you can generate in a couple of ways:
mvn javadoc:aggregate - Builds the Javadoc for all the modules combined, output located at:
-qpid/tools/src/java/target/site/apidocs/index.html
+target/site/apidocs/index.html
mvn javadoc:javadoc - Builds the Javadoc for each module in turn individually, output located at:
-qpid/tools/src/java/<module>/target/site/apidocs/index.html
+<module>/target/site/apidocs/index.html
N.B. At the moment the QMF2 API and tools use the "traditional" Qpid AMQP 0.10 JMS API. The intention is that
@@ -54,16 +54,16 @@ https://cwiki.apache.org/confluence/disp
Once built as described earlier, the API jar is included in the overall tools bundle described below, and
additionally the API jar itself file will be placed in:
-qpid/tools/src/java/qpid-qmf2/target
+qpid-qmf2/target
There is fairly comprehensive JavaDoc available, see earlier for build instructions.
Looking at the source code for the tools (see "The Tools" below) might be a quicker way to get started.
The source code for the Java QMF2 API can be found under:
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common
console: contains the classes for the QMF2 "console", which is what most of the tools make use of
agent: contains the classes for the QMF2 "agent", which it what exposes management services, this is
@@ -76,44 +76,24 @@ A number of Java based tools are provide
are described later, utilising the core components from the API outlined above.
Once built as described earlier, the tools jar is included in the overall tools release tar.gz placed in:
-qpid/tools/src/java/qpid-qmf2-tools/target
+qpid-qmf2-tools/target
There are executable shell scripts included in the tools bundle that should allow the tools to be run fairly
easily. To use them, extract the tar.gz release to your preferred installation location, and open the
included bin/ directory.
The source code for the Java QMF2 Tools can be found under:
-qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools
+qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools
-The available tools are:
-QpidConfig: Is a Java port of the standard Python based qpid-config tool. This exercises most of the QMF2 API
- and is probably a good bet to see how things work if you want to use the API in your own projects.
-QpidCtrl: Is a Java port of the qpid-ctrl tool found in qpid/cpp/src/tests. This is a little known, but useful
- little tool that lets one send low-level QMF constructs from the command line. The JavaDoc is the
- best place to look for example usage (see earlier for build instructions).
-QpidPrintEvents: Is a Java port of the Python qpid-printevents and illustrates the asynchronous delivery
- of QMF2 notification events.
-QpidQueueStats: Is a Java port of the Python qpid-queue-stats. This was written mainly to illustrate the use
- of the QMF2 "QuerySubscription" API that lets one specify how to be asynchronously notified
- of changes to QMF Management Objects matching a specified set of criteria.
-ConnectionAudit: Is a tool that allows one to audit connections to one or more Qpid brokers. It uses QMF
- Events to identify when connections have been made to a broker and if so it logs information
- about the connection. A whitelist can be specified to flag connections that you don't
- want to have logged (e.g. ones that you like).
-ConnectionLogger: Is similar to ConnectionAudit but a bit simpler this tool just logs connections being made
- the tool is mainly there to illustrate how to dereference the associations between the
- various QMF Management Objects (Connection, Session, Subscription, Queue, Binding Exchange etc.)
-QueueFuse: Is a tool that monitors QMF Events looking for a QueueThresholdExceeded, which occurs when a queue
- gets more than 80% full. When this Event occurs the tool sends a QMF method to "purge" 10% of the
- messages off the offending queue, i.e. it acts rather like a fuse. It's mainly a bit of a toy, but
- it's a pretty good illustration of how to trigger QMF method invocation from QMF Events. It would
- be pretty easy to modify this to redirect messages to a different queue if a particular queue fills.
-QpidRestAPI: This is a Web Service that exposes QMF2 via a REST API, see "The GUI" section below for details.
+
+For more details of the available tools, see the README.txt in the qpid-qmf2-tools folder, which is also
+included in the tar.gz release.
************************************************* The GUI *************************************************
Included in the tools package, there is a fairly comprehensive Web based GUI available for Qpid that works
-with the C++ Broker and also the Java Broker if the QMF plugin has been installed (see README-Java-Broker.txt).
+with the C++ Broker and also the Java Broker if the QMF management plugin has been installed (see the
+qpid-broker-plugins-management-qmf2 directory and contained README.txt).
The GUI is in the form of a pure client side "single page" Web App written in JavaScript that uses the
QpidRestAPI to proxy the QMF API, and also serve up the GUI.
@@ -126,89 +106,6 @@ QpidServer: This provides documentation
QpidRestAPI provides a fairly complete REST mapping for QMF, it was primarily written as the back-end to
the GUI, but there's no reason why it couldn't be used in its own right.
-To get started, after you have extracted the tools release as described earlier, the simplest and probably
-most common use case can be kicked offby changing into the bin/ directory and firing up the REST API via:
-./QpidRestAPI
-
-This will bind the HTTP port to 8080 on the "wildcard" address (0.0.0.0). The QMF connection will default to
-the host that QpidRestAPI is running on and use the default AMQP port 5672.
-
-If you point a Browser to <host>:8080 the GUI should start up asking for a User Name and Password, the
-defaults for those are the rather "traditional" admin admin.
-
-
-If you have a non-trivial broker set-up you'll probably see "Failed to Connect", which is most likely due
-to having authentication enabled (you can check this by firing up the C++ broker using qpidd --auth no)
-
-
-There are a few ways to configure the Brokers that you can control via the GUI:
-The first way is to specify the -a (or --broker-addr) command line option e.g.
-./QpidRestAPI -a guest/guest@localhost
-
-This option accepts the Broker Address syntax used by the standard Python tools and it also accepts the
-Java ConnectionURL syntax specified here (though to be honest the syntax used by the Python tools is simpler)
-http://qpid.apache.org/releases/qpid-0.24/programming/book/QpidJNDI.html#section-jms-connection-url
-
-
-This way of specifying the AMQP address of the default broker that you want to manage is probably the best
-approach, but it is possible to add as many QMF Console Connections as you like by clicking
-"Add QMF Console Connection" on the GUI Settings page. The popup lets you specify the Address URL such as
-"guest/guest@host:5672" - again it also accepts the JMS Connection URLs, though I only use them if I'm
-doing a copy/paste of an existing Connection URL.
-The Name is simply a "friendly name" that you want to use to identify a particular Broker.
-
-
-Clearly if you want to be able to manage a number of brokers you'd probably prefer not to have to enter
-them every time you fire up the GUI - particularly because the list gets wiped if you hit refresh :-)
-
-The good news is that the initial set of Console Connections is configurable via the file:
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
-
-
-This is a simple JSON file and it contains example Console Connection configuration including a fairly complex one
-
-If you use this mechanism to configure the GUI you can quickly switch between however many Brokers
-you'd like to be able to control.
-
-
-As mentioned above the default User Name and Password are admin and admin, these are set in the file
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
-
-
-It's worth pointing out that at the moment authentication is limited to basic uthentication. This is mainly
-due to lack of time/energy/motivation to do anything fancier (I only tend to use it on a private network)
-I also had a need to minimise dependencies, so the Web Server is actually based on the Java 1.6
-com.sun.net.httpserver Web Server.
-
-
-In practice though basic authentication shouldn't be as much of a restriction as it might sound especially
-if you're only managing a single Broker.
-
-When one fires up QpidRestAPI with the -a option the Broker connection information does not pass between the
-GUI and the QpidRestAPI so it's ultimately no less secure than using say qpid-config in this case though
-note that if one configures multiple Brokers via config.js the contents of that file get served to the GUI
-when it gets loaded so you probably want to restrict use of the GUI to the same network you'd be happy to
-run qpid-config from.
-
-
-
-
-
-*********************************************** Important!! ***********************************************
-* If your Qpid C++ broker is older than 0.10 the QMF2 API won't work unless your setup is as follows: *
-*********************************************** Important!! ***********************************************
-
-Note that if you are talking to a broker < Qpid 0.10
-you need to set "--mgmt-qmf2 yes" when you start up qpidd if you want to get QMF2 Events and heartbeats pushed.
-This is particularly important to note if you are using the Qpid GUI, as in default mode its updates are
-triggered by the QMF2 heartbeats. If "--mgmt-qmf2 yes" isn't set on a 0.8 broker you'll see "Broker Disconnected"
-flash briefly every 30 seconds or so as timeouts occur. Creating a QMF Console Connecton in the GUI with
-"Disable Events" selected uses a timed poll rather than a heartbeat so it may be better to do that for cases
-where access to the broker configuration is not available.
-
-***********************************************************************************************************
-
-Note 1: This uses QMF2 so requires that the "--mgmt-qmf2 yes" option is applied to the broker (this is
- the default from Qpid 0.10 onwards)
-Note 2: In order to use QMF2 the app-id field needs to be set. This requires the Qpid 0.12+ Java client
+For more details of the GUI, see the README.txt in the qpid-qmf2-tools folder, which is also included
+in the tar.gz release.
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt Mon Aug 11 10:41:43 2014
@@ -43,8 +43,8 @@ You can then configure the extracted bro
*********************************************** Installing *************************************************
-To install a release of the plugin, extract the release assembly and copy all of the files from the lib/ dir
-into either the lib/ or lib/plugins/ directory of your extracted broker installation.
+To install a release of the plugin, extract the release assembly and copy all of the files from the contained
+lib/ directory into the corresponding lib/ directory of your extracted broker installation.
You can then configure the broker as described below.
@@ -73,7 +73,7 @@ HTTP port to something other than 8080,
{
"id" : <UUID>,
"name" : "HTTP",
- "port" : "${qpid.jmx_port}"
+ "port" : "${qpid.http_port}"
"protocols" : [ "HTTP" ]
}
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml Mon Aug 11 10:41:43 2014
@@ -28,6 +28,10 @@
<name>Qpid QMF2 Management Broker Plug-in</name>
<description>QMF2 Management broker plug-in</description>
+ <properties>
+ <dependency-change-verification>true</dependency-change-verification>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
Copied: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE?p2=qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE&p1=qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE Mon Aug 11 10:41:43 2014
@@ -200,3 +200,36 @@
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 jar, which is under the MIT licence:
+
+Copyright (c) 2004-2013 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.
+
+###############################################
+
Copied: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE?p2=qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE&p1=qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE Mon Aug 11 10:41:43 2014
@@ -3,3 +3,8 @@ Copyright 2012-2014 The Apache Software
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
Added: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1617244&view=auto
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (added)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Aug 11 10:41:43 2014
@@ -0,0 +1,44 @@
+#
+# 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
+#// ------------------------------------------------------------------
+
+
+
+From: 'Apache Software Foundation' (http://www.apache.org)
+ - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'QOS.ch' (http://www.qos.ch)
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+ - Qpid AMQP 0-x JMS Client (http://qpid.apache.org/qpid-java-build/qpid-client) org.apache.qpid:qpid-client:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Qpid Common (http://qpid.apache.org/qpid-java-build/qpid-common) org.apache.qpid:qpid-common:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Qpid QMF2 (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2) org.apache.qpid:qpid-qmf2:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
+
+
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml Mon Aug 11 10:41:43 2014
@@ -1,3 +1,20 @@
+<?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">
@@ -10,9 +27,17 @@
<fileSet>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/assembly/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
<include>LICENSE</include>
<include>NOTICE</include>
- <include>README.txt</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
Copied: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/README.txt (from r1616851, qpid/trunk/qpid/tools/src/java/README.txt)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/README.txt?p2=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/README.txt&p1=qpid/trunk/qpid/tools/src/java/README.txt&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/README.txt (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/README.txt Mon Aug 11 10:41:43 2014
@@ -1,89 +1,10 @@
-/*
- *
- * 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.
- *
- */
-
-********************************************** Introduction ***********************************************
-
-This directory provides a set of Java and JavaScript based tools that allow interaction with the Qpid brokers.
-The tools are based on QMF2 (Qpid Management Framework v2) and work with the C++ broker by default. In order
-to enable QMF2 support in the Java Broker you must compile the QMF plugin (see the directory
-qpid-broker-plugins-management-qmf2 and contained README.txt).
-
-In order to build the Java QMF2 API, the Tools and the Java Broker QMF2 plugin simply do:
-
-mvn clean package
-
-This will create the jar files for the various modules, and additionally create packaged release archives for
-the combined tools package and the broker plugin which can be extracted for installation and use.
-
-
-There is fairly comprehensive JavaDoc available, which you can generate in a couple of ways:
-
-mvn javadoc:aggregate - Builds the Javadoc for all the modules combined, output located at:
-qpid/tools/src/java/target/site/apidocs/index.html
-
-mvn javadoc:javadoc - Builds the Javadoc for each module in turn individually, output located at:
-qpid/tools/src/java/<module>/target/site/apidocs/index.html
-
-
-N.B. At the moment the QMF2 API and tools use the "traditional" Qpid AMQP 0.10 JMS API. The intention is that
-over time this will migrate to AMQP 1.0 and move from being QMF2 based to using the AMQP 1.0 Management Spec.
-However there is no concrete schedule for this migration at this time.
-
-************************************************* The API *************************************************
-
-The tools are build on a Java JMS implementation of the QMF2 API specified at
-https://cwiki.apache.org/confluence/display/qpid/QMFv2+API+Proposal
-
-Once built as described earlier, the API jar is included in the overall tools bundle described below, and
-additionally the API jar itself file will be placed in:
-qpid/tools/src/java/qpid-qmf2/target
-
-There is fairly comprehensive JavaDoc available, see earlier for build instructions.
-
-Looking at the source code for the tools (see "The Tools" below) might be a quicker way to get started.
-
-The source code for the Java QMF2 API can be found under:
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common
-
-console: contains the classes for the QMF2 "console", which is what most of the tools make use of
-agent: contains the classes for the QMF2 "agent", which it what exposes management services, this is
- what the Java Broker plugin uses to "externalise" its management model as QMF.
-common: contains classes common to both the console and the agent.
-
************************************************ The Tools ************************************************
-A number of Java based tools are provided, and additionally a web based GUI with underlying REST api which
-are described later, utilising the core components from the API outlined above.
-
-Once built as described earlier, the tools jar is included in the overall tools release tar.gz placed in:
-qpid/tools/src/java/qpid-qmf2-tools/target
+A number of Java based tools are provided, and additionally a web based GUI with underlying REST API which
+are described later, utilising the components from the core API.
There are executable shell scripts included in the tools bundle that should allow the tools to be run fairly
-easily. To use them, extract the tar.gz release to your preferred installation location, and open the
-included bin/ directory.
-
-The source code for the Java QMF2 Tools can be found under:
-qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools
+easily. To use them, open the bin/ directory.
The available tools are:
QpidConfig: Is a Java port of the standard Python based qpid-config tool. This exercises most of the QMF2 API
@@ -110,15 +31,18 @@ QueueFuse: Is a tool that monitors QMF E
be pretty easy to modify this to redirect messages to a different queue if a particular queue fills.
QpidRestAPI: This is a Web Service that exposes QMF2 via a REST API, see "The GUI" section below for details.
+
+
************************************************* The GUI *************************************************
Included in the tools package, there is a fairly comprehensive Web based GUI available for Qpid that works
-with the C++ Broker and also the Java Broker if the QMF plugin has been installed (see README-Java-Broker.txt).
+with the C++ Broker and also the Java Broker if the QMF management plugin has been installed (see the
+related plugin README.txt for more details).
The GUI is in the form of a pure client side "single page" Web App written in JavaScript that uses the
QpidRestAPI to proxy the QMF API, and also serve up the GUI.
-There is comprehensive JavaDoc for the QpidRestAPI (see earlier for build instructions), where
+There is comprehensive JavaDoc for the QpidRestAPI (see source release for build instructions), where
the most useful classes to look at are:
QpidRestAPI: This describes the various command line options available.
QpidServer: This provides documentation for the actual REST API itself, in effect the REST mapping for QMF
@@ -162,7 +86,7 @@ Clearly if you want to be able to manage
them every time you fire up the GUI - particularly because the list gets wiped if you hit refresh :-)
The good news is that the initial set of Console Connections is configurable via the file:
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
+bin/qpid-web/web/ui/config.js
This is a simple JSON file and it contains example Console Connection configuration including a fairly complex one
@@ -172,7 +96,7 @@ you'd like to be able to control.
As mentioned above the default User Name and Password are admin and admin, these are set in the file
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
+bin/qpid-web/authentication/account.properties
It's worth pointing out that at the moment authentication is limited to basic uthentication. This is mainly
@@ -192,8 +116,6 @@ run qpid-config from.
-
-
*********************************************** Important!! ***********************************************
* If your Qpid C++ broker is older than 0.10 the QMF2 API won't work unless your setup is as follows: *
*********************************************** Important!! ***********************************************
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml Mon Aug 11 10:41:43 2014
@@ -28,6 +28,10 @@
<name>Qpid QMF2 Tools</name>
<description>QMF2 Tools</description>
+ <properties>
+ <dependency-change-verification>true</dependency-change-verification>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
Copied: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE?p2=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE&p1=qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE Mon Aug 11 10:41:43 2014
@@ -200,3 +200,93 @@
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:
+###############################################
+
+bin/qpid-web/web/itablet/scripts/jquery.js
+
+The QMF2 tools GUI bundles jquery.js which is under the MIT licence:
+
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+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.
+
+###############################################
+
+bin/qpid-web/web/itablet/scripts/iscroll.js
+
+The QMF2 tools GUI bundles iscroll.js which is under the MIT licence:
+
+
+Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/
+
+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.
+
+###############################################
+
+This product bundles the slf4j-api and slf4j-log4j jars which are under
+the MIT licence:
+
+Copyright (c) 2004-2013 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.
+
+###############################################
Copied: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE (from r1616851, qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE?p2=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE&p1=qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE&r1=1616851&r2=1617244&rev=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/NOTICE (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE Mon Aug 11 10:41:43 2014
@@ -3,3 +3,8 @@ Copyright 2012-2014 The Apache Software
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
Added: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1617244&view=auto
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (added)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Aug 11 10:41:43 2014
@@ -0,0 +1,50 @@
+#
+# 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
+#// ------------------------------------------------------------------
+
+
+
+From: 'Apache Software Foundation' (http://www.apache.org)
+ - Apache Log4j (http://logging.apache.org/log4j/1.2/) log4j:log4j:bundle:1.2.16
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'QOS.ch' (http://www.qos.ch)
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+ - SLF4J LOG4J-12 Binding (http://www.slf4j.org) org.slf4j:slf4j-log4j12:jar:1.6.4
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+ - Qpid AMQP 0-x JMS Client (http://qpid.apache.org/qpid-java-build/qpid-client) org.apache.qpid:qpid-client:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Qpid Common (http://qpid.apache.org/qpid-java-build/qpid-common) org.apache.qpid:qpid-common:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Qpid QMF2 (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2) org.apache.qpid:qpid-qmf2:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Qpid QMF2 REST (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2-rest) org.apache.qpid:qpid-qmf2-rest:jar
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
+
+
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml?rev=1617244&r1=1617243&r2=1617244&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml Mon Aug 11 10:41:43 2014
@@ -1,3 +1,20 @@
+<?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">
@@ -5,14 +22,22 @@
<formats>
<format>tar.gz</format>
</formats>
- <baseDirectory>qpid-qmf-tools/${project.version}</baseDirectory>
+ <baseDirectory>qpid-qmf2-tools/${project.version}</baseDirectory>
<fileSets>
<fileSet>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/assembly/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
<include>LICENSE</include>
<include>NOTICE</include>
- <include>README.txt</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org