add new oomph setup links

- incorporate our new oomph setups and p2 repo links
- some restructering of Installation and developer guide (more important topics higher up, less important to bottom of page)

Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>

Author: chrisrueger

development.md

@@ -8,22 +8,24 @@ author: Neil Bartlett
 
 ## Building Bndtools
 
-Bndtools is built with Bndtools! If you want to work on the bndtools source code, you have two options:
+Bndtools is built with Bndtools! If you want to work on the bndtools source code, you have three options:
 
 * Install the current public release of bndtools from the [Eclipse Marketplace][2] and start working straight away.
 * Build Bndtools from the command line, then install the build results into your Eclipse IDE.
+* or install one of the pre-configured [development setups](#development-setups) 
 
-## Checking Out from GitHub
+
+### Checking Out from GitHub
 
 First check out the source code from GitHub as follows:
 
 	git clone git://github.com/bndtools/bnd.git
 
 If you have Bndtools installed in your Eclipse IDE already (e.g. using Marketplace) then skip to **Importing Into Eclipse** below. Otherwise read on...
 
-## Building from the command-line
+### Building from the command-line
 
-Read the document `BUILDING-GRADLE.md` to learn how the build works.
+Read the document [Contribution to Bnd/Bndtools](https://github.com/bndtools/bnd/blob/master/CONTRIBUTING.md#build-environment) to learn how the build works.
 
 Assuming you have Gradle (version 1.11 or better) installed, you can build bndtools from the command line by changing to the root of your checkout and typing:
 
@@ -35,7 +37,7 @@ To install from the generated Update Sites, open the Help menu in Eclipse and se
 
 Back in the update dialog, Bndtools will appear in the category list. Place a check next to it and click Next. Drive the rest of the wizard to completion... congratulations, you have just built and installed bndtools!
 
-## Importing Into Eclipse
+### Importing Into Eclipse
 
 Now you have Bndtools installed in your Eclipse IDE, you can import the bndtools projects into Eclipse to begin working on the source code.
 
@@ -49,6 +51,15 @@ Click "Finish"... Eclipse will start to import and build the projects. **If you
 
 You should now have all the bndtools projects in your workspace, ready to begin hacking!
 
+## Development Setups
+
+We also provide pre-configured setups using Eclipse oomph installer, which help you getting started quickly. 
+This way you get a dedicated Eclipse instance with pre-installed bndtools source code with a simple one-click installer.
+
+Find our different setups and P2 Repositories at:
+<https://bndtools.org/bndtools.p2.repo/>
+
+
 ## Launching Bndtools from Eclipse
 
 To launch bndtools from Eclipse (e.g. to try out a change to debug), use one of the `.bndrun` files from the `bndtools.core` project. There are three launchers, one per architecture, i.e.:

installation.md

@@ -3,43 +3,58 @@ title: Install Bndtools 7.0.0
 ---
 
 
-You can install Bndtools via the [Marketplace](#marketplace) or directly install from the [Update Site](#update-site)
+# Install Bndtools 7.0.0
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/Ry6XNGm7C-k" frameborder="1" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+There are different flavors you can install Bndtools.
 
-To get then started with the [bndtools Workspace model](workspace.html), you can follow some videos that can get you started.
+## Users: If you just want to use Bndtools for your own projects
 
-## Enhancements
+- via the [Eclipse Marketplace](#marketplace)
+- or directly install into Eclipse from the [Update Site](#update-site) 
 
-* Bndtools is built to run on Eclipse 2020-06 or later. So Bndtools 7.0.0 may not run on older versions of Eclipse.
+## Developers: If you want to contribute to bndtools
 
-For more complete information on the changes in the Bndtools release, see <https://github.com/bndtools/bnd/wiki#release-notes>.
+- Setup source code into your existing Eclipse installation. See our [Bndtools Developer Guide](/development.html)
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/Ry6XNGm7C-k" frameborder="1" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+To get then started with the [bndtools Workspace model](workspace.html), you can follow some videos that can get you started.
 
-## Known Issues
 
-* This release is based on Java 17. This tends to be not noticed for developmet but there are a number of runtime bundles in the distribution that now also have become Java 17 code. This could generate the error during a bndrun launch or with bnd/OSGi testing when the Execution Environment is set to < 17. The easy fix is to set this to 17. If this is impossible, the previous launchers than run on 1.8 can then be used (if they are available in the repositories). Add
-```
--runpath \
-    biz.aQute.launcher;version="[6.4.0,7)", \
-    biz.aQute.tester.junit-platform;version="[6.4.0,7)"
-```
 ## Marketplace
 
 The recommended way to install Bndtools via the [Eclipse Marketplace](https://marketplace.eclipse.org/content/bndtools).
 
-<a href="https://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1220" class="drag" title="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client"><img typeof="foaf:Image" class="img-responsive" src="https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png" alt="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client" /></a>
+<a href="https://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1220" class="drag" title="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client">
+<img style="width:80px;" typeof="foaf:Image" class="img-responsive" src="https://marketplace.eclipse.org/modules/custom/eclipsefdn/eclipsefdn_marketplace/images/btn-install.svg" alt="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client" />
+</a>
 
 ## Update Site
 
 * From the Help menu select `Install New Software...` 
 * When the dialog opens, click the `Add...` button near the top-right.
-* In the Name field enter `Bndtools`. In the Location field enter one of the the following URLs
+* In the Name field enter `Bndtools`. In the Location field enter one of the the following P2 Repository URLs
 
-| Type                       |URL                                                    |
-|----------------------------|-------------------------------------------------------|
-| Latest stable release      | https://bndtools.jfrog.io/bndtools/update-latest      |
-| Latest release candidate   | https://bndtools.jfrog.io/bndtools/update-rc          |
-| Latest build snapshot      | https://bndtools.jfrog.io/bndtools/update-snapshot    |
+| Type                       |URL                                                    |alt. URL|
+|----------------------------|-------------------------------------------------------|--|
+| Latest stable release      | `https://bndtools.org/bndtools.p2.repo/7.0.0/`       | via [jfrog](https://bndtools.jfrog.io/bndtools/update-latest)  |
+| Latest release candidate   | `https://bndtools.jfrog.io/bndtools/update-rc`          ||
+| Latest build snapshot      | `https://bndtools.jfrog.io/bndtools/update-snapshot`    ||
 
 * Press `Next` and then `Finish`, acknowledging the licenses
 
+## Release Notes
+
+For more complete information on the changes in the Bndtools release, see <https://github.com/bndtools/bnd/wiki#release-notes>.
+
+
+## Known Issues
+
+* Bndtools is built to run on Eclipse 2020-06 or later. So Bndtools 7.0.0 may not run on older versions of Eclipse.
+
+* This release is based on Java 17. This tends to be not noticed for developmet but there are a number of runtime bundles in the distribution that now also have become Java 17 code. This could generate the error during a bndrun launch or with bnd/OSGi testing when the Execution Environment is set to < 17. The easy fix is to set this to 17. If this is impossible, the previous launchers than run on 1.8 can then be used (if they are available in the repositories). Add
+```
+-runpath \
+    biz.aQute.launcher;version="[6.4.0,7)", \
+    biz.aQute.tester.junit-platform;version="[6.4.0,7)"
+```