brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [3/8] git commit: Cleanup docs
Date Fri, 25 Jul 2014 16:45:40 GMT
Cleanup docs

- remove out-of-date (misleading) wish list
- removes unused/old catalog.md
- tidies up “writing an entity” docs a little bit
- tidies up Brooklyn projects / sub-projects listing


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e5e0fd8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e5e0fd8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e5e0fd8c

Branch: refs/heads/master
Commit: e5e0fd8c9aa40beae3befde5a6e8b42dfdda33db
Parents: e315de3
Author: Aled Sage <aled.sage@gmail.com>
Authored: Mon Jul 21 17:47:15 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue Jul 22 12:37:04 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/catalog/internal/catalog.md   |  59 -----------
 docs/dev/build/index.md                         | 105 +++++++++++++------
 docs/dev/code/entity.md                         |  28 +++--
 docs/dev/code/index.include.md                  |  35 +++++--
 docs/dev/toc.json                               |   2 -
 docs/dev/wishlist.md                            |  28 -----
 docs/use/guide/extras/index.md                  |  51 +++++++--
 7 files changed, 156 insertions(+), 152 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/core/src/main/java/brooklyn/catalog/internal/catalog.md
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/catalog.md b/core/src/main/java/brooklyn/catalog/internal/catalog.md
deleted file mode 100644
index 2a001f2..0000000
--- a/core/src/main/java/brooklyn/catalog/internal/catalog.md
+++ /dev/null
@@ -1,59 +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.
--->
-<catalog>
-  <name>My Local Catalog</name>
-  <!-- scan means it will load templates based on @CatalogTemplate annotations on entities;
-       recommended only for local elements to prevent having to download JARs just to populate
catalog.
-       (from a local scan you can generate the XML for publishing by saying  
-        `mgmt.getCatalog().toXmlString()` in JS gui groovy page, then tweaking.)  
-       also, for a local (non-linked) reference, an empty classpath means to use the default
classpath. -->
-  <classpath scan="types"/>
-
-  <!-- now (for illustration) we define some other sources which weren't on our classpath
but
-       which we want included in our catalog on our brooklyn server -->
-  <catalog>
-    <classpath>
-      <entry>file://~/.m2/repository/io/cloudsoft/mapr/brooklyn-mapr/0.0.1-SNAPSHOT/brooklyn-mapr-0.0.1-SNAPSHOT.jar</entry>
-    </classpath>
-    <!-- templates explicitly listed since we didn't scan above (NB scan=false is the
default) -->
-    <template type="io.brooklyn.mapr.M3App" name="MapR M3">
-        <description>MapR Apache Hadoop M3 resizable cluster deployed to a wide variety
of clouds</description>
-        <iconUrl>http://releng3.cloudsoftcorp.com/downloads/brooklyn/img/mapr_logo.png</iconUrl>
-    </template>
-  </catalog>
-  
-  <catalog>
-    <description>Extra local jars I've got on my machine, added so I can pull in the
CDH easily.</description>
-    <classpath scan="annotations">
-      <entry>file://~/.m2/repository/io/cloudsoft/cloudera/brooklyn-cdh/1.0.0-SNAPSHOT/brooklyn-cdh-1.0.0-SNAPSHOT.jar</entry>
-      <entry>file://~/.m2/repository/com/cloudera/whirr-cm/1.1-SNAPSHOT/whirr-cm-1.1-SNAPSHOT.jar</entry>
-    </classpath>
-    <!-- templates here were autodetected (scan=true), so we don't _need_ to list any
entities;
-         but here we illustrate how we can add our own (or even override, if we left out
id) -->
-    <template type="io.cloudsoft.cloudera.SampleClouderaManagedCluster" id="my_cdh" name="MY
CDH">
-      <description>I've just overrridden the default and supplied my own name and description,
to show what can be done.</description>
-    </template>
-  </catalog>
-  
-  <!-- and a few remote catalogs -->
-  <catalog url="http://cloudsoftcorp.com/amp-brooklyn-catalog.xml"/>
-  <catalog url="http://microsoot.com/oofice-catalog.xml"/>
-    
-</catalog>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/dev/build/index.md
----------------------------------------------------------------------
diff --git a/docs/dev/build/index.md b/docs/dev/build/index.md
index d5bee19..927c42d 100644
--- a/docs/dev/build/index.md
+++ b/docs/dev/build/index.md
@@ -63,58 +63,95 @@ brooklyn% mvn clean install
 [INFO] Reactor Build Order:
 [INFO] 
 [INFO] Brooklyn Parent Project
+[INFO] Brooklyn Utilities to Support Testing (listeners etc)
+[INFO] Brooklyn Logback Includable Configuration
+[INFO] Brooklyn Common Utilities
+[INFO] Brooklyn Groovy Utilities
 [INFO] Brooklyn API
-[INFO] Brooklyn Test Support
-[INFO] Brooklyn Core
 
 ...
 
-Mar 29, 2012 4:30:17 PM java.util.jar.Attributes read
-WARNING: Duplicate name in Manifest: Manifest-Version.
-Ensure that the manifest does not have duplicate entries, and
-that blank lines separate individual sections in both your
-manifest and in the META-INF/MANIFEST.MF entry in the jar file.
+[WARNING] Ignoring project type war - supportedProjectTypes = [jar]
 
 ...
 
-[WARNING] We have a duplicate org/jclouds/cloudsigma/CloudSigmaAsyncClient.class in 
-/Users/alex/.m2/repository/org/jclouds/provider/cloudsigma-zrh/1.4.0/cloudsigma-zrh-1.4.0.jar
+[WARNING] We have a duplicate org/xmlpull/v1/XmlPullParser.class in /Users/aled/.m2/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar
 
 ...
 
-[INFO] --- maven-jar-plugin:2.3.1:jar (default-jar) @ brooklyn-all ---
-[WARNING] JAR will be empty - no content was marked for inclusion!
+[INFO] — maven-assembly-plugin:2.3:single (build-distribution-dir) @ brooklyn-dist —
+[INFO] Reading assembly descriptor: src/main/config/build-distribution-dir.xml
+[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.7.0-SNAPSHOT;
it doesn't have an associated file or directory.
+[INFO] Copying files to /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-dist
+[WARNING] Assembly file: /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-dist
is not a regular file (it may be a directory). It cannot be attached to the project build
for installation or deployment.
+
+...
+
+[INFO] — maven-assembly-plugin:2.3:single (build-distribution-archive) @ brooklyn-dist
—
+[INFO] Reading assembly descriptor: src/main/config/build-distribution-archive.xml
+[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.7.0-SNAPSHOT;
it doesn't have an associated file or directory.
+[INFO] Building tar: /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-0.7.0-SNAPSHOT-dist.tar.gz
+[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.7.0-SNAPSHOT;
it doesn't have an associated file or directory.
+
+...
+
+[WARNING] Don't override file /Users/aled/repos/apache/incubator-brooklyn/usage/archetypes/quickstart/target/test-classes/projects/integration-test-1/project/brooklyn-sample/src/main/resources/sample-icon.png
 
 ...
 
-[INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
 [INFO] 
-[INFO] Brooklyn Parent Project ........................... SUCCESS [0.813s]
-[INFO] Brooklyn API ...................................... SUCCESS [6.115s]
-[INFO] Brooklyn Test Support ............................. SUCCESS [4.592s]
-[INFO] Brooklyn Core ..................................... SUCCESS [1:20.536s]
-[INFO] Brooklyn Policies ................................. SUCCESS [57.996s]
-[INFO] Brooklyn Software Base ............................ SUCCESS [29.869s]
-[INFO] Brooklyn OSGi Software Entities ................... SUCCESS [9.392s]
-[INFO] Brooklyn Web App Software Entities ................ SUCCESS [49.606s]
-[INFO] Brooklyn Messaging Software Entities .............. SUCCESS [12.198s]
-[INFO] Brooklyn NoSQL Data Store Software Entities ....... SUCCESS [9.205s]
-[INFO] Brooklyn Database Software Entities ............... SUCCESS [7.815s]
-[INFO] Brooklyn Whirr Base Entities ...................... SUCCESS [21.292s]
-[INFO] Brooklyn Hadoop System Entities ................... SUCCESS [9.972s]
-[INFO] Brooklyn Web Console .............................. SUCCESS [1:00.814s]
-[INFO] Brooklyn Launcher ................................. SUCCESS [1:00.603s]
-[INFO] Brooklyn All Things ............................... SUCCESS [23.358s]
-[INFO] hello-world-webapp Maven Webapp ................... SUCCESS [2.521s]
-[INFO] Brooklyn Simple Web Cluster Example ............... SUCCESS [5.860s]
-[INFO] Brooklyn Hadoop and Whirr Example ................. SUCCESS [4.892s]
+[INFO] Brooklyn Parent Project ........................... SUCCESS [3.072s]
+[INFO] Brooklyn Utilities to Support Testing (listeners etc)  SUCCESS [3.114s]
+[INFO] Brooklyn Logback Includable Configuration ......... SUCCESS [0.680s]
+[INFO] Brooklyn Common Utilities ......................... SUCCESS [7.263s]
+[INFO] Brooklyn Groovy Utilities ......................... SUCCESS [5.193s]
+[INFO] Brooklyn API ...................................... SUCCESS [2.146s]
+[INFO] Brooklyn Test Support ............................. SUCCESS [2.517s]
+[INFO] CAMP Server Parent Project ........................ SUCCESS [0.075s]
+[INFO] CAMP Base ......................................... SUCCESS [4.079s]
+[INFO] Brooklyn REST Swagger Apidoc Utilities ............ SUCCESS [1.983s]
+[INFO] Brooklyn Logback Configuration .................... SUCCESS [0.625s]
+[INFO] CAMP Server ....................................... SUCCESS [5.446s]
+[INFO] Brooklyn Core ..................................... SUCCESS [1:24.122s]
+[INFO] Brooklyn Policies ................................. SUCCESS [44.425s]
+[INFO] Brooklyn Hazelcast Storage ........................ SUCCESS [7.143s]
+[INFO] Brooklyn Jclouds Location Targets ................. SUCCESS [16.488s]
+[INFO] Brooklyn Secure JMXMP Agent ....................... SUCCESS [8.634s]
+[INFO] Brooklyn JMX RMI Agent ............................ SUCCESS [2.315s]
+[INFO] Brooklyn Software Base ............................ SUCCESS [28.538s]
+[INFO] Brooklyn Network Software Entities ................ SUCCESS [3.896s]
+[INFO] Brooklyn OSGi Software Entities ................... SUCCESS [4.589s]
+[INFO] Brooklyn Web App Software Entities ................ SUCCESS [17.484s]
+[INFO] Brooklyn Messaging Software Entities .............. SUCCESS [7.106s]
+[INFO] Brooklyn Database Software Entities ............... SUCCESS [5.229s]
+[INFO] Brooklyn NoSQL Data Store Software Entities ....... SUCCESS [11.901s]
+[INFO] Brooklyn Monitoring Software Entities ............. SUCCESS [4.027s]
+[INFO] Brooklyn CAMP REST API ............................ SUCCESS [15.285s]
+[INFO] Brooklyn REST API ................................. SUCCESS [4.489s]
+[INFO] Brooklyn REST Server .............................. SUCCESS [30.270s]
+[INFO] Brooklyn REST Client .............................. SUCCESS [7.007s]
+[INFO] Brooklyn REST JavaScript Web GUI .................. SUCCESS [24.397s]
+[INFO] Brooklyn Launcher ................................. SUCCESS [15.923s]
+[INFO] Brooklyn Command Line Interface ................... SUCCESS [9.279s]
+[INFO] Brooklyn All Things ............................... SUCCESS [13.875s]
+[INFO] Brooklyn Distribution ............................. SUCCESS [49.370s]
+[INFO] Brooklyn Quick-Start Project Archetype ............ SUCCESS [12.053s]
+[INFO] Brooklyn Examples Aggregator Project .............. SUCCESS [0.085s]
+[INFO] Brooklyn Examples Support Aggregator Project - Webapps  SUCCESS [0.053s]
+[INFO] hello-world-webapp Maven Webapp ................... SUCCESS [0.751s]
+[INFO] hello-world-sql-webapp Maven Webapp ............... SUCCESS [0.623s]
+[INFO] Brooklyn Simple Web Cluster Example ............... SUCCESS [5.398s]
+[INFO] Brooklyn Global Web Fabric Example ................ SUCCESS [3.176s]
+[INFO] Brooklyn Simple Messaging Publish-Subscribe Example  SUCCESS [3.217s]
+[INFO] Brooklyn NoSQL Cluster Examples ................... SUCCESS [6.790s]
+[INFO] Brooklyn QA ....................................... SUCCESS [7.117s]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time: 7:52.328s
-[INFO] Finished at: Thu Mar 29 16:30:17 BST 2012
-[INFO] Final Memory: 180M/528M
+[INFO] Total time: 8:33.983s
+[INFO] Finished at: Mon Jul 21 14:56:46 BST 2014
+[INFO] Final Memory: 66M/554M
 [INFO] ------------------------------------------------------------------------
 
 {% endhighlight %}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/dev/code/entity.md
----------------------------------------------------------------------
diff --git a/docs/dev/code/entity.md b/docs/dev/code/entity.md
index 4c497d9..fda984a 100644
--- a/docs/dev/code/entity.md
+++ b/docs/dev/code/entity.md
@@ -4,6 +4,17 @@ title: Writing an Entity
 toc: /toc.json
 ---
 
+## Ways to write an entity
+
+There are several ways to write a new entity:
+
+* Write pure-java, extending existing base-classes and using utilities such as `HttpTool`
and `BashCommands`.
+* Write scripts, and configure (e.g. using YAML) a **`VanillaSoftwareProcess`**.
+* Use Chef recipes, and wire these into the entity by using `ChefConfig` and `ChefLifecycleEffectorTasks`.
+* Use an equivalent of Chef (e.g. Salt or Puppet; support for these is currently less mature
than for Chef)
+
+The rest of this section covers writing an entity in pure-java (or other JVM languages).
+
 
 ## Things To Know
 
@@ -17,11 +28,10 @@ instance, which is important in a distributed management plane.
 All entity implementations inherit from `AbstractEntity`, 
 often through one of the following:
 
-* **`SoftwareProcess`**:  if it's a software process
-* **`VanillaJavaApp`**:  if it's a plain-old-java app
-* **`JavaWebAppSoftwareProcess`**:  if it's a JVM-based web-app
-* **`WhirrEntity`**:  if it's a service launched using Whirr
-* **`DynamicGroup`**:  if it's a collection of other entities
+* **`SoftwareProcessImpl`**:  if it's a software process
+* **`VanillaJavaAppImpl`**:  if it's a plain-old-java app
+* **`JavaWebAppSoftwareProcessImpl`**:  if it's a JVM-based web-app
+* **`DynamicClusterImpl`**, **`DynamicGroupImpl`** or **`AbstractGroupImpl`**:  if it's a
collection of other entities
 
 Software-based processes tend to use *drivers* to install and
 launch the remote processes onto *locations* which support that driver type.
@@ -44,10 +54,10 @@ So to get started:
 1. Create your entity interface, extending the appropriate selection from above,
    to define the effectors and sensors.
 2. Include an annotation like `@ImplementedBy(YourEntityImpl.class)` on your interface,
-   where YourEntityImpl will be the class name for your entity implementation.
+   where `YourEntityImpl` will be the class name for your entity implementation.
 3. Create your entity class, implementing your entity interface and extending the 
    classes for your chosen entity super-types. Naming convention is a suffix "Impl"
-   for the entity class.
+   for the entity class, but this is not essential.
 4. Create a driver interface, again extending as appropriate (e.g. `SoftwareProcessDriver`).
    The naming convention is to have a suffix "Driver". 
 5. Create the driver class, implementing your driver interface, and again extending as appropriate.
@@ -71,8 +81,8 @@ Check out some of the exemplar existing entities
 (note, some of the other entities use deprecated utilities and a deprecated class 
 hierarchy; it is suggested to avoid these, looking at the ones below instead):
 
-* JBoss7Server
-* MySqlNode
+* `JBoss7Server`
+* `MySqlNode`
 
 You might also find the following helpful:
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/dev/code/index.include.md
----------------------------------------------------------------------
diff --git a/docs/dev/code/index.include.md b/docs/dev/code/index.include.md
index 84b8a3d..b071930 100644
--- a/docs/dev/code/index.include.md
+++ b/docs/dev/code/index.include.md
@@ -31,31 +31,46 @@ This document is intended to help people become familiar with the codebase.
 
 ## Project Structure
 
-Brooklyn is split into the following projects and subprojects:
+Brooklyn is split into the following projects and sub-projects:
 
+* **``camp``**: the components for a server which speaks the CAMP REST API and which understands
the CAMP YAML plan language
 * **``api``**: the pure-Java interfaces for interacting with the system
 * **``core``**: the base class implementations for entities and applications, entity traits,
locations, policies, sensor and effector support, tasks, and more 
+* **``locations``**: specific location integrations
+    * **``jclouds``**: integration with many cloud APIs and providers, via Apache jclouds
 * **``policies``**: collection of useful policies for automating entity activity  
 * **``software``**: entities which are mainly launched by launched software processes on
machines, and collections thereof
     * **``base``**: software process lifecycle abstract classes and drivers (e.g. SSH) 
     * **``webapp``**: web servers (JBoss, Tomcat), load-balancers (Nginx), and DNS (Geoscaling)

     * **``database``**: relational databases (SQL) 
     * **``nosql``**: datastores other than RDBMS/SQL (often better in distributed environments)

-    * **``messaging``**: messaging systems, including Qpid, Apache MQ 
-    * **...**
-* **``systems``**: entities which are mainly created or managed by other systems, where Brooklyn
integrates with those (multi-machine) systems and is removed from the processes
-    * **``whirr``**:  ``base`` Whirr integration, and entities built on Whirr such as the
configurable ``hadoop`` deployment
+    * **``messaging``**: messaging systems, including Qpid, Apache MQ, RabbitMQ 
+    * **``monitoring``**: monitoring tools, including Monit
+    * **``osgi``**: OSGi servers 
     * **...**
+* **``utils``**: projects which lower level utilities
+    * **common**: Utility classes and methods developed for Brooklyn but not dependendent
on Brooklyn
+    * **groovy**: Groovy extensions and utility classes and methods developed for Brooklyn
but not dependendent on Brooklyn
+    * **jmx/jmxmp-ssl-agent**: An agent implementation that can be attached to a Java process,
to give expose secure JMXMP
+    * **jmx/jmxrmi-agent**: An agent implementation that can be attached to a Java process,
to give expose JMX-RMI without requiring all high-number ports to be open
+    * **rest-swagger**: Swagger REST API utility classes and methods developed for Brooklyn
but not dependendent on Brooklyn
+    * **test-support**: Test utility classes and methods developed for Brooklyn but not dependendent
on Brooklyn
 * **``usage``**: projects which make Brooklyn easier to use, either for end-users or Brooklyn
developers
-    * **all**: maven project to supply a shaded JAR (containing all dependencies) for convenience

+    * **all**: maven project to supply a shaded JAR (containing all dependencies) for convenience
+    * **archetypes**: A maven archetype, for easily generating the structure of a new downstream
projects 
+    * **camp**: Brooklyn bindings for the CAMP REST API
     * **cli**: backing implementation for Brooklyn's command line interface
     * **dist**: builds brooklyn as a downloadable .zip and .tar.gz
     * **jsgui**: Javascript web-app for the brooklyn management web console (builds a WAR)
     * **launcher**: for launching brooklyn, either using a main method or invoked from the
cli project
-    * **qa**: longevity and stress tests
-    * **rest**: implementation of brooklyn's REST api 
+    * **logback-includes**: Various helpful logback XML files that can be included; does
not contain logback.xml 
+    * **logback-xml**: Contains a logback.xml that references the include files in brooklyn-logback-includes
+    * **rest-api**: The API classes for the Brooklyn REST api
+    * **rest-client**: A client Java implementation for using the Brooklyn REST API 
+    * **rest-server**: The server-side implementation of the Brooklyn REST API
     * **scripts**: various scripts useful for building, updating, etc. (see comments in the
scripts)
-    * **test-support**: provides support for tests, used by nearly all projects in scope
``test`` 
+    * **qa**: longevity and stress tests
+    * **test-support**: provides Brooklyn-specific support for tests, used by nearly all
projects in scope ``test``
 * **``docs``**: the markdown source code for this documentation, as described [here]({{site.url}}/dev/tips/update-docs.html)
 * **``examples``**: some canonical examples, as listed [here]({{site.url}}/use/examples)
 * **``sandbox``**: various projects, entities, and policies which the Brooklyn Project is
incubating
@@ -72,8 +87,8 @@ If you're interested in building and editing the code, check out:
 
 If you want to start writing your own policies and entities, have a look at:
 
-* [Writing a Brooklyn Policy](policy.html)
 * [Writing a Brooklyn Entity](entity.html)
+* [Writing a Brooklyn Policy](policy.html)
 * Or see the [User Guide]({{ site.url }}/use/guide/index.html) 
   on [policies]({{ site.url }}/use/guide/policies/index.html)
   and [entities]({{ site.url }}/use/guide/entities/index.html)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/dev/toc.json
----------------------------------------------------------------------
diff --git a/docs/dev/toc.json b/docs/dev/toc.json
index cc10ebf..f22e840 100644
--- a/docs/dev/toc.json
+++ b/docs/dev/toc.json
@@ -11,8 +11,6 @@
   "file": "{{ site.url }}/dev/tips/index.html",
   "exclude": true,
   "children": {% readj ./tips/toc.json %} },
-{ "title": "Wishlist",
-  "file": "{{ site.url }}/dev/wishlist.html" },
 { "title": "Links",
   "file": "{{ site.url }}/dev/links.html",
   "children": [

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/dev/wishlist.md
----------------------------------------------------------------------
diff --git a/docs/dev/wishlist.md b/docs/dev/wishlist.md
deleted file mode 100644
index 0b67989..0000000
--- a/docs/dev/wishlist.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: page
-title: Wishlist
-toc: /toc.json
----
-
-This page records some of the additions planned and requested
-(approximately a roadmap).
-If you're interested in helping, scan the [issues list](https://github.com/brooklyncentral/brooklyn/issues)
-on Github for anything related,
-email the list, and get started!
-
-## Entities
-
-* WebApp PaaS:  CloudFoundry, AWS Elastic Beanstalk, Google AppEngine (OpenShift a good starting
point)
-* Non-Java webapps:  PHP, Rails, Node.js, perl
-* CDN:  AWS Cloudfront, Akamai, others
-* Data:  _lots!_, including MySQL, Mongo, Couch, etc (look at building on Whirr support,
like Hadoop does!)
-* More monitoring and provisioning:  Nagios, Zenoss, Cacti etc; Juju for deployment; possibly
direct Puppet or Chef integration (although Whirr integration is quite powerful) 
-
-## Features
-
-* REST API for deploying, viewing, and managing, including application definitions in JSON/XML
(and support for dependent configuration)
-* Distributed management plane
-* At-Rest serialization of state (likely piggy-backing on JSON/XML and datagrid support)
 
-* Bind to existing entities on restart
-* Extract data from entities that are being stopped, to restore on restart (could extend
MySQL example to do this)
-* Windows:  support running from windows (untested); work on installation _to_ Windows servers

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5e0fd8c/docs/use/guide/extras/index.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/extras/index.md b/docs/use/guide/extras/index.md
index 7988046..fc194c7 100644
--- a/docs/use/guide/extras/index.md
+++ b/docs/use/guide/extras/index.md
@@ -7,9 +7,7 @@ categories: [use, guide]
 
 brooklyn comes bundled with support for a large number of systems and entities.
 
-*In this pre-release version not all entities are fully functional and that the documentation
is incomplete.*
-
-*Please contact the Brooklyn Project for assistance and clarification.*
+*Some entities are in an early-access state, and documentation is incomplete. Please contact
the Brooklyn Project for assistance and clarification.*
 <!---
 .. TODO fix
 .. TODO name entities
@@ -23,8 +21,8 @@ Web
 ### Clusters and Interfaces
 
 The class ``ControlledDynamicWebAppCluster`` creates a load-balanced cluster of web servers.
-It defaults to Nginx and JBoss 7, but this is configurable with the ``controller`` and 
-either the ``factory`` or ``memberSpec`` configuration options.
+It defaults to Nginx and JBoss 7, but this is configurable with the ``controller`` or ``controllerSpec``,
and 
+the ``memberSpec`` configuration options.
 
 Most web app server processes, and some clusters and PaaS implementations,
 support the interface ``WebAppService`` which defines many sensors including requests per
second.
@@ -93,10 +91,13 @@ Redis is a distributed key-value store, supporting master/slave replication
of a
 a series of read-only slaves and a single read-write master, which propagates to the slaves
with eventual consistency.
 
 
-### Infinispan
+### MongoDB
+
+
+### Cassandra
 
-Infinispan is a distributed in-memory datagrid.
 
+### CouchBase
 
 
 <a name="messaging"></a>
@@ -115,15 +116,45 @@ See ``QpidSetup`` for instantiating a broker.
 ActiveMQ support provides a JMS broker. This exposes JMS queues and topics as entities as
well. See ``ActiveMQSetup`` for
 instantiating a broker.
 
+### RabbitMQ
 
 
-<a name="provisioning"></a>
-Provisioning
----------
+<a name="downstream-projects"></a>
+Downstream Projects
+-------------------
+
+Downstream projects include those below.
 
 ### Apache Whirr
 
+https://github.com/brooklyncentral/brooklyn-whirr
 
 Whirr allows running a variety of services on cloud providers and on localhost. This is done
by providing a ``recipe`` which describes what services to launch. You can find an example
of how Brooklyn integrates with Whirr [here](/use/examples/whirrhadoop/index.html#custom-whirr-recipe).
 
+### OpenShift
+
+https://github.com/cloudsoft/brooklyn-openshift
+
+### CloudFoundry
+
+https://github.com/cloudsoft/brooklyn-cloudfoundry and https://github.com/cloudsoft/brooklyn-cloudfoundry
+
+### MPI
+
+https://github.com/cloudsoft/brooklyn-openmpi
+
+### Waratek
+
+https://github.com/cloudsoft/brooklyn-waratek
+
+### MapR
+
+https://github.com/cloudsoft/brooklyn-mapr
+
+### Cloudera CDH
+
+https://github.com/cloudsoft/brooklyn-cdh
+
+### Drupal and Wordpress
 
+https://github.com/cloudsoft/brooklyn-social-apps


Mime
View raw message