From 612a26ccf6c7b1c973e14045d6d3b74732a47ed9 Mon Sep 17 00:00:00 2001 From: Tomasz Bialecki Date: Wed, 28 Jan 2015 13:55:03 +0100 Subject: [PATCH 01/14] sync problem fixed, missing dependencies fixed --- gulp/oasp/oasp-config.json | 2 +- gulp/server.js | 3 ++- package.json | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gulp/oasp/oasp-config.json b/gulp/oasp/oasp-config.json index 73db79f..51dd9e8 100644 --- a/gulp/oasp/oasp-config.json +++ b/gulp/oasp/oasp-config.json @@ -12,7 +12,7 @@ "oasp/oasp-i18n" ], "appBuild": false, - "releaseRepo": "https://github.com/oasp/oasp4js.git", + "releaseRepo": "https://github.com/oasp/oasp4js-bower.git", "buildLibName": "oasp/oasp.js", "buildLibMinName": "oasp/oasp.min.js" } diff --git a/gulp/server.js b/gulp/server.js index 39919e4..b39f21d 100644 --- a/gulp/server.js +++ b/gulp/server.js @@ -5,6 +5,7 @@ var gulp = require('gulp'); var browserSync = require('browser-sync'); var middleware = require('./proxy'); var _ = require('lodash'); +var gulpsync = require('gulp-sync')(gulp); function browserSyncInit(baseDir, files, browser) { browser = browser === undefined ? 'default' : browser; @@ -20,7 +21,7 @@ function browserSyncInit(baseDir, files, browser) { }); } -gulp.task('serve', ['build', 'watch'], function () { +gulp.task('serve', gulpsync.sync(['build', 'watch']), function () { browserSyncInit([ config.app.tmp(), config.app.src(), diff --git a/package.json b/package.json index b47874c..57304e3 100644 --- a/package.json +++ b/package.json @@ -47,9 +47,11 @@ "karma-jasmine": "~0.3.1", "karma-junit-reporter": "~0.2.2", "karma-phantomjs-launcher": "~0.1.4", + "lodash": "^3.0.0", "main-bower-files": "~2.4.0", "protractor": "~1.4.0", "require-dir": "~0.1.0", + "string": "^3.0.0", "through2": "~0.4.1", "uglify-save-license": "~0.4.1", "wiredep": "~2.2.0", From ad2798e3a9fa5c91d8c77faea2958744b55afde0 Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 07:53:48 +0100 Subject: [PATCH 02/14] Update README.md - release preparation --- README.md | 69 +++++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index c66eebf..a98c3d9 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,11 @@ To get started you need to clone the oasp4j repository containing the server par Install prerequisites --- -You need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. -Also, for the server part you need Maven (required version: 3.x) and Tomcat (min. version: 7.x, recommended version: 8.x) to be installed. For installation details please refer to the [Tomcat's](http://tomcat.apache.org/download-80.cgi) and [Maven's](http://maven.apache.org/download.cgi) home pages. +There are two ways to get sample application working: eighter by getting OASP IDE and running it from there or without installing IDE. + +OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run sample application so only Git must be additionally installed. +If OASP IDE is not used additional software must be installed manually so you need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. +Also, for the server part you need Maven (required version: 3.x) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. Create the `` directory for the sample application --- @@ -38,60 +41,21 @@ cd oasp4j mvn clean install ``` -After a successful build, the `oasp4j-sample-server.war` file should appear in the following directory: +After a successful build go to the following directory ``` -\oasp4j\oasp4j-samples\oasp4j-sample-server\target - -``` - -Assuming you have installed the Tomcat in the `` directory, copy the 'oasp4j-sample-server.war' file to - -``` -\webapps -``` - -Edit the `\conf\tomcat-users.xml` file. Add the following roles and users to it: - -```xml - - - - - - -``` - - -Edit the `\conf\server.xml` file. Change the Tomcat port to 8081 (if you don't want to change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_): - -```xml - -``` +\oasp4j\oasp4j-samples\core -Set up the server part's configuration. Under `\lib` create the `config\env` directories: - -``` -cd \lib -mkdir config\env ``` +Start the oasp4j-samples-core project as spring boot application by running following command in your console: -Create the `application.properties` file, put it under `\lib\config\env` and add the following content to it: +``` +mvn spring-boot:run -```ini -database.user.login = sa -database.user.password = -database.url = jdbc:h2:~/restaurant-db;INIT=create schema if not exists public -database.migration.auto = true -database.migration.clean = true ``` -_Hint: The value of the `database.user.password` property should be left empty, exactly as shown above._ -Start the Tomcat: +By default tomcat server will use port 8081. This can be changed in application.properties file in \oasp4j\oasp4j-samples\core\src\main\resources\config. If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_): -``` -\bin\startup.bat -``` Set up the client part of the application --- @@ -100,6 +64,7 @@ Go back to the `` directory: ``` cd .. + ``` Clone the oasp4js repository: @@ -115,8 +80,16 @@ cd oasp4js npm install ``` +During npm install process bower downloads some libraries and uses git for it. Git defaults to the git protocol whose standard port (9418) is sometimes blocked by the company firewall. A solution for this problem is to configure Git to use the https instead of the git protocol with following command: + +``` +git config --global url."https://".insteadOf git:// +``` +and to rerund npm install command. + + -_**Hint about how to configure a different Tomcat's port to be used on the client side:** If you did not want to change the Tomcat's port to 8081 as [described here](#changeTomcatsPortInServerXml), then you have to change the default port which is configured in the client part of the application, in the `\oasp4js\config.json` file. You have to set the correct port number in the following line of the aforementioned configuration file (replace '8888' with the port number which you configured for your Tomcat):_ +_**Hint about how to configure a different Tomcat's port to be used on the client side:** If you changed the Tomcat's port as [described here](#changeTomcatsPortInServerXml), then you have to change the default port which is configured in the client part of the application, in the `\oasp4js\config.json` file. You have to set the correct port number in the following line of the aforementioned configuration file (replace '8888' with the port number which you configured for your Tomcat):_ ``` "proxy": "http://localhost:8888", From 7f97e0ad8d1ff1df7f32fa3d554b767c4af5e13e Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 08:10:44 +0100 Subject: [PATCH 03/14] Create CHANGELOG.md --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3ae8797 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ + +# 1.4.0 (2016-02-29) + +## Bug Fixes + +- error-log template not found ([#83](https://github.com/oasp/oasp4js/issues/83)) + +## Features +- Releasing OASP4JS with shrinkwrap ([#87](https://github.com/oasp/oasp4js/issues/87)) +- Security 401 unauthorized vs 403 forbidden ([#56](https://github.com/oasp/oasp4js/issues/56)) +- Error handling ([#54](https://github.com/oasp/oasp4js/issues/54)) +- Authorization (in the client) ([#53](https://github.com/oasp/oasp4js/issues/53)) +- Accessibility ([#52](https://github.com/oasp/oasp4js/issues/52)) +- Migration to ui-router ([#51](https://github.com/oasp/oasp4js/issues/51)) +- Validation ([#50](https://github.com/oasp/oasp4js/issues/50)) From 47174b721b8da7fcd7e92e6d079cfcf43908fdc7 Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 08:33:01 +0100 Subject: [PATCH 04/14] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ae8797..b501db1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ## Bug Fixes - error-log template not found ([#83](https://github.com/oasp/oasp4js/issues/83)) +- Technical architecture link is broken ([#44](https://github.com/oasp/oasp4js/issues/44)) ## Features - Releasing OASP4JS with shrinkwrap ([#87](https://github.com/oasp/oasp4js/issues/87)) @@ -13,3 +14,4 @@ - Accessibility ([#52](https://github.com/oasp/oasp4js/issues/52)) - Migration to ui-router ([#51](https://github.com/oasp/oasp4js/issues/51)) - Validation ([#50](https://github.com/oasp/oasp4js/issues/50)) +- Remove all calls to @Deprecated getAll methods on server ([#37](https://github.com/oasp/oasp4js/issues/37)) From bd9d64ca26f54c02e56ae838ca95759429a7486e Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 09:53:47 +0100 Subject: [PATCH 05/14] Update README.md --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a98c3d9..f517cea 100644 --- a/README.md +++ b/README.md @@ -44,17 +44,23 @@ mvn clean install After a successful build go to the following directory ``` -\oasp4j\oasp4j-samples\core +\oasp4j\oasp4j-samples\core\target ``` Start the oasp4j-samples-core project as spring boot application by running following command in your console: ``` -mvn spring-boot:run +java -jar oasp4j-sample-core-dev-SNAPSHOT.jar ``` -By default tomcat server will use port 8081. This can be changed in application.properties file in \oasp4j\oasp4j-samples\core\src\main\resources\config. If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_): +By default tomcat server will use port 8081. This can be changed by creating new application.properties file in \oasp4j\oasp4j-samples\core\target directory and adding following entry: + +``` +server.port=8888. +``` +Replace '8888' with the port number which you want to use for your Tomcat. +If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_): Set up the client part of the application From 7f66f98ef1d6ca15998cc59d9f827ac5df94373a Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 09:54:50 +0100 Subject: [PATCH 06/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f517cea..59f68dc 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ By default tomcat server will use port 8081. This can be changed by creating new server.port=8888. ``` Replace '8888' with the port number which you want to use for your Tomcat. -If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_): +If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_. Set up the client part of the application From d1abb3e2105b28fc7f33ac6daf082a7ff17838f2 Mon Sep 17 00:00:00 2001 From: Marek Matczak Date: Mon, 29 Feb 2016 10:56:46 +0100 Subject: [PATCH 07/14] Update README.md Minor changes --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 59f68dc..83e8fe4 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ mvn clean install After a successful build go to the following directory ``` -\oasp4j\oasp4j-samples\core\target +cd samples\core\target ``` Start the oasp4j-samples-core project as spring boot application by running following command in your console: @@ -66,12 +66,7 @@ If you change the Tomcat's port, then see the _[hint about how to configure a di Set up the client part of the application --- -Go back to the `` directory: - -``` -cd .. - -``` +We asume you are back in the `` directory. Clone the oasp4js repository: @@ -91,7 +86,7 @@ During npm install process bower downloads some libraries and uses git for it. G ``` git config --global url."https://".insteadOf git:// ``` -and to rerund npm install command. +and to rerun npm install command. From 3ba037d1bf9ded53b946a598bfdb22e0256fe0f0 Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Mon, 29 Feb 2016 11:40:01 +0100 Subject: [PATCH 08/14] Update README.md Additional software versions listed --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59f68dc..51873dc 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run If OASP IDE is not used additional software must be installed manually so you need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. Also, for the server part you need Maven (required version: 3.x) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. +Please note that this client version was tested with following versions of the additional software: +- node.js version 5.0.0 +- npm version 3.3.6 +- gulp version 3.9.1 +- bower version 1.7.7 + Create the `` directory for the sample application --- @@ -31,7 +37,7 @@ Set up the server part of the application Clone the oasp4j repository: ``` -git clone https://github.com/oasp/oasp4j.git +git clone --recursive https://github.com/oasp/oasp4j.git ``` Let Maven build the server part: From 19e68e74aa7cde485d55a2ecab8b0f77ec11843b Mon Sep 17 00:00:00 2001 From: Marek Matczak Date: Wed, 2 Mar 2016 10:03:07 +0100 Subject: [PATCH 09/14] typo --- gulp/oasp/oasp-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulp/oasp/oasp-config.json b/gulp/oasp/oasp-config.json index 486b447..b911786 100644 --- a/gulp/oasp/oasp-config.json +++ b/gulp/oasp/oasp-config.json @@ -13,5 +13,5 @@ "releaseRepo": "https://github.com/oasp/oasp4js-bower.git", "buildLibName": "oasp/oasp.js", "buildLibMinName": "oasp/oasp.min.js", - "libRegexp": "oasp/"" + "libRegexp": "oasp/" } From 57f2038e4fcb201fefd6e79565c3c6eca0a16471 Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Tue, 8 Mar 2016 08:11:00 +0100 Subject: [PATCH 10/14] Update README.md - release preparation --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 51873dc..015f73a 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,17 @@ Getting Started --- To get started you need to clone the oasp4j repository containing the server part, build and deploy it on a Tomcat server. To get started with the client part you need to clone the oasp4js repository, build the client and start it. +There are two ways to get sample application working: eighter by getting OASP IDE and running it from there or without installing IDE. -Install prerequisites +#Full OASP IDE installation --- -There are two ways to get sample application working: eighter by getting OASP IDE and running it from there or without installing IDE. +If you want to install full OASP IDE and get both server and client code please follow steps described in [oasp ide setup](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup). OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run sample application so only Git must be additionally installed. + +#Getting oasp4js client working +##Install prerequisites +--- -OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run sample application so only Git must be additionally installed. If OASP IDE is not used additional software must be installed manually so you need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. Also, for the server part you need Maven (required version: 3.x) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. @@ -97,7 +101,7 @@ During npm install process bower downloads some libraries and uses git for it. G ``` git config --global url."https://".insteadOf git:// ``` -and to rerund npm install command. +and to rerun npm install command. From 3b26305914b2885aacc46c3461ec25724e14ea47 Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Tue, 8 Mar 2016 08:19:40 +0100 Subject: [PATCH 11/14] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 015f73a..bf9cef6 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,11 @@ To get started you need to clone the oasp4j repository containing the server par There are two ways to get sample application working: eighter by getting OASP IDE and running it from there or without installing IDE. #Full OASP IDE installation ---- If you want to install full OASP IDE and get both server and client code please follow steps described in [oasp ide setup](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup). OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run sample application so only Git must be additionally installed. #Getting oasp4js client working ##Install prerequisites ---- If OASP IDE is not used additional software must be installed manually so you need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. Also, for the server part you need Maven (required version: 3.x) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. From 654bba5cbb81f576c4a72a0e85b22ffd722c6e3b Mon Sep 17 00:00:00 2001 From: jkokoszk Date: Tue, 8 Mar 2016 09:00:01 +0100 Subject: [PATCH 12/14] Update README.md --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bf9cef6..80ecb30 100644 --- a/README.md +++ b/README.md @@ -55,21 +55,25 @@ After a successful build go to the following directory \oasp4j\oasp4j-samples\core\target ``` -Start the oasp4j-samples-core project as spring boot application by running following command in your console: -``` -java -jar oasp4j-sample-core-dev-SNAPSHOT.jar +Configure port number which should be used by the tomcat server and context in which server application should be registered. +To do that create new application.properties file in \oasp4j\oasp4j-samples\core\target directory and add following entries: ``` +server.port=8888 +server.context-path=/oasp4j-sample-server -By default tomcat server will use port 8081. This can be changed by creating new application.properties file in \oasp4j\oasp4j-samples\core\target directory and adding following entry: - -``` -server.port=8888. ``` + Replace '8888' with the port number which you want to use for your Tomcat. -If you change the Tomcat's port, then see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_. +After that see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_. +Start the oasp4j-samples-core project as spring boot application by running following command in your console: + +``` +java -jar oasp4j-sample-core-dev-SNAPSHOT.jar + +``` Set up the client part of the application --- From 4a7585ce31a79f769350e3bf17b9c8c9fee1667e Mon Sep 17 00:00:00 2001 From: Marek Matczak Date: Wed, 9 Mar 2016 10:13:16 +0100 Subject: [PATCH 13/14] Update README.md Installation details updated --- README.md | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index afef406..eb70934 100644 --- a/README.md +++ b/README.md @@ -6,18 +6,17 @@ The sample application is built on top of the [application template](https://git Getting Started --- -To get started you need to clone the oasp4j repository containing the server part, build and deploy it on a Tomcat server. To get started with the client part you need to clone the oasp4js repository, build the client and start it. -There are two ways to get sample application working: eighter by getting OASP IDE and running it from there or without installing IDE. +To get started you need to clone both the `oasp4j` and `oasp4js` repositories containing the server and the client part respectively. Each of them is to be built and started to talk to each other it. There are two ways to get the sample application working: eithter by getting the [oasp IDE](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup) and running it from there or setting up the IDE manually. -#Full OASP IDE installation +#Full oasp IDE installation -If you want to install full OASP IDE and get both server and client code please follow steps described in [oasp ide setup](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup). OASP IDE already contains software (Node.js, Gulp, Bower, Maven) required to run sample application so only Git must be additionally installed. +If you want to install full OASP IDE and get both server and client code please follow steps described in [oasp IDE setup](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup). The `oasp IDE` already contains software (Node.js, Gulp, Bower, Maven) required to run the sample application; only Git has to be additionally installed. #Getting oasp4js client working ##Install prerequisites -If OASP IDE is not used additional software must be installed manually so you need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. -Also, for the server part you need Maven (required version: 3.x) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. +If the [oasp IDE setup](https://github.com/oasp/oasp4j/wiki/oasp-ide-setup) is not used, additional software has to be installed manually. You need a Git client to clone the repositories and the Node.js platform (including its package manager - npm) which allows Gulp and Bower to install the dependencies and build the application. [Here](https://github.com/oasp/oasp4js/wiki/Prerequisites) you can learn how to install the prerequisites. +Also, for the server part you need Maven (tested against the version: 3.3.9) to be installed. For installation details please refer to the [Maven's](http://maven.apache.org/download.cgi) home page. Please note that this client version was tested with following versions of the additional software: - node.js version 5.0.0 @@ -39,7 +38,7 @@ Set up the server part of the application Clone the oasp4j repository: ``` -git clone --recursive https://github.com/oasp/oasp4j.git +git clone --recursive https://github.com/oasp/oasp4j.git -b master ``` Let Maven build the server part: @@ -53,26 +52,19 @@ After a successful build go to the following directory ``` cd samples\core\target - ``` -Configure port number which should be used by the tomcat server and context in which server application should be registered. -To do that create new application.properties file in \oasp4j\oasp4j-samples\core\target directory and add following entries: +Configure the port number which should be used by the embedded tomcat server and its context path. To do this, create a new `application.properties` file in the `\oasp4j\samples\core\target` directory and add following entries: ``` -server.port=8888 +server.port=8081 server.context-path=/oasp4j-sample-server - ``` -Replace '8888' with the port number which you want to use for your Tomcat. -After that see the _[hint about how to configure a different port on the client side](#howToChangeTomcatsPortInConfigJson)_. - -Start the oasp4j-samples-core project as spring boot application by running following command in your console: +Start the oasp4j-samples-core project as a Spring Boot application by running the following command in your console: ``` java -jar oasp4j-sample-core-dev-SNAPSHOT.jar - ``` Set up the client part of the application @@ -83,7 +75,7 @@ We asume you are back in the `` directory. Clone the oasp4js repository: ``` -git clone https://github.com/oasp/oasp4js.git +git clone https://github.com/oasp/oasp4js.git -b master ``` Install the client part's dependencies: @@ -93,20 +85,12 @@ cd oasp4js npm install ``` -During npm install process bower downloads some libraries and uses git for it. Git defaults to the git protocol whose standard port (9418) is sometimes blocked by the company firewall. A solution for this problem is to configure Git to use the https instead of the git protocol with following command: +During the `npm install` process Bower downloads some libraries and uses Git for it. Git defaults to the Git protocol whose standard port (9418) is sometimes blocked by firewalls. A solution for this problem is to configure Git to use the `https` instead of the git protocol with following command: ``` git config --global url."https://".insteadOf git:// ``` -and to rerun npm install command. - - - -_**Hint about how to configure a different Tomcat's port to be used on the client side:** If you changed the Tomcat's port as [described here](#changeTomcatsPortInServerXml), then you have to change the default port which is configured in the client part of the application, in the `\oasp4js\config.json` file. You have to set the correct port number in the following line of the aforementioned configuration file (replace '8888' with the port number which you configured for your Tomcat):_ - -``` -"proxy": "http://localhost:8888", -``` +and to rerun the `npm install` command. Start the application using Gulp: @@ -117,3 +101,14 @@ gulp serve The above Gulp's task opens the client part of the application in your default browser and watches for any changes in HTML/JavaScript/CSS files. Once you change one, the page is reloaded automatically! You can sign in using the following credentials: waiter/waiter or cook/cook. + +If for some reason your clent should talk to the server configured in a different way, you can configure the server details in the client's configuration file, `\oasp4js\config.json`, in the `proxy` part: + +``` +{ + "proxy": { + "baseUrl": "http://localhost:8081", + "context": "/oasp4j-sample-server" + } +} +``` From 87db7387d99a604a70f9262e12ccc9f5c48efaa1 Mon Sep 17 00:00:00 2001 From: Marek Matczak Date: Wed, 9 Mar 2016 10:16:11 +0100 Subject: [PATCH 14/14] Update README.md a few typos corrected --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb70934..1bc6a70 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ After a successful build go to the following directory cd samples\core\target ``` -Configure the port number which should be used by the embedded tomcat server and its context path. To do this, create a new `application.properties` file in the `\oasp4j\samples\core\target` directory and add following entries: +Configure the port number which should be used by the embedded tomcat server and its context path. To do this, create a new `application.properties` file in the `\oasp4j\samples\core\target` directory and add the following entries: ``` server.port=8081 @@ -102,7 +102,7 @@ The above Gulp's task opens the client part of the application in your default b You can sign in using the following credentials: waiter/waiter or cook/cook. -If for some reason your clent should talk to the server configured in a different way, you can configure the server details in the client's configuration file, `\oasp4js\config.json`, in the `proxy` part: +If for some reason your client should talk to the server configured in a different way, you can configure the server details in the client's configuration file, `\oasp4js\config.json`, in the `proxy` part: ``` {