Skip to content

Commit 980e773

Browse files
committed
prepariong v6.2-alpha release
1 parent ceee190 commit 980e773

File tree

7 files changed

+45
-33
lines changed

7 files changed

+45
-33
lines changed

JPPF/bin/build.number

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Sat, 08 Jun 2019 19:45:55 +0200
2-
build.number=2510
1+
#Wed, 17 Jul 2019 04:29:25 +0200
2+
build.number=2515

JPPF/docs/home/doc-source/home/downloads-unstable.php

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<br>
2222

2323
<div class="column_left" style="text-align: justify; padding: 0px">
24+
<!--
2425
<div class="blockWithHighlightedTitle">
2526
<a name="<?php echo $ver1 ?>"></a>
2627
$template{name="highlighted-title-with-icon" img="images/icons/download.png" title="JPPF <?php echo $ver1 ?>" heading="h1" style="margin: 10px 0px"}$
@@ -33,7 +34,7 @@
3334
<li>Make sure to get started with our <a href="/doc/6.2/index.php?title=A_first_taste_of_JPPF">online tutorial</a><br/></li>
3435
</ul>
3536
</div>
36-
<!--
37+
-->
3738
<div class="blockWithHighlightedTitle">
3839
<a name="<?php echo $ver1 ?>"></a>
3940
$template{name="highlighted-title-with-icon" img="images/icons/download.png" title="JPPF <?php echo $ver1 ?>" heading="h1" style="margin: 10px 0px"}$
@@ -47,6 +48,12 @@
4748
<li><a href="<?php echo $base . 'JPPF-' . $ver1 . '-admin-web.zip'; ?>">Web administration and monitoring console</a></li>
4849
</ul>
4950

51+
<h3>Docker and Kubernetes artefacts</h3>
52+
<ul class="list_nomargin">
53+
<li><a href="https://hub.docker.com/u/jppfgrid">public Docker images registry</a></li>
54+
<li><a href="<?php echo 'https://www.jppf.org/helm-charts/jppf-' . $ver1 . '.tgz'; ?>">packaged helm chart</a></li>
55+
</ul>
56+
5057
<h3>Source code and documentation</h3>
5158
<ul class="list_nomargin">
5259
<li><a href="<?php echo 'https://github.com/lolocohen/JPPF/archive/' . $tag1 . '.zip'; ?>">Full source code distribution</a></li>
@@ -66,15 +73,6 @@
6673
<li>Make sure to get started with our <a href="/doc/6.2/index.php?title=A_first_taste_of_JPPF">online tutorial</a><br/></li>
6774
</ul>
6875
</div>
69-
-->
70-
<div style="height: 8px"></div>
71-
<div class="blockWithHighlightedTitle">
72-
$template{name="highlighted-title-with-icon" img="images/icons/folder-download.png" title="JPPF 6.2 roadmap" heading="h3"}$
73-
<ul class="samplesList">
74-
<li>The current state of the 6.2 milestone can be found <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/8/search/1"><b>here</b></a>.<br/></li>
75-
<li><a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/18/search/1">Open issues</a> and <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/7/search/1">closed issues</a></li>
76-
</ul>
77-
</div>
7876
<div style="height: 6px"></div>
7977
<br>
8078
</div>
@@ -86,11 +84,11 @@
8684
<p>You are welcome to try it and provide feedback in our <a href="/forums">user forums</a>, as well as register bugs or enhancement requests in our <a href="/tracker/tbg/jppf/issues/find/saved_search/8/search/1">issue tracker</a>,
8785
so we have a chance to improve it before the final release.
8886
</div>
89-
<div style="height: 8px"></div>
87+
<div style="height: 28px"></div>
9088
<div class="blockWithHighlightedTitle">
9189
$template{name="highlighted-title-with-icon" img="images/icons/documentation.png" title="Documentation preview" heading="h3"}$
9290
<p>Doc preview for the major new features:
93-
<table style="width: 100%"><tr>
91+
<p><table style="width: 100%"><tr>
9492
<td valign="top">
9593
<ul class="samplesList" style="margin-bottom: 0px">
9694
<li><a href="/doc/6.2">JPPF 6.2 User Guide</a></li>
@@ -103,7 +101,14 @@
103101
</ul>
104102
</td>
105103
</tr></table>
106-
104+
</div>
105+
<div style="height: 28px"></div>
106+
<div class="blockWithHighlightedTitle">
107+
$template{name="highlighted-title-with-icon" img="images/icons/folder-download.png" title="JPPF 6.2 roadmap" heading="h3"}$
108+
<ul class="samplesList">
109+
<li>The current state of the 6.2 milestone can be found <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/8/search/1"><b>here</b></a>.<br/></li>
110+
<li><a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/18/search/1">Open issues</a> and <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/7/search/1">closed issues</a></li>
111+
</ul>
107112
</div>
108113
</div>
109114

JPPF/docs/home/downloads-unstable.php

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
</div>
128128
<br>
129129
<div class="column_left" style="text-align: justify; padding: 0px">
130+
<!--
130131
<div class="blockWithHighlightedTitle">
131132
<a name="<?php echo $ver1 ?>"></a>
132133
<div align="left" style="border-bottom: solid 1px #B5C0E0; padding: 0px; margin-left: -5px; margin-right: -8px">
@@ -141,7 +142,7 @@
141142
<li>Make sure to get started with our <a href="/doc/6.2/index.php?title=A_first_taste_of_JPPF">online tutorial</a><br/></li>
142143
</ul>
143144
</div>
144-
<!--
145+
-->
145146
<div class="blockWithHighlightedTitle">
146147
<a name="<?php echo $ver1 ?>"></a>
147148
<div align="left" style="border-bottom: solid 1px #B5C0E0; padding: 0px; margin-left: -5px; margin-right: -8px">
@@ -155,6 +156,11 @@
155156
<li><a href="<?php echo $base . 'JPPF-' . $ver1 . '-admin-ui.zip'; ?>">Desktop administration and monitoring console</a></li>
156157
<li><a href="<?php echo $base . 'JPPF-' . $ver1 . '-admin-web.zip'; ?>">Web administration and monitoring console</a></li>
157158
</ul>
159+
<h3>Docker and Kubernetes artefacts</h3>
160+
<ul class="list_nomargin">
161+
<li><a href="https://hub.docker.com/u/jppfgrid">public Docker images registry</a></li>
162+
<li><a href="<?php echo 'https://www.jppf.org/helm-charts/jppf-' . $ver1 . '.tgz'; ?>">packaged helm chart</a></li>
163+
</ul>
158164
<h3>Source code and documentation</h3>
159165
<ul class="list_nomargin">
160166
<li><a href="<?php echo 'https://github.com/lolocohen/JPPF/archive/' . $tag1 . '.zip'; ?>">Full source code distribution</a></li>
@@ -172,17 +178,6 @@
172178
<li>Make sure to get started with our <a href="/doc/6.2/index.php?title=A_first_taste_of_JPPF">online tutorial</a><br/></li>
173179
</ul>
174180
</div>
175-
-->
176-
<div style="height: 8px"></div>
177-
<div class="blockWithHighlightedTitle">
178-
<div align="left" style="border-bottom: solid 1px #B5C0E0; padding: 0px; margin-left: -5px; margin-right: -8px">
179-
<h3 style="${style}">&nbsp;<img src="images/icons/folder-download.png" class="titleWithIcon"/>JPPF 6.2 roadmap</h3>
180-
</div>
181-
<ul class="samplesList">
182-
<li>The current state of the 6.2 milestone can be found <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/8/search/1"><b>here</b></a>.<br/></li>
183-
<li><a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/18/search/1">Open issues</a> and <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/7/search/1">closed issues</a></li>
184-
</ul>
185-
</div>
186181
<div style="height: 6px"></div>
187182
<br>
188183
</div>
@@ -195,13 +190,13 @@
195190
<p>You are welcome to try it and provide feedback in our <a href="/forums">user forums</a>, as well as register bugs or enhancement requests in our <a href="/tracker/tbg/jppf/issues/find/saved_search/8/search/1">issue tracker</a>,
196191
so we have a chance to improve it before the final release.
197192
</div>
198-
<div style="height: 8px"></div>
193+
<div style="height: 28px"></div>
199194
<div class="blockWithHighlightedTitle">
200195
<div align="left" style="border-bottom: solid 1px #B5C0E0; padding: 0px; margin-left: -5px; margin-right: -8px">
201196
<h3 style="${style}">&nbsp;<img src="images/icons/documentation.png" class="titleWithIcon"/>Documentation preview</h3>
202197
</div>
203198
<p>Doc preview for the major new features:
204-
<table style="width: 100%"><tr>
199+
<p><table style="width: 100%"><tr>
205200
<td valign="top">
206201
<ul class="samplesList" style="margin-bottom: 0px">
207202
<li><a href="/doc/6.2">JPPF 6.2 User Guide</a></li>
@@ -215,6 +210,16 @@
215210
</td>
216211
</tr></table>
217212
</div>
213+
<div style="height: 28px"></div>
214+
<div class="blockWithHighlightedTitle">
215+
<div align="left" style="border-bottom: solid 1px #B5C0E0; padding: 0px; margin-left: -5px; margin-right: -8px">
216+
<h3 style="${style}">&nbsp;<img src="images/icons/folder-download.png" class="titleWithIcon"/>JPPF 6.2 roadmap</h3>
217+
</div>
218+
<ul class="samplesList">
219+
<li>The current state of the 6.2 milestone can be found <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/8/search/1"><b>here</b></a>.<br/></li>
220+
<li><a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/18/search/1">Open issues</a> and <a href="https://www.jppf.org/tracker/tbg/jppf/issues/find/saved_search/7/search/1">closed issues</a></li>
221+
</ul>
222+
</div>
218223
</div>
219224
</div>
220225
</td>

JPPF/docs/manual/JPPF-User-Guide.odt

22 Bytes
Binary file not shown.

JPPF/docs/manual/JPPF-User-Guide.pdf

-394 KB
Binary file not shown.

demo/config/jppf-client.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
jppf.drivers = driver1
2626
#jppf.drivers = driver1 driver2
2727

28-
driver1.jppf.server.host = 192.168.1.24
29-
driver1.jppf.server.port = 11111
28+
#driver1.jppf.server.host = 192.168.1.24
29+
driver1.jppf.server.host = 192.168.1.12
30+
driver1.jppf.server.port = 31111
3031
#driver1.jppf.server.port = 11443
3132
#driver1.jppf.priority = 20
3233
driver1.jppf.pool.size = 1

demo/config/jppf-gui.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ jppf.ssl.configuration.file = config/ssl2/ssl-client.properties
4848
# of an implementation of org.jppf.utils.JPPFConfiguration.ConfigSource
4949
#jppf.ssl.configuration.source = mypackage.MyConfigSource
5050

51-
driver1.jppf.server.host = 192.168.1.24
52-
driver1.jppf.server.port = 11111
51+
#driver1.jppf.server.host = 192.168.1.24
52+
driver1.jppf.server.host = 192.168.1.16
53+
driver1.jppf.server.port = 31111
5354
#driver1.jppf.management.port = 11191
5455
#driver1.jppf.management.port = -1
5556
#driver1.priority = 10

0 commit comments

Comments
 (0)