You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/11/19 11:56:33 UTC
[1/4] incubator-brooklyn git commit: Restored getting started guide
landing page.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master dfa34b617 -> 8f384a189
Restored getting started guide landing page.
The concepts quickstart is moved to the end of the section and added as an suggested reference to the landing page (which is the Running Brooklyn page again) in order to simplify the flow.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f4945910
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f4945910
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f4945910
Branch: refs/heads/master
Commit: f49459105b970a2a537a643928427356de516c1a
Parents: dfa34b6
Author: John McCabe <jo...@johnmccabe.net>
Authored: Thu Nov 19 02:28:12 2015 +0000
Committer: John McCabe <jo...@johnmccabe.net>
Committed: Thu Nov 19 02:28:12 2015 +0000
----------------------------------------------------------------------
docs/guide/start/concept-quickstart.md | 5 +----
docs/guide/start/index.md | 3 +--
docs/guide/start/running.md | 2 ++
docs/website/index.md | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4945910/docs/guide/start/concept-quickstart.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/concept-quickstart.md b/docs/guide/start/concept-quickstart.md
index 0e862a0..3f04557 100644
--- a/docs/guide/start/concept-quickstart.md
+++ b/docs/guide/start/concept-quickstart.md
@@ -4,10 +4,7 @@ layout: website-normal
menu_parent: index.md
---
-The following section gives a quick summary of the main Brooklyn concepts you will encounter in Getting Started. For later investigation of these concepts see [The Theory Behind Brooklyn]({{site.path.website}}/learnmore/theory.html), and the detailed description in [Brooklyn Concepts]({{site.path.guide}}/concepts/).
-
-Having examined the concepts below, get started by **[installing and launching](running.html)** Brooklyn.
-
+The following section provides a quick summary of the main Brooklyn concepts you will encounter in Getting Started. For further discussion of these concepts see [The Theory Behind Brooklyn]({{site.path.website}}/learnmore/theory.html), and the detailed descriptions in [Brooklyn Concepts]({{site.path.guide}}/concepts/).
***Deployment and Management*** Brooklyn is built for agile deployment of applications across cloud and other targets, and real-time autonomic management. "Autonomic computing" is the concept of components looking after themselves where possible (self-healing, self-optimizing, etc).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4945910/docs/guide/start/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/index.md b/docs/guide/start/index.md
index 12e56b0..ccd6f6f 100644
--- a/docs/guide/start/index.md
+++ b/docs/guide/start/index.md
@@ -1,13 +1,12 @@
---
layout: website-normal
title: Getting Started
-menu_parent: ../index.md
children:
-- concept-quickstart.md
- running.md
- blueprints.md
- managing.md
- policies.md
+- concept-quickstart.md
---
{% include list-children.html %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4945910/docs/guide/start/running.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/running.md b/docs/guide/start/running.md
index edb0c96..54315ec 100644
--- a/docs/guide/start/running.md
+++ b/docs/guide/start/running.md
@@ -7,6 +7,8 @@ menu_parent: index.md
This guide will walk you through deploying an example 3-tier web application to a public cloud, and demonstrate the autoscaling capabilities of the Brooklyn platform.
+An overview of core [Brooklyn concepts](./concept-quickstart.html) is available for reference.
+
This tutorial assumes that you are using Linux or Mac OS X.
## Install Apache Brooklyn
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4945910/docs/website/index.md
----------------------------------------------------------------------
diff --git a/docs/website/index.md b/docs/website/index.md
index 374a6e9..5409d30 100644
--- a/docs/website/index.md
+++ b/docs/website/index.md
@@ -5,7 +5,7 @@ landing: true
children:
- learnmore/
- { path: download/, menu: null }
-- { path: /guide/start/concept-quickstart.md, title: Get Started }
+- { path: /guide/start/index.md, title_in_menu: Get Started, href_path: /guide/start/running.md}
- path: documentation/
menu:
- { path: /guide/index.md, title_in_menu: "User Guide",
[2/4] incubator-brooklyn git commit: Remove no longer used annotation
and enclosing project
Posted by sj...@apache.org.
Remove no longer used annotation and enclosing project
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/00b89a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/00b89a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/00b89a29
Branch: refs/heads/master
Commit: 00b89a298f1c5386cb552aeffb3dd03a9fe4e328
Parents: dfa34b6
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Nov 18 22:33:56 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Nov 18 22:33:56 2015 -0500
----------------------------------------------------------------------
utils/swagger-annotations/pom.xml | 44 --------------------
.../brooklyn/swagger/annotations/Apidoc.java | 33 ---------------
2 files changed, 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/00b89a29/utils/swagger-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/utils/swagger-annotations/pom.xml b/utils/swagger-annotations/pom.xml
deleted file mode 100644
index 36e5959..0000000
--- a/utils/swagger-annotations/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>brooklyn-swagger-annotations</artifactId>
- <name>Brooklyn Swagger Annotations</name>
-
- <description>
- Swagger-like annotations developed for Brooklyn but not dependendent on Brooklyn
- </description>
-
- <parent>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-core_2.9.1</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/00b89a29/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java
----------------------------------------------------------------------
diff --git a/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java b/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java
deleted file mode 100644
index a9263c2..0000000
--- a/utils/swagger-annotations/src/main/java/org/apache/brooklyn/swagger/annotations/Apidoc.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.swagger.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** like Swagger Api annotation (and treated similarly) but doesn't require path to be repeated, and supports a name */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Apidoc {
- String value();
- String description() default "";
- // ? what is 'open' in @Api
-}
[3/4] incubator-brooklyn git commit: This closes #1047
Posted by sj...@apache.org.
This closes #1047
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5e92190b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5e92190b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5e92190b
Branch: refs/heads/master
Commit: 5e92190b2b54303da7404163495406ed18c0ce34
Parents: dfa34b6 00b89a2
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Nov 19 10:49:50 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Nov 19 10:49:50 2015 +0000
----------------------------------------------------------------------
utils/swagger-annotations/pom.xml | 44 --------------------
.../brooklyn/swagger/annotations/Apidoc.java | 33 ---------------
2 files changed, 77 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-brooklyn git commit: This closes #1046
Posted by sj...@apache.org.
This closes #1046
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8f384a18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8f384a18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8f384a18
Branch: refs/heads/master
Commit: 8f384a189affc4184d1e7b9bc2a5b5f13519c554
Parents: 5e92190 f494591
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Nov 19 10:55:03 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Nov 19 10:55:03 2015 +0000
----------------------------------------------------------------------
docs/guide/start/concept-quickstart.md | 5 +----
docs/guide/start/index.md | 3 +--
docs/guide/start/running.md | 2 ++
docs/website/index.md | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------