You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/24 18:34:56 UTC

svn commit: r1613181 - in /incubator/brooklyn/site/quickstart: index.html my-web-cluster.yaml policies-and-catalogs.html

Author: richard
Date: Thu Jul 24 16:34:56 2014
New Revision: 1613181

URL: http://svn.apache.org/r1613181
Log:
Fixes links on the quickstart pages

Removed:
    incubator/brooklyn/site/quickstart/my-web-cluster.yaml
Modified:
    incubator/brooklyn/site/quickstart/index.html
    incubator/brooklyn/site/quickstart/policies-and-catalogs.html

Modified: incubator/brooklyn/site/quickstart/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/index.html?rev=1613181&r1=1613180&r2=1613181&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/index.html (original)
+++ incubator/brooklyn/site/quickstart/index.html Thu Jul 24 16:34:56 2014
@@ -42,12 +42,7 @@
 
 <div class="container">
     <h1>Getting Started</h1>
-    
-<!--- both snapshots and releases -->
-
-<!--- releases -->
-
-<p>This guide will walk you through deploying an application to a public cloud.</p>
+    <p>This guide will walk you through deploying an application to a public cloud.</p>
 
 <p>We will be deploying an example 3-tier web application, described using this blueprint: </p>
 
@@ -58,7 +53,7 @@
 <span class="p-Indicator">-</span> <span class="l-Scalar-Plain">serviceType</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">brooklyn.entity.webapp.ControlledDynamicWebAppCluster</span>
   <span class="l-Scalar-Plain">name</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">My Web</span>
   <span class="l-Scalar-Plain">brooklyn.config</span><span class="p-Indicator">:</span>
-    <span class="l-Scalar-Plain">wars.root</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp//brooklyn-example-hello-world-sql-webapp-.war</span>
+    <span class="l-Scalar-Plain">wars.root</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M1/brooklyn-example-hello-world-sql-webapp-0.7.0-M1.war</span>
     <span class="l-Scalar-Plain">java.sysprops</span><span class="p-Indicator">:</span>
       <span class="l-Scalar-Plain">brooklyn.example.db.url</span><span class="p-Indicator">:</span> <span class="p-Indicator">&gt;</span>
         <span class="no">$brooklyn:formatString(&quot;jdbc:%s%s?user=%s\\&amp;password=%s&quot;,</span>
@@ -75,13 +70,13 @@
 
 <h2 id="install-brooklyn">Install Brooklyn</h2>
 
-<p>Download the <a href="https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&amp;g=io.brooklyn&amp;v=0.7.0-SNAPSHOT&amp;a=brooklyn-dist&amp;c=dist&amp;e=tar.gz">Brooklyn distribution</a> and expand it to your home directory ( <code>~/</code> ), or in a location of your choice. (Other <a href="https://brooklyn.incubator.apache.org//download.html">download options</a> are available.)</p>
+<p>Download the <a href="http://repo1.maven.org/maven2/io/brooklyn/brooklyn-dist/0.7.0-M1/brooklyn-dist-0.7.0-M1-dist.tar.gz">Brooklyn distribution</a> and expand it to your home directory ( <code>~/</code> ), or in a location of your choice. (Other <a href="https://brooklyn.incubator.apache.org//download.html">download options</a> are available.)</p>
 
-<p>Expand the <code>tar.gz</code> archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):</p>
+<p>Expand the <code>tar.gz</code> archive:</p>
 
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>tar -zxf brooklyn-dist-0.7.0-SNAPSHOT-timestamp-dist.tar.gz</code></pre></div>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>tar -zxf brooklyn-dist-0.7.0-M1-dist.tar.gz</code></pre></div>
 
-<p>This will create a <code>brooklyn-0.7.0-SNAPSHOT</code> folder.</p>
+<p>This will create a <code>brooklyn-0.7.0-M1</code> folder.</p>
 
 <p>Note: You’ll need a Java JRE or SDK installed (version 6 or later), as Brooklyn is Java under the covers.</p>
 
@@ -91,7 +86,7 @@
 
 <p>(Click the clipboard on these code snippets for easier c&amp;p.)</p>
 
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd </span>brooklyn-0.7.0-SNAPSHOT
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd </span>brooklyn-0.7.0-M1
 <span class="nv">$ BROOKLYN_DIR</span><span class="o">=</span><span class="s2">&quot;$(pwd)&quot;</span>
 <span class="nv">$ </span><span class="nb">export </span><span class="nv">PATH</span><span class="o">=</span><span class="nv">$PATH</span>:<span class="nv">$BROOKLYN_DIR</span>/bin/</code></pre></div>
 
@@ -121,11 +116,11 @@
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>mkdir ~/.brooklyn
 <span class="nv">$ </span><span class="nb">cd</span> ~/.brooklyn
-<span class="nv">$ </span>wget https://brooklyn.incubator.apache.org//use/guide/quickstart/brooklyn.properties</code></pre></div>
+<span class="nv">$ </span>wget https://brooklyn.incubator.apache.org/quickstart/brooklyn.properties</code></pre></div>
 
 <p>Open brooklyn.properties in a text editor and add your cloud credentials.</p>
 
-<p>If you would rather test Brooklyn on localhost, follow <a href="https://brooklyn.incubator.apache.org//use/guide/locations/">these instructions</a> to ensure that your Brooklyn can access your machine.</p>
+<p>If you would rather test Brooklyn on localhost, follow <a href="https://brooklyn.incubator.apache.org/v/0.7.0-M1/use/guide/locations/">these instructions</a> to ensure that your Brooklyn can access your machine.</p>
 
 <p>Restart Brooklyn:</p>
 
@@ -165,7 +160,7 @@
 <span class="p-Indicator">-</span> <span class="l-Scalar-Plain">serviceType</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">brooklyn.entity.webapp.ControlledDynamicWebAppCluster</span>
   <span class="l-Scalar-Plain">name</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">My Web</span>
   <span class="l-Scalar-Plain">brooklyn.config</span><span class="p-Indicator">:</span>
-    <span class="l-Scalar-Plain">wars.root</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp//brooklyn-example-hello-world-sql-webapp-.war</span>
+    <span class="l-Scalar-Plain">wars.root</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M1/brooklyn-example-hello-world-sql-webapp-0.7.0-M1.war</span>
     <span class="l-Scalar-Plain">java.sysprops</span><span class="p-Indicator">:</span>
       <span class="l-Scalar-Plain">brooklyn.example.db.url</span><span class="p-Indicator">:</span> <span class="p-Indicator">&gt;</span>
         <span class="no">$brooklyn:formatString(&quot;jdbc:%s%s?user=%s\\&amp;password=%s&quot;,</span>

Modified: incubator/brooklyn/site/quickstart/policies-and-catalogs.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/policies-and-catalogs.html?rev=1613181&r1=1613180&r2=1613181&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/policies-and-catalogs.html (original)
+++ incubator/brooklyn/site/quickstart/policies-and-catalogs.html Thu Jul 24 16:34:56 2014
@@ -42,12 +42,7 @@
 
 <div class="container">
     <h1>Getting Started - Policies and Catalogs</h1>
-    
-<!--- both snapshots and releases -->
-
-<!--- releases -->
-
-<p>In the <a href="index.html">previous step</a> we downloaded Brooklyn and used it to deploy an application to a cloud, but at its heart Brooklyn is a policy driven <em>management</em> plane.</p>
+    <p>In the <a href="index.html">previous step</a> we downloaded Brooklyn and used it to deploy an application to a cloud, but at its heart Brooklyn is a policy driven <em>management</em> plane.</p>
 
 <p>Here we will introduce Polices using a simple demo app, which we will load from a Service Catalog.</p>
 
@@ -56,7 +51,7 @@
 <p>Download the template <a href="catalog.xml">catalog.xml</a> to your <code>~/.brooklyn/</code> folder, and relaunch Brooklyn.</p>
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd</span> ~/.brooklyn
-<span class="nv">$ </span>wget https://brooklyn.incubator.apache.org//use/guide/quickstart/catalog.xml
+<span class="nv">$ </span>wget https://brooklyn.incubator.apache.org/v/0.7.0-M1//use/guide/quickstart/catalog.xml
 
 <span class="nv">$ </span>brooklyn launch</code></pre></div>
 
@@ -94,7 +89,7 @@
 
 <h3 id="next">Next</h3>
 
-<p>The <a href="https://brooklyn.incubator.apache.org//use/examples/webcluster/index.html">Elastic Web Cluster Example</a> page
+<p>The <a href="https://brooklyn.incubator.apache.org/v/0.7.0-M1//use/examples/webcluster/index.html">Elastic Web Cluster Example</a> page
 details how to build this demo application from scratch in Java. It shows in more detail how Brooklyn can
 complement your application with policy driven management, and how applications can be
 run from the command line.</p>