Skip to content

Commit 6ac9f36

Browse files
HilbrandConfectrician
authored andcommitted
Changed related to rename of openHAB2-addons (openhab#1114)
* Renamed references of openhab2-addons to openhab-addons Signed-off-by: Hilbrand Bouwkamp <[email protected]> * Removed legacy ide description Signed-off-by: Hilbrand Bouwkamp <[email protected]> * Fixed links to installing ide Signed-off-by: Hilbrand Bouwkamp <[email protected]>
1 parent e23bd28 commit 6ac9f36

File tree

15 files changed

+25
-353
lines changed

15 files changed

+25
-353
lines changed

.vuepress/process_file.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def process_file(indir, file, outdir, source)
7373
puts " (add-on is from ESH)"
7474
source = "https://github.com/eclipse/smarthome/blob/master/extensions/#{addon_type}/org.eclipse.smarthome.#{addon_type}.#{addon}/README.md"
7575
elsif !(file =~ /things/) then
76-
puts " (add-on is from openhab2-addons)"
77-
source = "https://github.com/openhab/openhab2-addons/blob/master/addons/#{addon_type}/org.openhab.#{addon_type}.#{addon}/README.md"
76+
puts " (add-on is from openhab-addons)"
77+
source = "https://github.com/openhab/openhab-addons/blob/master/addons/#{addon_type}/org.openhab.#{addon_type}.#{addon}/README.md"
7878
end
7979

8080
out.puts "source: #{source}" if source != ""

.vuepress/process_main_docs.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ def process_main_docs(docs_source_dir)
142142

143143
puts " -> images"
144144
FileUtils.cp_r("#{docs_source_dir}/developers/bindings/images", "docs/developer/bindings/images")
145-
FileUtils.cp_r("#{docs_source_dir}/developers/legacy/images", "docs/developer/legacy/images")
146145
FileUtils.cp_r("#{docs_source_dir}/developers/osgi/images", "docs/developer/osgi/images")
147146
FileUtils.cp_r("#{docs_source_dir}/developers/ide/images", "docs/developer/ide/images")
148147

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can read a bit more below about our external ressources and how we get them.
4949
### Automatically Generated Parts
5050

5151
Those parts include __all__ add-on documentation files, no matter if they are from the `openhab-core` repo, the
52-
`openhab1-addons` repo, the `openhab2-addons` repo or any special binding repo like *habmin*, *zwave* or the *alexa skill*.
52+
`openhab1-addons` repo, the `openhab-addons` repo or any special binding repo like *habmin*, *zwave* or the *alexa skill*.
5353

5454
We are keeping all those files at their original location, because it simply doesn't make sense to keep them here.
5555
Imagine you want to do an improvement of the zwave binding and have to update the readme file in a completely different place.

developers/bindings/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -877,11 +877,11 @@ Various binding related questions are answered in our [Binding development FAQ](
877877

878878
Once you are happy with your implementation, you need to integrate it in the Maven build and add it to the official distro.
879879

880-
* Add a new line in the [bundle pom.xml](https://github.com/openhab/openhab2-addons/blob/master/bundles/pom.xml).
881-
* Add a new line in the [binding pom.xml](https://github.com/openhab/openhab2-addons/blob/master/bom/openhab-addons/pom.xml).
880+
* Add a new line in the [bundle pom.xml](https://github.com/openhab/openhab-addons/blob/master/bundles/pom.xml).
881+
* Add a new line in the [binding pom.xml](https://github.com/openhab/openhab-addons/blob/master/bom/openhab-addons/pom.xml).
882882
* If you have a dependency on a transport bundle (e.g. upnp, mdns or serial) or an external library,
883883
make sure to add a line for this dependency in the `/src/main/feature/feature.xml` file in your binding folder. See the other bindings as an example.
884-
* Add your binding to the [CODEOWNERS](https://github.com/openhab/openhab2-addons/blob/master/CODEOWNERS) file so that you get notified by Github when someone adds a pull request towards your binding.
884+
* Add your binding to the [CODEOWNERS](https://github.com/openhab/openhab-addons/blob/master/CODEOWNERS) file so that you get notified by Github when someone adds a pull request towards your binding.
885885

886886
> Please make sure you add the above entries at their alphabetically correct position!
887887

developers/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ title: Contribution
1212
The main parts of openHAB can be found in the following repositories:
1313

1414
* [openHAB Core](https://github.com/openhab/openhab-core): This repo contains the core framework bundles of which the openHAB runtime is constructed.
15-
* [openHAB 2 Add-ons](https://github.com/openhab/openhab2-addons): Add-ons (such as bindings, voice services, etc.) of openHAB can be found within this repository. They cannot be used with an openHAB 1.x runtime, since they provide features that the old runtime does not support.
15+
* [openHAB Add-ons](https://github.com/openhab/openhab-addons): Add-ons (such as bindings, voice services, etc.) of openHAB can be found within this repository. They cannot be used with an openHAB 1.x runtime, since they provide features that the old runtime does not support.
1616
* [openHAB 1 Add-ons](https://github.com/openhab/openhab1-addons): Legacy add-ons that were developed for openHAB 1. Most of them are working smoothly on the openHAB 2 runtime and thus they are made available for backward compatibility reasons. They are not suggested for new users, though.
1717
* [openHAB Distro](https://github.com/openhab/openhab-distro): This repo contains all parts that are required for assembling the binary distribution of openHAB.
1818

developers/guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Code styles files are located in here: https://github.com/openhab/static-code-an
6969

7070
The rules are defined using the Eclipse Java Formatter definitions. There are plugins available for several IDEs that support these definitons.
7171

72-
* Official [openHAB Eclipse IDE setup](ide.html) is preconfigured
72+
* Official [openHAB Eclipse IDE setup](ide/eclipse.html) is preconfigured
7373
* Eclipse standalone installation
7474
- You can manually import [openhab_codestyle.xml](https://raw.githubusercontent.com/openhab/static-code-analysis/master/codestyle/src/main/resources/openhab_codestyle.xml) via `Eclipse Preferences -> Java -> Code Style -> Formatter` and [openhab.importorder](https://raw.githubusercontent.com/openhab/static-code-analysis/master/codestyle/src/main/resources/openhab.importorder) via `Eclipse Preferences -> Java -> Code Style -> Organize Imports`
7575
* IntelliJ using plugin https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter

developers/ide/eclipse.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ This guide describes the steps to setup Eclipse and how to debug an add-on in Ec
3131

3232
![select](./images/ide_setup_eclipse_3_select_ide.png)
3333

34-
1. Under `GitHub Projects > openHAB` select `openHAB Development` and any desired option from `openHAB Add-ons` (includes all add-ons from openhab2-addons repo), `openHAB ZigBee Binding` or `openHAB Z-Wave Binding`.
34+
1. Under `GitHub Projects > openHAB` select `openHAB Development` and any desired option from `openHAB Add-ons` (includes all add-ons from openhab-addons repo), `openHAB ZigBee Binding` or `openHAB Z-Wave Binding`.
3535

3636
![select projects](./images/ide_setup_eclipse_4_openhab.png)
3737

3838
| Selection | Install if |
3939
|-------------------------|---------------------------------------|
4040
| **openHAB Development** | **Debug/Demo Environment (Required)** |
41-
| openHAB Add-ons | Installs all openHAB 2 Add-ons |
41+
| openHAB Add-ons | Installs all openHAB Add-ons |
4242
| openHAB ZigBee Binding | ZigBee Binding Development |
4343
| openHAB Z-Wave Binding | Z-Wave Binding Development |
4444
| openHAB BACNet Binding | BACNet Binding Development |
4545
| openHAB Web UIs | Web UIs Development |
4646
| openHAB Core Framework | Core Framework Development |
4747

4848
::: warning Attention
49-
If you have selected `openHAB Add-ons` the installer will check out the [openHAB 2.x Add-ons](https://github.com/openhab/openhab2-addons/) repository and all add-on projects are imported in Eclipse.
49+
If you have selected `openHAB Add-ons` the installer will check out the [openHAB Add-ons](https://github.com/openhab/openhab-addons/) repository and all add-on projects are imported in Eclipse.
5050

5151
Select `OH2 Add-ons` and from right-click menu select "Close Projects": *this significantly speeds up the setup*.
5252
Re-open only the binding project(s) you would like to work on.
5353

54-
If you want to develop a new binding or a specific binding it is recommended to clone your own fork of [openHAB 2.x Add-ons](https://github.com/openhab/openhab2-addons/) and import only the projects you work on.
54+
If you want to develop a new binding or a specific binding it is recommended to clone your own fork of [openHAB Add-ons](https://github.com/openhab/openhab-addons/) and import only the projects you work on.
5555
:::
5656

5757

@@ -77,7 +77,7 @@ This guide describes the steps to setup Eclipse and how to debug an add-on in Ec
7777
:::
7878

7979
Setup tasks will personalize the IDE with openHAB code formatting tools, configurations and a demo app.
80-
Setup tasks will also download openHAB latest projects you have selected during installation. Like `openhab-distro` and the add-ons `openhab2-addons` project if you have selected it.
80+
Setup tasks will also download openHAB latest projects you have selected during installation. Like `openhab-distro` and the add-ons `openhab-addons` project if you have selected it.
8181

8282
Click bottom right button in the IDE for Progress.
8383

developers/ide/vscode.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The following steps will only need to be done once to setup both VSCode and your
1313

1414
1. Install Java Extension Pack for VSCode (https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack)
1515

16-
2. Clone the addons (https://github.com/openhab/openhab2-addons.git or preferably your own fork) to %BASE%\openhab2-addons
16+
2. Clone the addons (https://github.com/openhab/openhab-addons.git or preferably your own fork) to %BASE%\openhab-addons
1717

1818
3. If you want to setup openHAB code formatting guidelines, add the following to the VSCode settings:
1919

@@ -28,17 +28,17 @@ The following steps will only need to be done once to setup both VSCode and your
2828
The following steps will show you how to setup a specific bundle for development with VSCode. These steps will show how to setup the Russound bundle but are generic to any bundle in the system.
2929

3030
1. Ensure the bundle builds correctly (natively with maven)
31-
1. Open console to the bundle location (example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound`)
31+
1. Open console to the bundle location (example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound`)
3232
2. `mvn clean install -DskipChecks` in the console to build the bundle
33-
3. Should produce a jar file in the 'target' directory of the bundle(example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound\target\org.openhab.binding.russound-2.5.0-SNAPSHOT.jar`)
33+
3. Should produce a jar file in the 'target' directory of the bundle(example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound\target\org.openhab.binding.russound-2.5.0-SNAPSHOT.jar`)
3434

35-
2. Open VSCode and then open the folder of the bundle. From VSCode - use `File->Open Folder->choose bundle directory` (example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound`)
35+
2. Open VSCode and then open the folder of the bundle. From VSCode - use `File->Open Folder->choose bundle directory` (example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound`)
3636

37-
3. Create a ".vscode" directory under the bundle (example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound\.vscode`)
37+
3. Create a ".vscode" directory under the bundle (example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound\.vscode`)
3838

3939
![define .vscode](images/ide_setup_vscode_folder.png)
4040

41-
4. Download [tasks.json](https://raw.githubusercontent.com/openhab/openhab-docs/master/developers/ide/examples/vscode/tasks.json) to the .vscode directory (example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound\.vscode\tasks.json`)
41+
4. Download [tasks.json](https://raw.githubusercontent.com/openhab/openhab-docs/master/developers/ide/examples/vscode/tasks.json) to the .vscode directory (example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound\.vscode\tasks.json`)
4242

4343
![define tasks.json](./images/ide_setup_vscode_folder_tasks.png)
4444

@@ -55,7 +55,7 @@ The following steps will show you how to setup a specific bundle for development
5555
7. Start the openHAB instance with the debug option - `start.bat debug` from a console in the openHAB home directory. You should see the following line printed somewhere in the karaf console:
5656
`Listening for transport dt_socket at address: xxxx` (where xxxx should be 5005)
5757

58-
8. Download [launch.json](https://raw.githubusercontent.com/openhab/openhab-docs/master/developers/ide/examples/vscode/launch.json) to the .vscode directory (example: `%BASE%\openhab2-addons\bundles\org.openhab.binding.russound\.vscode\launch.json`)
58+
8. Download [launch.json](https://raw.githubusercontent.com/openhab/openhab-docs/master/developers/ide/examples/vscode/launch.json) to the .vscode directory (example: `%BASE%\openhab-addons\bundles\org.openhab.binding.russound\.vscode\launch.json`)
5959

6060
![define launch.json](./images/ide_setup_vscode_folder_launch.png)
6161

@@ -83,7 +83,7 @@ You can now make changes, set breakpoints, etc.
8383

8484
1. May take openHAB a few seconds to realize there is a new bundle and to reinitilize it after it's been copied. Be a little bit patient.
8585
2. You must run the `mvn Compile (Online)` task atleast once to allow the offline compile to occur. You should use the `mvn Compile (Offline)` task for most of your development as it's quicker since it uses the cache files. When you are ready to commit (or release a test bundle) - you should run the `mvn Compile (Release)` task to include code checks (and resolve them).
86-
3. Win10+ allows forward slashes as part of it's path. If you use backward slashes instead - you will need to double up on them since tasks.json uses a backward slash as a delimiter. Example: `c:\\\\openhab2`
86+
3. Win10+ allows forward slashes as part of it's path. If you use backward slashes instead - you will need to double up on them since tasks.json uses a backward slash as a delimiter. Example: `c:\\\\openhab`
8787

8888
## Tasks
8989

developers/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Not sure what to choose?: openHAB maintainers use [Eclipse IDE](https://wiki.ecl
8181
To start developing a new binding a script is available to generate the basis for your new binding.
8282
This script is specific for binding addons. Follow these steps to generate your binding:
8383

84-
1. From the command line in `openhab2-addons/bundles` directory to create a skeleton of a new binding `mynewbinding` run:
84+
1. From the command line in `openhab-addons/bundles` directory to create a skeleton of a new binding `mynewbinding` run:
8585

8686
On Linux:
8787
```
@@ -97,14 +97,14 @@ This script is specific for binding addons. Follow these steps to generate your
9797
9898
1. Accept with `Y` when the skeleton configuration asks for it.
9999
100-
1. From `openhab2-addons` root you can build only your binding with maven using the `-pl` option:
100+
1. From `openhab-addons` root you can build only your binding with maven using the `-pl` option:
101101
```
102102
mvn clean install -pl :org.openhab.binding.mynewbinding
103103
```
104104
Where `mynewbinding` is the name of your new binding.
105105
Some additional maven options that may help:
106106
* `-U`: Forces all dependencies to be downloaded again.
107-
* `-am`: Builds all projects in openhab2-addons your project dependends on.
107+
* `-am`: Builds all projects in openhab-addons your project dependends on.
108108
* `-o`: Won't update any dependencies.
109109
* `-DskipChecks`: Skips the static analysis checks
110110
* `-DskipTests`: Skips the unit tests

developers/legacy/compatibilitylayer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Test a not included add-on is very straight forward:
2626

2727
All developers are encouraged to help on this in order to quickly make as many 1.x add-ons compatible with the openHAB 2 runtime as possible.
2828
Here is what you need to do:
29-
- Setup a the [openHAB 2 IDE](../development/ide.html).
29+
- Setup a the [openHAB 2 IDE](../#setup-the-development-environment).
3030
- Import your 1.x add-on from your local openHAB 1 git clone into your workspace.
3131
- If it compiles, the first major step is already done. If not, try to figure out why there are compilation problems and if you cannot solve them, ask on the mailing list for help.
3232
- After adding some configuration, start up the runtime through the launch configuration (make sure your bundle is activated and started by default) from within the IDE.

0 commit comments

Comments
 (0)