Skip to content
This repository was archived by the owner on May 30, 2019. It is now read-only.

Commit 5d87bbd

Browse files
committed
chore: readme update for two terminal windows
1 parent 3d8ff2c commit 5d87bbd

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

README.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The project includes the following major components:
1010
* Web/browser front end based on Angular.js
1111
* Middle appserver tier implemented in Java/Spring
1212
* Database tier hosted on MarkLogic
13-
* Gradle framework to drive build and configuration of the appserver and database tiers
13+
* Gradle framework to drive build and configuration of the appserver and database tiersÂ
1414
* Unit tests
1515

1616
This README covers the following topics:
@@ -73,7 +73,7 @@ Successfully completing this step does the following:
7373
* Bootstraps the middle tier.
7474
* Builds the Java middle tier components.
7575
* Loads the database with sample data.
76-
* Starts up the middle tier and MarkLogic application services.
76+
* Starts up the middle tier and MarkLogic application services.
7777

7878
The middle tier App Server runs on port 8090 by default. Visit http://localhost:8001 if you need to administer the database.
7979

@@ -84,6 +84,8 @@ Use the following procedure to install required software and bootstrap the Sampl
8484

8585
For detailed instructions and troubleshooting, see the [README in the browser directory](browser/README.md).
8686

87+
**Important**: in order to run the application you must be running *both* the middle-tier **and** the browser webapp. To do this, **use a separtate terminal window for the steps below**.
88+
8789
**NOTE:** If you are on Windows, you must use a Windows command shell, not Cygwin.
8890

8991
1. Go to the browser subdirectory of the project:
@@ -110,17 +112,21 @@ Once you have the database, appserver, and browser tiers of the application conf
110112

111113
`http://localhost:3000/`
112114

113-
To restart the middle tier App Server and browser tier web servers in the future, run the following commands:
114-
```bash
115-
cd appserver/java-spring
116-
./gradlew bootrun
117-
cd ../../browser
118-
gulp run
119-
```
115+
### Restarting the Two Tiers
116+
117+
To stop and restart the middle tier App Server, from its terminal window:
118+
119+
* (press `Control+C`)
120+
* marklogic-samplestack/appserver/java-spring> `./gradlew bootrun`
121+
122+
To stop and restart the browser tier, from its terminal window:
123+
124+
* (press `Control+C`)
125+
* marklogic-samplestack/browser> `gulp run`
120126

121127
### Next Steps
122128
* Explore the application running at http://localhost:3000.
123-
** Use the login credentials [email protected], password joesPassword to view and search content restricted to the Contributor role.
129+
* Use the login credentials `[email protected]`, password `joesPassword` to view and search content restricted to the Contributor role.
124130
* Explore the README in the database, appserver and browser directories for details on each tier.
125131
* View the database configuration by visiting http://localhost:8001.
126132
* Explore the database contents using Query Console. Go to http://localhost:8000/qconsole, select the `samplestack` database, and click Explore.
@@ -129,7 +135,7 @@ gulp run
129135
For more information, see the following:
130136
* README for the [database](database/README.md), [appserver](appserver/java-spring/README.md), and [browser](browser/README.md) tier.
131137
* [Samplestack wiki](https://github.com/marklogic/marklogic-samplestack/wiki).
132-
* [MarkLogic product documentation](http://docs.marklogic.com).
138+
* [MarkLogic product documentation](http://docs.marklogic.com).
133139

134140
## License
135141

0 commit comments

Comments
 (0)