Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/oK/PlannedGridMeasures/mics-backend into DEVELOP_BE
diff --git a/get_started.txt b/deploy/get_started.txt
similarity index 100%
rename from get_started.txt
rename to deploy/get_started.txt
diff --git a/src/main/asciidoc/howto/howtoBuild.adoc b/src/main/asciidoc/howto/howtoBuild.adoc
index d4a354f..bdf60a7 100644
--- a/src/main/asciidoc/howto/howtoBuild.adoc
+++ b/src/main/asciidoc/howto/howtoBuild.adoc
@@ -31,7 +31,7 @@
=== Install Graphviz
Graphviz is open source graph visualization software. You need this software because of auto-generated graphics in the documentations.
-* Download and install Graphviz from http://www.graphviz.org/Download_windows.php
+* Download and install Graphviz from https://graphviz.gitlab.io/_pages/Download/Download_windows.html
* If not, set the PATH variable
Name of variable: GRAPHVIZ_DOT
@@ -47,7 +47,7 @@
* Download Node.js 6.10.3 from https://nodejs.org/download/release/v6.10.3/ by clicking on a xxx.msi image for windows.
* Run the downloaded Node.js .msi Installer - including accepting the license, selecting the destination, and authenticating for the install.
This requires Administrator privileges, and you may need to authenticate
-* To ensure Node.js has been installed, run the following in your terminal - you should get something like v6.10.0
+* To ensure Node.js has been installed, run the following in your terminal which should show you the installed version. (For example: v6.10.0)
[source,command]
----
@@ -56,7 +56,7 @@
{blank}
=== Update the npm Angular-CLI client
-This package manager comes bundled with Node.js and its good to have the latest version.
+This package manager comes bundled with Node.js and it is good to have the latest version.
* Open a command line and navigate to the root folder of the frontend project
* Run the following commands (the version is defined in the package.json file):
diff --git a/src/main/asciidoc/howto/howtoRun.adoc b/src/main/asciidoc/howto/howtoRun.adoc
index ad2235d..ca98764 100644
--- a/src/main/asciidoc/howto/howtoRun.adoc
+++ b/src/main/asciidoc/howto/howtoRun.adoc
@@ -45,7 +45,7 @@
b. Dont forget to save it.
-TIP: For more informations check *Deployment View* Chapter in *http://87.128.212.254:8880/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
+TIP: For more informations check *Deployment View* Chapter in *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
** Tomcat also needs the database driver to be placed in `<tomcat>/lib`. Find it in the project file `deploy/lib/`*postgresql-xxx.jar*.
@@ -65,7 +65,7 @@
TIP: It is recommend to install a service for starting and stopping the PostgreSQL database.
-TIP: For detailed instructions look at *http://87.128.212.254:8880/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
+TIP: For detailed instructions look at *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
== How to deploy and run the Backend
To run the backend you need to have installed and configured Apache Tomcat (look at *Install and Configure Apache Tomcat*).
@@ -82,7 +82,7 @@
Tomcat needs the Web Application Archive (war) file. Get it from a successfully maven build or via zip from a Jenkins source.
1. Copy the *mics-home-service.war* file from the `/target` folder of
-project "MicsHomeService" (zip or maven-build) in the `<tomcat>/webapps` file.
+project "MicsHomeService" (zip or maven-build) to the `<tomcat>/webapps` folder.
If there is already a folder named *mics-home-service* you have to delete it.
2. Navigate to your `apache-tomcat-8.5.24\bin` folder and start Tomcat by clicking on *startup.bat* (Windows) or executing *startup.sh* (Linux).
* Tomcat's default port is *8080*.
@@ -307,7 +307,7 @@
TIP: It is recommend to install this execution as a service.
-TIP: Look at the *http://87.128.212.254:8880/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]* for informations about the services.
+TIP: Look at the *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]* for informations about the services.
== How to deploy and run the Frontend
Go to `<tomcat>/webapps` folder, if there is already a folder named *plannedGridMeasures* delete it.
