From e23e3bbed19710d04baae86295cbeaed27acf8ec Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 23 Jan 2014 08:55:34 -0600
Subject: [PATCH] Fix the resource_event_list method to show resource_name in
 URI

Change-Id: Iba7ba5f846720c119160c223ed62dd547d7d4fe5
Author: Diane Fleming
---
 api-ref/src/docbkx/ch_orchestration-v1.xml    |  2 +-
 .../src/v1/orchestration-api.wadl             | 53 ++++++++++---------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/api-ref/src/docbkx/ch_orchestration-v1.xml b/api-ref/src/docbkx/ch_orchestration-v1.xml
index 89cffc755..e9d1d3383 100644
--- a/api-ref/src/docbkx/ch_orchestration-v1.xml
+++ b/api-ref/src/docbkx/ch_orchestration-v1.xml
@@ -85,7 +85,7 @@
                 <wadl:method href="#stack_event_list"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/orchestration-api/src/v1/orchestration-api.wadl#events3">
+                href="../wadls/orchestration-api/src/v1/orchestration-api.wadl#events4">
                 <wadl:method href="#resource_event_list"/>
             </wadl:resource>
             <wadl:resource
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
index fd0b7dce7..ff3324f63 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
+++ b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
@@ -72,13 +72,17 @@
                                    stack.</para></wadl:doc>
                                    </param>
                                    <method href="#resource_show"/>
+                                   <resource id="events4"
+                                   path="events">
+                                   <method href="#resource_event_list"
+                                   />
+                                   </resource>
                                    <resource path="metadata"
                                    id="metadata">
                                    <method href="#resource_metadata"/>
                                    </resource>
                                 </resource>
                                 <resource path="events" id="events3">
-                                   <method href="#resource_event_list"/>
                                    <resource path="{event_id}"
                                    id="event_id">
                                    <param name="event_id"
@@ -153,23 +157,24 @@
             <param name="limit" style="query" required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <para>Limits the number of stacks that appear on
-                        a page to this value. The typical pattern of
+                    <para>Limits the number of stacks that appear on a
+                        page to this value. The typical pattern of
                         limit and marker is to make an initial limited
                         request and then to use the ID of the last
                         stack from the response as the marker
-                        parameter in a subsequent limited request.</para>
+                        parameter in a subsequent limited
+                        request.</para>
                 </wadl:doc>
             </param>
             <param name="marker" style="query" required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <para>Specifies the ID of the last-seen stack.
-                        The typical pattern of limit and marker is to
-                        make an initial limited request and then to
-                        use the ID of the last stack from the response
-                        as the marker parameter in a subsequent
-                        limited request.</para>
+                    <para>Specifies the ID of the last-seen stack. The
+                        typical pattern of limit and marker is to make
+                        an initial limited request and then to use the
+                        ID of the last stack from the response as the
+                        marker parameter in a subsequent limited
+                        request.</para>
                 </wadl:doc>
             </param>
             <param name="sort_keys" style="query" required="false">
@@ -185,8 +190,8 @@
             <param name="sort_dir" style="query" required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <para>The sort direction of the stack list.
-                        Either <code>asc</code> (ascending) or
+                    <para>The sort direction of the stack list. Either
+                            <code>asc</code> (ascending) or
                             <code>desc</code> (descending).</para>
                 </wadl:doc>
             </param>
@@ -208,14 +213,14 @@
             <param name="template_url" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>The URL of the template to
-                        instantiate. This value is ignored if the template
-                        is supplied inline.</para></wadl:doc>
+                        instantiate. This value is ignored if the
+                        template is supplied inline.</para></wadl:doc>
             </param>
             <param name="template" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>A JSON template to
-                        instantiate. This value takes precedence over the
-                        template URL if both are
+                        instantiate. This value takes precedence over
+                        the template URL if both are
                     supplied.</para></wadl:doc>
             </param>
             <param name="environment" style="plain" required="true">
@@ -348,14 +353,14 @@
             <param name="template_url" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>The URL of the template to
-                        instantiate. This value is ignored if the template
-                        is supplied inline.</para></wadl:doc>
+                        instantiate. This value is ignored if the
+                        template is supplied inline.</para></wadl:doc>
             </param>
             <param name="template" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>A JSON template to
-                        instantiate. This value takes precedence over the
-                        template URL if both are
+                        instantiate. This value takes precedence over
+                        the template URL if both are
                     supplied.</para></wadl:doc>
             </param>
             <param name="environment" style="plain" required="true">
@@ -411,14 +416,14 @@
             <param name="template_url" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>The URL of the template to
-                        instantiate. This value is ignored if the template
-                        is supplied inline.</para></wadl:doc>
+                        instantiate. This value is ignored if the
+                        template is supplied inline.</para></wadl:doc>
             </param>
             <param name="template" style="plain" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><para>A JSON template to
-                        instantiate. This value takes precedence over the
-                        template URL if both are
+                        instantiate. This value takes precedence over
+                        the template URL if both are
                     supplied.</para></wadl:doc>
             </param>
             <representation mediaType="application/json">