You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/12/17 14:15:06 UTC
svn commit: r1646231 [2/3] - in /incubator/brooklyn/site: ./ community/
documentation/ quickstart/
Modified: incubator/brooklyn/site/documentation/install-on-server.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/install-on-server.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation/install-on-server.html (original)
+++ incubator/brooklyn/site/documentation/install-on-server.html Wed Dec 17 13:15:05 2014
@@ -2,12 +2,12 @@
<html lang="en">
<head>
-<title>Installing on a server - Apache Brooklyn (incubating)</title>
+<title>Installing on a Server - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown active">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/v/latest">User Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/glossary.html">Glossary</a>
+ </li>
+
+ <li>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -102,8 +135,15 @@
<div class="container">
<div class="row">
<div class="col-md-9">
- <h1>Installing on a server</h1>
- <p>Here we present two <em>alternatives</em> to install Brooklyn:</p>
+ <h1>Installing on a Server</h1>
+
+<!-- OLD things -->
+
+<!--- both snapshots and releases -->
+
+<!--- releases -->
+
+<p>Here we present two <em>alternatives</em> to install Brooklyn:</p>
<ul>
<li><a href="#script">Running the <em>installation script</em></a></li>
@@ -116,13 +156,13 @@
<h4 id="script-prerequisites">Script prerequisites</h4>
<p>The script assumes that the server is a recent <em>RHEL/CentOS 6.x Linux</em> or <em>Ubuntu 12.04</em> installation, but other Linux variants have been tested successfully.</p>
-<p>The script will install Java 7 and other required packages if they are not present. You must have root access over <a href="https://brooklyn.incubator.apache.org/documentation/passwordless-ssh.html">passwordless SSH</a> to install brooklyn, but the service runs as an ordinary user once installed. </p>
+<p>The script will install Java 7 and other required packages if they are not present. You must have root access over <a href="/documentation/passwordless-ssh.html">passwordless SSH</a> to install brooklyn, but the service runs as an ordinary user once installed. </p>
<p>To manage the brooklyn service you must also be able to connect to port 8081 remotely.</p>
<p>Once the above prerequisites are satisfied, you should be able to run successfully:</p>
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>curl -o brooklyn-install.sh http://git.io/GzkOKQ
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>curl -o brooklyn-install.sh -L https://github.com/apache/incubator-brooklyn/raw/master/brooklyn-install.sh
<span class="nv">$ </span>chmod +x ./brooklyn-install.sh
<span class="nv">$ </span>./brooklyn-install.sh -s -r <your-server-ip></code></pre></div>
@@ -142,16 +182,16 @@
<ul>
<li>install Java JRE or SDK (version 6 or later)</li>
- <li>install <a href="https://brooklyn.incubator.apache.org/documentation//ssh-key.html">SSH key</a>, if not available.</li>
- <li>enable <a href="https://brooklyn.incubator.apache.org/documentation/passwordless-ssh.html">passwordless ssh login</a>.</li>
+ <li>install <a href="/documentation//ssh-key.html">SSH key</a>, if not available.</li>
+ <li>enable <a href="/documentation/passwordless-ssh.html">passwordless ssh login</a>.</li>
<li>create a <code>~/.brooklyn</code> directory on the host with <code>$ mkdir ~/.brooklyn</code></li>
<li>Check your iptables service, and if enabled, make sure that it accepts all incoming connections to 8443+ ports.</li>
- <li>[optional] Increase <a href="https://brooklyn.incubator.apache.org/documentation//increase-entropy.html">linux kernel entropy</a> for faster ssh connections.</li>
+ <li>[optional] Increase <a href="/documentation//increase-entropy.html">linux kernel entropy</a> for faster ssh connections.</li>
</ul>
<h2 id="a-iddownloadadownload-brooklyn"><a id="download"></a>Download Brooklyn</h2>
-<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>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="/download.html">download options</a> are available.</p>
<p>Expand the <code>tar.gz</code> archive:</p>
@@ -174,10 +214,10 @@
<p>The <code>brooklyn.properties</code> is the main configuration file for deployment locations. Contains the connection details and credentials for all public or on-premises cloud providers, as well as controlling some application startup and security options.</p>
-<p>Create a <code>.brooklyn</code> folder in your home directory and download the template <a href="../quickstart/brooklyn.properties">brooklyn.properties</a> to that folder.</p>
+<p>Create a <code>.brooklyn</code> folder in your home directory and download the template <a href="/v/latest/use/guide/quickstart/brooklyn.properties">brooklyn.properties</a> to that folder.</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>mkdir -p ~/.brooklyn
-<span class="nv">$ </span>wget -O ~/.brooklyn/brooklyn.properties https://brooklyn.incubator.apache.org/quickstart/brooklyn.properties
+<span class="nv">$ </span>wget -O ~/.brooklyn/brooklyn.properties http://0.0.0.0:4000/v/latest/use/guide/quickstart/brooklyn.properties
<span class="nv">$ </span>chmod <span class="m">600</span> ~/.brooklyn/brooklyn.properties</code></pre></div>
<p>You may need to edit <code>~/.brooklyn/brooklyn.properties</code> to ensure that brooklyn can access cloud locations for application deployment.</p>
@@ -186,7 +226,7 @@
<p>By default Brooklyn loads the catalog of available application components and services from
<code>~/.brooklyn/catalog.xml</code>. </p>
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>wget -O ~/.brooklyn/catalog.xml https://brooklyn.incubator.apache.org/quickstart/catalog.xml</code></pre></div>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>wget -O ~/.brooklyn/catalog.xml http://0.0.0.0:4000/quickstart/catalog.xml</code></pre></div>
<p>The <code>catalog.xml</code> is the application blueprint catalog. The above example file contains some blueprints which will be automatically downloaded from the web if you run them.</p>
@@ -209,11 +249,13 @@ INFO Started Brooklyn console at http:/
<div class="col-md-3">
<div class="list-group">
- <h4><a href="https://brooklyn.incubator.apache.org/documentation.html" class="list-group-item">Documentation</a></h4>
+ <h4><a href="/documentation.html" class="list-group-item">Documentation</a></h4>
- <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item">Glossary</a>
+ <a href="/v/latest" class="list-group-item">User Guide</a>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item active">Installing on a server</a>
+ <a href="/glossary.html" class="list-group-item">Glossary</a>
+
+ <a href="/documentation/install-on-server.html" class="list-group-item active">Installing on a Server</a>
</div>
@@ -232,9 +274,9 @@ INFO Started Brooklyn console at http:/
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/documentation/install-on-server.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/documentation/install-on-server.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -243,6 +285,7 @@ INFO Started Brooklyn console at http:/
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -254,5 +297,6 @@ INFO Started Brooklyn console at http:/
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/documentation/passwordless-ssh.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/passwordless-ssh.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation/passwordless-ssh.html (original)
+++ incubator/brooklyn/site/documentation/passwordless-ssh.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>Passwordless SSH login - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/v/latest">User Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/glossary.html">Glossary</a>
+ </li>
+
+ <li>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -152,9 +185,9 @@ Your public key has been saved in /home/
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/documentation/passwordless-ssh.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/documentation/passwordless-ssh.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -163,6 +196,7 @@ Your public key has been saved in /home/
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -174,5 +208,6 @@ Your public key has been saved in /home/
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/documentation/ssh-key.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/ssh-key.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation/ssh-key.html (original)
+++ incubator/brooklyn/site/documentation/ssh-key.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>SSH keys - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/v/latest">User Guide</a>
+ </li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/glossary.html">Glossary</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -107,6 +140,7 @@
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>ssh-keygen -t rsa -N <span class="s2">""</span> -f ~/.ssh/id_rsa</code></pre></div>
+
</div>
<div class="col-md-3">
@@ -125,9 +159,9 @@
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/documentation/ssh-key.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/documentation/ssh-key.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -136,6 +170,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -147,5 +182,6 @@
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/download.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/download.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/download.html (original)
+++ incubator/brooklyn/site/download.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>Download - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class="active"><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class="active"><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/v/latest">User Guide</a>
+ </li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/glossary.html">Glossary</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -105,6 +138,13 @@
<h1>Download</h1>
<h2 id="download-brooklyn-binary-distributions">Download Brooklyn Binary Distributions</h2>
+<p><strong>Snapshot Alert</strong>:
+We are working our way through the Apache process for an official Apache release,
+but as a result it has been a long time since the last milestone release.</p>
+
+<p><strong>You may wish to use a <a href="/v/latest/start/download.html">snapshot release</a>
+ as it now has many many features not in 0.7.0-M1!</strong></p>
+
<p><strong>New to Brooklyn</strong>? Download the <em>Milestone</em> release below then take a look
at the <a href="quickstart/">Get Started</a> page.</p>
@@ -186,9 +226,9 @@ at the <a href="quickstart/">Get Started
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/download.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/download.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -197,6 +237,7 @@ at the <a href="quickstart/">Get Started
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -208,5 +249,6 @@ at the <a href="quickstart/">Get Started
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/glossary.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/glossary.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/glossary.html (original)
+++ incubator/brooklyn/site/glossary.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>Glossary - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown active">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/v/latest">User Guide</a>
+ </li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/glossary.html">Glossary</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -120,7 +153,7 @@ be described in <a href="#yaml">YAML</a>
<h6 id="see-also">See also</h6>
<ul>
- <li><a href="https://brooklyn.incubator.apache.org/learnmore/catalog/index.html">Documentation</a> for the entity,
+ <li><a href="/learnmore/catalog/index.html">Documentation</a> for the entity,
policy and enricher blueprints that Apache Brooklyn supports out-of-the-box.</li>
</ul>
@@ -180,11 +213,13 @@ that aim to standardise the portability
<div class="col-md-3">
<div class="list-group">
- <h4><a href="https://brooklyn.incubator.apache.org/documentation.html" class="list-group-item">Documentation</a></h4>
+ <h4><a href="/documentation.html" class="list-group-item">Documentation</a></h4>
- <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item active">Glossary</a>
+ <a href="/v/latest" class="list-group-item">User Guide</a>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item">Installing on a server</a>
+ <a href="/glossary.html" class="list-group-item active">Glossary</a>
+
+ <a href="/documentation/install-on-server.html" class="list-group-item">Installing on a Server</a>
</div>
@@ -203,9 +238,9 @@ that aim to standardise the portability
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/glossary.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/glossary.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -214,6 +249,7 @@ that aim to standardise the portability
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -225,5 +261,6 @@ that aim to standardise the portability
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/index.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/index.html (original)
+++ incubator/brooklyn/site/index.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>Home - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/v/latest">User Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/glossary.html">Glossary</a>
+ </li>
+
+ <li>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -171,7 +204,7 @@
<div class="col-md-3">
<p><img src="https://incubator.apache.org/images/egg-logo.png" alt="Apache Incubator" /></p>
<p>
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/index.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/index.md">Edit This Page</a>
<br />
<a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
</p>
@@ -183,6 +216,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -194,5 +228,6 @@
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>
Modified: incubator/brooklyn/site/quickstart/catalog.xml
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/catalog.xml?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/catalog.xml (original)
+++ incubator/brooklyn/site/quickstart/catalog.xml Wed Dec 17 13:15:05 2014
@@ -1,22 +1,22 @@
-<catalog>
- <name>Brooklyn Demos</name>
-
-
- <template type="brooklyn.demo.WebClusterDatabaseExample" name="Demo Web Cluster with DB">
- <description>Deploys a demonstration web application to a managed JBoss cluster with elasticity, persisting to a MySQL</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <template type="brooklyn.demo.GlobalWebFabricExample" name="Demo GeoDNS Web Fabric DB">
- <description>Deploys a demonstration web application to JBoss clusters around the world</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <classpath>
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
- </classpath>
-
-
-</catalog>
-
+<catalog>
+ <name>Brooklyn Demos</name>
+
+
+ <template type="brooklyn.demo.WebClusterDatabaseExample" name="Demo Web Cluster with DB">
+ <description>Deploys a demonstration web application to a managed JBoss cluster with elasticity, persisting to a MySQL</description>
+ <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
+ </template>
+
+ <template type="brooklyn.demo.GlobalWebFabricExample" name="Demo GeoDNS Web Fabric DB">
+ <description>Deploys a demonstration web application to JBoss clusters around the world</description>
+ <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
+ </template>
+
+ <classpath>
+ <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ </classpath>
+
+
+</catalog>
+
Modified: incubator/brooklyn/site/quickstart/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/index.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/index.html (original)
+++ incubator/brooklyn/site/quickstart/index.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
<title>Getting Started - Apache Brooklyn (incubating)</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
</head>
<body>
@@ -23,7 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+ <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
<ul class="nav navbar-nav navbar-right">
- <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+ <li class="dropdown">
+ <a href="/learnmore/index.html">learn more</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/learnmore/index.html">Learn More</a>
+ </li>
+ <li class="divider"></li>
+
+ <li>
+ <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+ </li>
+
+ <li>
+ <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+ </li>
+
+ </ul>
+ </li><!-- learnmore -->
- <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+ <li class=""><a href="/download.html">download</a></li><!-- download -->
<li class="dropdown active">
- <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+ <a href="/quickstart/index.html">get started</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/quickstart/index.html">Get Started</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
</li>
</ul>
@@ -53,15 +74,23 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+ <a href="/documentation.html">documentation</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/documentation.html">All Documentation</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+ <a href="/v/latest">User Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+ <a href="/glossary.html">Glossary</a>
+ </li>
+
+ <li>
+ <a href="/documentation/install-on-server.html">Installing on a Server</a>
</li>
</ul>
@@ -70,27 +99,31 @@
<li class="dropdown">
- <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+ <a href="/community/index.html">community</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="/community/index.html">Community Home</a>
+ </li>
+ <li class="divider"></li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+ <a href="/community/how-to-contribute.html">How to Contribute</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+ <a href="/community/migrate-to-apache.html">How to Migrate</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+ <a href="/community/committers.html">Committer's Guide</a>
</li>
<li>
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+ <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
</li>
</ul>
- </li><!-- community -->
+ </li><!-- website/community -->
</ul>
@@ -103,7 +136,14 @@
<div class="row">
<div class="col-md-9">
<h1>Getting Started</h1>
- <p>This guide will walk you through deploying an application to a public cloud.</p>
+
+<!-- OLD things -->
+
+<!--- both snapshots and releases -->
+
+<!--- releases -->
+
+<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>
@@ -154,7 +194,7 @@ does not, execute <code>chmod 0600 ~/.ss
</li>
<li>The key in <code>~/.ssh/id_rsa</code> does <em>not</em> have a passphrase.
<ul>
- <li>You can test this by executing <code>ssh-keygen -y</code>. If does <em>not</em> ask for a passphrase, then your key is OK.</li>
+ <li>You can test this by executing <code>ssh-keygen -y</code>. If it does <em>not</em> ask for a passphrase, then your key is OK.</li>
<li>If your key does have a passphrase, remove it. You can do this by running <code>ssh-keygen -p</code>. Enter the passphrase,
then when prompted for the new passphrase, hit Enter.</li>
</ul>
@@ -176,12 +216,12 @@ Are you sure you want to continue connec
<p>If the response is <code>hello world</code>, with no other output or prompts, then your SSH setup is good and Brooklyn should be
able to use it without a problem.</p>
-<p>If these steps are not working, <a href="https://brooklyn.incubator.apache.org/v/0.7.0-M1/use/guide/locations/">these instructions</a> may be
+<p>If these steps are not working, <a href="/v/latest/use/guide/locations/">these instructions</a> may be
useful.</p>
<h2 id="install-brooklyn">Install Brooklyn</h2>
-<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>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="/download.html">download options</a> are available.)</p>
<p>Expand the <code>tar.gz</code> archive:</p>
@@ -223,11 +263,11 @@ useful.</p>
<p>Brooklyn loads Location configuration from <code>~/.brooklyn/brooklyn.properties</code>. </p>
-<p>Create a <code>.brooklyn</code> folder in your home directory and download the template <a href="brooklyn.properties">brooklyn.properties</a> to that folder.</p>
+<p>Create a <code>.brooklyn</code> folder in your home directory and download the template <a href="/v/latest/use/guide/quickstart/brooklyn.properties">brooklyn.properties</a> to that folder.</p>
<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/quickstart/brooklyn.properties</code></pre></div>
+<span class="nv">$ </span>wget http://0.0.0.0:4000/v/latest/use/guide/quickstart/brooklyn.properties</code></pre></div>
<p>Open brooklyn.properties in a text editor and add your cloud credentials.</p>
@@ -335,9 +375,9 @@ application. Your application will be sh
<div class="col-md-3">
<div class="list-group">
- <h4><a href="https://brooklyn.incubator.apache.org/quickstart/index.html" class="list-group-item active">Getting Started</a></h4>
+ <h4><a href="/quickstart/index.html" class="list-group-item active">Getting Started</a></h4>
- <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html" class="list-group-item">Getting Started - Policies and Catalogs</a>
+ <a href="/quickstart/policies-and-catalogs.html" class="list-group-item">Policies and Catalogs</a>
</div>
@@ -356,9 +396,9 @@ application. Your application will be sh
Foundation.
</div>
<div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/quickstart/index.md">Edit This Page</a>
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/quickstart/index.md">Edit This Page</a>
<br />
- <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+ <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
</div>
</div>
</div>
@@ -367,6 +407,7 @@ application. Your application will be sh
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -378,5 +419,6 @@ application. Your application will be sh
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
+
</html>