Skip to content

Commit 91b7e69

Browse files
committed
LICENSE added, updated doc form
1 parent 014783c commit 91b7e69

3 files changed

Lines changed: 71 additions & 18 deletions

File tree

pvAccessJava/LICENSE

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
Copyright and License Terms
2+
---------------------------
3+
4+
Copyright (c) 2006-2016 Martin R. Kraimer
5+
Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
6+
National Laboratory.
7+
Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
8+
Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
9+
Copyright (c) 2007-2016 Control System Laboratory,
10+
(COSYLAB) Ljubljana Slovenia
11+
Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
12+
of Brookhaven National Laboratory
13+
Copyright (c) 2011-2016 Diamond Light Source Limited,
14+
(DLS) Didcot, United Kingdom
15+
16+
Permission is hereby granted, free of charge, to any person
17+
obtaining a copy of this software and associated documentation
18+
files (the "Software"), to deal in the Software without
19+
restriction, including without limitation the rights to use,
20+
copy, modify, merge, publish, distribute, sublicense, and/or sell
21+
copies of the Software, and to permit persons to whom the
22+
Software is furnished to do so, subject to the following
23+
conditions:
24+
25+
The above copyright notice and this permission notice shall be
26+
included in all copies or substantial portions of the Software.
27+
28+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
29+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
30+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
31+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
32+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
33+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
34+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
35+
OTHER DEALINGS IN THE SOFTWARE.
36+
37+
________________________________________________________________________
38+
39+
Additional Disclaimers
40+
----------------------
41+
42+
This software is copyright in part by these institutions:
43+
44+
* Brookhaven Science Associates, as Operator of Brookhaven
45+
National Laboratory, New York, USA
46+
* Control System Laboratory, Ljubljana, Slovenia
47+
* Deutsches Elektronen-Synchroton, Member of the Helmholtz
48+
Association, Hamburg, Germany
49+
* Diamond Light Source Limited, Didcot, United Kingdom
50+
* Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
51+
Berlin, Germany.
52+
* UChicage Argonne LLC, as Operator of Argonne National Laboratory,
53+
Illinois, USA
54+
55+
In no event shall these institutions be liable to any party for direct,
56+
indirect, special, incidental, or consequential damages arising out of
57+
the use of this software, its documentation, or any derivatives thereof,
58+
even if advised of the possibility of such damage.
59+
60+
These institutions specifically disclaim any warranties, including, but
61+
not limited to, the implied warranties of merchantability, fitness for a
62+
particular purpose, and non-infringement. This software is provided on
63+
an "as is" basis, and these institutions have no obligation to provide
64+
maintenance, support, updates, enhancements, or modifications.
65+
File renamed without changes.

pvAccessJava/documentation/pvAccessJava.html

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,9 @@
3636

3737
<div class="head">
3838
<h1>EPICS pvAccessJava</h1>
39-
<!-- Maturity: Working Draft or Request for Comments, or Recommendation, and date. -->
4039

41-
<h2 class="nocount">EPICS v4 Working Group, Working Draft, 10-Nov-2014</h2>
40+
<h2 class="nocount">Release 4.0.2, 10-Nov-2014</h2>
4241
<dl>
43-
<dt>This version:</dt>
44-
<dd><a
45-
href="pvAccessJava.html">pvAccessJava.html</a></dd>
46-
<dt>Latest version:</dt>
47-
<dd><a
48-
href="pvAccessJava_20141110.html">pvAccessJava_20141110.html
49-
</a></dd>
50-
<dt>Previous version:</dt>
51-
<dd><a
52-
href="pvAccessJava_20140709.html">pvAccessJava_20140709.html
53-
</a></dd>
5442
<dt>Editors:</dt>
5543
<dd>Marty Kraimer, BNL<br />
5644
Matej Sekoranja, CosyLab</dd>
@@ -1201,7 +1189,7 @@ <h3>ChannelArray</h3>
12011189
request is connected to the server. Status provides the result of the
12021190
createChannelArray request. If status is not success than the other
12031191
arguments are null. channelArray is the interface for requesting puts and
1204-
gets. array is the interface for the data that transferred between client
1192+
gets. array is the interface for the data that transfered between client
12051193
and server.
12061194
</dd>
12071195
<dt>putArrayDone</dt>
@@ -1362,7 +1350,7 @@ <h3>Access Security</h3>
13621350

13631351
<h3>User Controlled Send Queues</h3>
13641352

1365-
<p>Currently a user can only ask to send a message immediately, i.e. a client
1353+
<p>Currently a user can only ask to send a message immediately, i. e. a client
13661354
has no control over when a message is sent. This can result in many short
13671355
network packets. Perhaps the following should be provided: Allow a client, for
13681356
each send request, to specify the following options:</p>
@@ -1371,10 +1359,10 @@ <h3>User Controlled Send Queues</h3>
13711359
<dd>Immediately queue a request to the send thread.</dd>
13721360
<dt>periodically</dt>
13731361
<dd>Put requests on a periodic send queue. At some periodic rate the queue
1374-
is transferred to the send thread.</dd>
1362+
is transfered to the send thread.</dd>
13751363
<dt>user queue</dt>
13761364
<dd>Client keeps a private queue for requests. The client decides when the
1377-
queue should be transferred to the send thread.</dd>
1365+
queue should be transfered to the send thread.</dd>
13781366
</dl>
13791367

13801368
<h2>Helper Packages</h2>
@@ -1442,7 +1430,7 @@ <h3>org.epics.pvaccess.util</h3>
14421430
<dt>HexDump</dt>
14431431
<dd>Converts a byte array to hex and writes to System.out.println.</dd>
14441432
<dt>InetAddressUtil</dt>
1445-
<dd>Convenience methods for INET address conversion.</dd>
1433+
<dd>Convience methods for INET address conversion.</dd>
14461434
<dt>IntHashMap</dt>
14471435
<dd>An integer hash map. This is used instead of java.util.HashMap so that
14481436
Integer objects do not have to be allocated.</dd>

0 commit comments

Comments
 (0)