Author: lquack
Date: Wed Jun 29 13:46:32 2016
New Revision: 1750637
URL: http://svn.apache.org/viewvc?rev=1750637&view=rev
Log:
QPID-7096: [Java Broker] Add minor release version to REST API version
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1750637&r1=1750636&r2=1750637&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Wed Jun 29 13:46:32 2016
@@ -277,11 +277,11 @@ public class HttpManagement extends Abst
ServletHolder queryServlet = new ServletHolder(new
BrokerQueryServlet());
root.addServlet(queryServlet, "/api/latest/querybroker/*");
- root.addServlet(queryServlet, "/api/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/querybroker/*");
+ root.addServlet(queryServlet, "/api/v" + BrokerModel.MODEL_VERSION +
"/querybroker/*");
ServletHolder vhQueryServlet = new ServletHolder(new
VirtualHostQueryServlet());
root.addServlet(vhQueryServlet, "/api/latest/queryvhost/*");
- root.addServlet(vhQueryServlet, "/api/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/queryvhost/*");
+ root.addServlet(vhQueryServlet, "/api/v" + BrokerModel.MODEL_VERSION +
"/queryvhost/*");
ServletHolder apiDocsServlet = new ServletHolder(new
ApiDocsServlet(getModel()));
@@ -599,7 +599,7 @@ public class HttpManagement extends Abst
MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME)));
List<String> paths = Arrays.asList("/api/latest/" + name,
- "/api/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/" + name);
+ "/api/v" +
BrokerModel.MODEL_VERSION + "/" + name);
for (String path : paths)
{
@@ -609,9 +609,9 @@ public class HttpManagement extends Abst
paths,
hierarchyArray));
root.addServlet(docServletHolder, "/apidocs/latest/" + name +
"/");
- root.addServlet(docServletHolder, "/apidocs/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/" + name + "/");
+ root.addServlet(docServletHolder, "/apidocs/v" +
BrokerModel.MODEL_VERSION + "/" + name + "/");
root.addServlet(docServletHolder, "/apidocs/latest/" + name);
- root.addServlet(docServletHolder, "/apidocs/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/" + name);
+ root.addServlet(docServletHolder, "/apidocs/v" +
BrokerModel.MODEL_VERSION + "/" + name);
}
@@ -635,7 +635,7 @@ public class HttpManagement extends Abst
private String getLatestSupportedVersion()
{
- return "v"+String.valueOf(BrokerModel.MODEL_MAJOR_VERSION);
+ return "v"+String.valueOf(BrokerModel.MODEL_VERSION);
}
private void logOperationalListenMessages()
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml?rev=1750637&r1=1750636&r2=1750637&view=diff
==============================================================================
---
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
Wed Jun 29 13:46:32 2016
@@ -34,11 +34,11 @@
<literal>DELETE</literal> method requests the removal of one, and the
<literal>PUT</literal>
or <literal>POST</literal> methods perform updates or create new
objects. The
<literal>POST</literal> method is also used to invoke
operations.</para>
- <para>The REST API is versioned with the version number embedded withinthe
URI. The general form
- of the URI is <literal>/api/<version></literal> where
<version> is a major model
- version prefixed with "v", for example, v3. For convenience the alias
- <literal>latest</literal> (<literal>/api/latest</literal>) signifies
the latest supported
- version.</para>
+ <para>The REST API is versioned with the version number embedded within
the URI. The general form
+ of the URI is <literal>/api/<version></literal> where
<version> is a dot separated
+ major and minor model version prefixed with "v", for example, "v6.1"
(without the quotation marks).
+ For convenience the alias <literal>latest</literal>
(<literal>/api/latest</literal>) signifies the
+ latest supported version.</para>
<para>There are also some ancillary services under URI
<literal>/service</literal> used for
authentication and logout.</para>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
