Repository: qpid-site Updated Branches: refs/heads/asf-site 9205431c0 -> 1112dee92
DISPATCH-304 - Added python code in scripts/gen-dispatch-release-books to copy image files Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/1112dee9 Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/1112dee9 Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/1112dee9 Branch: refs/heads/asf-site Commit: 1112dee922a27ffe80be83e9939f0163266f69b6 Parents: 9205431 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Tue May 3 17:24:11 2016 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Tue May 3 17:24:11 2016 -0400 ---------------------------------------------------------------------- .../_images/console_charts.png | Bin 0 -> 36668 bytes .../_images/console_entity.png | Bin 0 -> 96504 bytes .../_images/console_login.png | Bin 0 -> 30172 bytes .../_images/console_overview.png | Bin 0 -> 42378 bytes .../_images/console_schema.png | Bin 0 -> 101877 bytes .../_images/console_topology.png | Bin 0 -> 77433 bytes .../book/console_installation.html | 2 +- .../book/console_operation.html | 12 ++++++------ .../_images/console_charts.png | Bin 0 -> 36668 bytes .../_images/console_entity.png | Bin 0 -> 96504 bytes .../_images/console_login.png | Bin 0 -> 30172 bytes .../_images/console_overview.png | Bin 0 -> 42378 bytes .../_images/console_schema.png | Bin 0 -> 101877 bytes .../_images/console_topology.png | Bin 0 -> 77433 bytes .../book/console_installation.html.in | 2 +- .../book/console_operation.html.in | 12 ++++++------ scripts/gen-dispatch-release-books | 11 +++++++++++ 17 files changed, 25 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_charts.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_charts.png b/content/releases/qpid-dispatch-master/_images/console_charts.png new file mode 100755 index 0000000..fec6d23 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_charts.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_entity.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_entity.png b/content/releases/qpid-dispatch-master/_images/console_entity.png new file mode 100755 index 0000000..9a9ac04 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_entity.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_login.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_login.png b/content/releases/qpid-dispatch-master/_images/console_login.png new file mode 100755 index 0000000..0a81840 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_login.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_overview.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_overview.png b/content/releases/qpid-dispatch-master/_images/console_overview.png new file mode 100755 index 0000000..1fa6ba6 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_overview.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_schema.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_schema.png b/content/releases/qpid-dispatch-master/_images/console_schema.png new file mode 100755 index 0000000..23aaff5 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_schema.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/_images/console_topology.png ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/_images/console_topology.png b/content/releases/qpid-dispatch-master/_images/console_topology.png new file mode 100755 index 0000000..eb53080 Binary files /dev/null and b/content/releases/qpid-dispatch-master/_images/console_topology.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/book/console_installation.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/console_installation.html b/content/releases/qpid-dispatch-master/book/console_installation.html index 4a79a61..bc13941 100644 --- a/content/releases/qpid-dispatch-master/book/console_installation.html +++ b/content/releases/qpid-dispatch-master/book/console_installation.html @@ -129,7 +129,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> <p>A nodejs proxy is distributed with proton. To start the proton’s nodejs proxy:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>cd ~/rh-qpid-proton/examples/javascript/messenger -node proxy.js & + node proxy.js & </pre></div> </div> <p>This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672. http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/content/releases/qpid-dispatch-master/book/console_operation.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/console_operation.html b/content/releases/qpid-dispatch-master/book/console_operation.html index 2c74f51..6dfb6ee 100644 --- a/content/releases/qpid-dispatch-master/book/console_operation.html +++ b/content/releases/qpid-dispatch-master/book/console_operation.html @@ -121,7 +121,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> <div class="section" id="logging-in-to-a-router-network"> <h2>4.3.1. Logging in to a router network<a class="headerlink" href="#logging-in-to-a-router-network" title="Permalink to this headline">.</a></h2> <p>The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used.</p> -<img alt="console_login.png" src="console_login.png" /> +<img alt="../_images/console_login.png" src="../_images/console_login.png" /> <p>Enter the address of a proxy that is connected to a router in the network.</p> <p>User name and password are not used at this time.</p> <p>The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console.</p> @@ -129,27 +129,27 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> <div class="section" id="overview-page"> <h2>4.3.2. Overview page<a class="headerlink" href="#overview-page" title="Permalink to this headline">.</a></h2> <p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p> -<img alt="console_overview.png" src="console_overview.png" /> +<img alt="../_images/console_overview.png" src="../_images/console_overview.png" /> </div> <div class="section" id="topology-page"> <h2>4.3.3. Topology page<a class="headerlink" href="#topology-page" title="Permalink to this headline">.</a></h2> <p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p> -<img alt="console_topology.png" src="console_topology.png" /> +<img alt="../_images/console_topology.png" src="../_images/console_topology.png" /> </div> <div class="section" id="router-entity-details-page"> <h2>4.3.4. Router entity details page<a class="headerlink" href="#router-entity-details-page" title="Permalink to this headline">.</a></h2> -<img alt="console_entity.png" src="console_entity.png" /> +<img alt="../_images/console_entity.png" src="../_images/console_entity.png" /> <p>Displays detailed information about entities such as routers, links, addresses, memory.</p> <p>Numeric attributes can be graphed by clicking on the graph icon.</p> </div> <div class="section" id="charts-page"> <h2>4.3.5. Charts page<a class="headerlink" href="#charts-page" title="Permalink to this headline">.</a></h2> -<img alt="console_charts.png" src="console_charts.png" /> +<img alt="../_images/console_charts.png" src="../_images/console_charts.png" /> <p>This page displays graphs of numeric values that are on the entity details page.</p> </div> <div class="section" id="schema-page"> <h2>4.3.6. Schema page<a class="headerlink" href="#schema-page" title="Permalink to this headline">.</a></h2> -<img alt="console_schema.png" src="console_schema.png" /> +<img alt="../_images/console_schema.png" src="../_images/console_schema.png" /> <p>This page displays the json schema that is used to manage the router network.</p> </div> </div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_charts.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_charts.png b/input/releases/qpid-dispatch-master/_images/console_charts.png new file mode 100644 index 0000000..fec6d23 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_charts.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_entity.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_entity.png b/input/releases/qpid-dispatch-master/_images/console_entity.png new file mode 100644 index 0000000..9a9ac04 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_entity.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_login.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_login.png b/input/releases/qpid-dispatch-master/_images/console_login.png new file mode 100644 index 0000000..0a81840 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_login.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_overview.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_overview.png b/input/releases/qpid-dispatch-master/_images/console_overview.png new file mode 100644 index 0000000..1fa6ba6 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_overview.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_schema.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_schema.png b/input/releases/qpid-dispatch-master/_images/console_schema.png new file mode 100644 index 0000000..23aaff5 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_schema.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/_images/console_topology.png ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/_images/console_topology.png b/input/releases/qpid-dispatch-master/_images/console_topology.png new file mode 100644 index 0000000..eb53080 Binary files /dev/null and b/input/releases/qpid-dispatch-master/_images/console_topology.png differ http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/book/console_installation.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/console_installation.html.in b/input/releases/qpid-dispatch-master/book/console_installation.html.in index 4c25669..573dbb5 100644 --- a/input/releases/qpid-dispatch-master/book/console_installation.html.in +++ b/input/releases/qpid-dispatch-master/book/console_installation.html.in @@ -13,7 +13,7 @@ <p>A nodejs proxy is distributed with proton. To start the proton’s nodejs proxy:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>cd ~/rh-qpid-proton/examples/javascript/messenger -node proxy.js & + node proxy.js & </pre></div> </div> <p>This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672. http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/input/releases/qpid-dispatch-master/book/console_operation.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/console_operation.html.in b/input/releases/qpid-dispatch-master/book/console_operation.html.in index cb00d4a..5ef47b8 100644 --- a/input/releases/qpid-dispatch-master/book/console_operation.html.in +++ b/input/releases/qpid-dispatch-master/book/console_operation.html.in @@ -5,7 +5,7 @@ <div class="section" id="logging-in-to-a-router-network"> <h2>4.3.1. Logging in to a router network<a class="headerlink" href="#logging-in-to-a-router-network" title="Permalink to this headline">.</a></h2> <p>The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used.</p> -<img alt="console_login.png" src="console_login.png" /> +<img alt="../_images/console_login.png" src="../_images/console_login.png" /> <p>Enter the address of a proxy that is connected to a router in the network.</p> <p>User name and password are not used at this time.</p> <p>The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console.</p> @@ -13,27 +13,27 @@ <div class="section" id="overview-page"> <h2>4.3.2. Overview page<a class="headerlink" href="#overview-page" title="Permalink to this headline">.</a></h2> <p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p> -<img alt="console_overview.png" src="console_overview.png" /> +<img alt="../_images/console_overview.png" src="../_images/console_overview.png" /> </div> <div class="section" id="topology-page"> <h2>4.3.3. Topology page<a class="headerlink" href="#topology-page" title="Permalink to this headline">.</a></h2> <p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p> -<img alt="console_topology.png" src="console_topology.png" /> +<img alt="../_images/console_topology.png" src="../_images/console_topology.png" /> </div> <div class="section" id="router-entity-details-page"> <h2>4.3.4. Router entity details page<a class="headerlink" href="#router-entity-details-page" title="Permalink to this headline">.</a></h2> -<img alt="console_entity.png" src="console_entity.png" /> +<img alt="../_images/console_entity.png" src="../_images/console_entity.png" /> <p>Displays detailed information about entities such as routers, links, addresses, memory.</p> <p>Numeric attributes can be graphed by clicking on the graph icon.</p> </div> <div class="section" id="charts-page"> <h2>4.3.5. Charts page<a class="headerlink" href="#charts-page" title="Permalink to this headline">.</a></h2> -<img alt="console_charts.png" src="console_charts.png" /> +<img alt="../_images/console_charts.png" src="../_images/console_charts.png" /> <p>This page displays graphs of numeric values that are on the entity details page.</p> </div> <div class="section" id="schema-page"> <h2>4.3.6. Schema page<a class="headerlink" href="#schema-page" title="Permalink to this headline">.</a></h2> -<img alt="console_schema.png" src="console_schema.png" /> +<img alt="../_images/console_schema.png" src="../_images/console_schema.png" /> <p>This page displays the json schema that is used to manage the router network.</p> </div> </div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1112dee9/scripts/gen-dispatch-release-books ---------------------------------------------------------------------- diff --git a/scripts/gen-dispatch-release-books b/scripts/gen-dispatch-release-books index 6521092..747422b 100755 --- a/scripts/gen-dispatch-release-books +++ b/scripts/gen-dispatch-release-books @@ -18,8 +18,16 @@ # under the License. # +import os from generate import * +def copy_image_files(from_dir, to_dir): + image_files = list_dir(from_dir, "*") + + if image_files: + for image_file in image_files: + copy(join(from_dir, image_file), join(to_dir, image_file)) + def copy_html_to_in(from_dir, to_dir): html = list_dir(from_dir, "*.html") for h in html: @@ -37,6 +45,9 @@ def gen_books_and_man(release, source_dir, output_dir): copy_html_to_in(join(build_dir, "doc", "html", "book"), join(output_dir, "book")) copy_html_to_in(join(build_dir, "doc", "html", "man"), join(output_dir, "man")) + # Copy the image files from the _images folder + copy_image_files(join(build_dir, "doc", "html", "_images"), join(output_dir, "_images")) + ## Now do stuff ## release, issues_release, source_release, release_dir, checkout_dir = setup_release_script() source_dir = export_release_from_git("dispatch", source_release) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org