Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/src/main/resources/templates/_main.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>MapFish Print 3 Documentation - {{pageTitle}}</title>
<title>MapFish Print 4 Documentation - {{pageTitle}}</title>

<link rel="stylesheet" href="css/sphinx_rtd_theme.css" type="text/css" />
<link rel="stylesheet" href="css/readthedocs-doc-embed.css" type="text/css" />
Expand All @@ -17,7 +17,7 @@
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search">
<a href="index.html" class="icon icon-home"> MapFish Print 3</a>
<a href="index.html" class="icon icon-home"> MapFish Print 4</a>
</div>

<div
Expand Down Expand Up @@ -109,7 +109,7 @@
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">MapFish Print 3</a>
<a href="index.html">MapFish Print 4</a>
</nav>

<div class="wy-nav-content">
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="admonition note examples">
<p class="first admonition-title">Getting started</p>
<p class="last">
A good way to get started with MapFish Print 3 is to follow the <strong>introduction workshop</strong>.
A good way to get started with MapFish Print 4 is to follow the <strong>introduction workshop</strong>.
Download the workshop
<a target="_blank" href="https://mapfish.github.io/mapfish-print-workshop/mfp-workshop.zip" rel="noopener"
>here</a
Expand Down Expand Up @@ -41,7 +41,7 @@
<h2>Design Philosophy</h2>
<p>The (much simplified) architecture of Mapfish Print is as follows:</p>

<img class="architecture" src="images/Mapfish_Print_V3_Architecture.svg" />
<img class="architecture" src="images/Mapfish_Print_V4_Architecture.svg" />

<p>
This diagram illustrates how a client (web-client or Java application) communicates with the Mapfish Print
Expand Down
4 changes: 2 additions & 2 deletions jMeter/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ You'll need:

- [jMeter](http://jmeter.apache.org/download_jmeter.cgi)
- Tomcat
- A MapFish Print 3 WAR (for example build one with `./gradlew war`)
- A MapFish Print 4 WAR (for example build one with `./gradlew war`)

Deploy the WAR and check that MapFish Print 3 works correctly. Then start jMeter and open
Deploy the WAR and check that MapFish Print 4 works correctly. Then start jMeter and open
the file `jmeter-test-plan.jmx`. Make sure that the configuration in `MapFish Print Server Config`
matches your setup. There are several test cases available to run. The most complete is
`Create and Get Report`.
Expand Down
Loading