Skip to content

Commit 6a4dd77

Browse files
shroffkshroffk
authored
Merge pull request #6 from shroffk/master
merge git submodules back into main repo
2 parents f524ffe + c999e77 commit 6a4dd77

578 files changed

Lines changed: 109342 additions & 7 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ dependency-reduced-pom.xml
88
buildNumber.properties
99
.mvn/timing.properties
1010
nbactions.xml
11+
.settings
12+
.project

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ It also contains the EPICS parent POM that is inherited by all modules,
66
and provides a convenience dependency POM that can be used by other projects
77
to depend on a matching set of the EPICS Core libraries.
88

9-
All EPICS Core modules are contained as Git submodules.
109

1110
## Code Submodules
12-
Five submodules/directories/projects contain the code of EPICS Core:
11+
Five maven submodules/directories/projects contain the code of EPICS Core:
1312
* pvDataJava
1413
* pvAccessJava
1514
* normativeTypesJava
15+
* epics-util
16+
* epics-vtype
17+
18+
Two git submodules contain the code of EPICS Core:
1619
* pvaClientJava
1720
* pvDatabaseJava
1821

19-
Two submodules contain example code:
22+
Two git submodules contain example code:
2023
* exampleJava
2124
* directoryService
2225

‎archived_releases.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
For all release prior to 7.0.2 the source repositories and the associated release tags have been moved to the https://github.com/epics-rip github project.

‎bundleJava‎

Submodule bundleJava deleted from 8cf4d32

‎bundleJava/.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
target/
2+
pom.xml.tag
3+
pom.xml.releaseBackup
4+
pom.xml.versionsBackup
5+
pom.xml.next
6+
release.properties
7+
dependency-reduced-pom.xml
8+
buildNumber.properties
9+
.mvn/timing.properties
10+
nbactions.xml

‎bundleJava/LICENSE.txt‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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.

‎bundleJava/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# bundleJava
2+
This Maven project downloads all modules of an EPICS V4 distribution (Java parts)
3+
and all dependencies outside of the standard Java installation.
4+
5+
It then creates a gnu-zipped tar file containing all EPICS V4 jars (binaries, sources and Javadoc) in its
6+
root directory (carrying the release name), and all external dependencies (binaries) in the "lib" subdirectory.
7+
8+
This project is intended to be run on a Jenkins based CI infrastructure.
9+
To correctly name the dependencies, it relies on a parent pom (ev4-java-bundle.xml) that is created running the
10+
script jenkins_bundle found in the jenkins directory.
11+
12+
To be able to "build" this project locally, you have to run that script in the top directory of your workspace first.

‎bundleJava/bundled_files/README.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
2+
EPICS VERSION 4 JAVA IMPLEMENTATION README
3+
==========================================
4+
5+
This README is a guide to the build of the Java implementation of EPICS Version 4.
6+
7+
Status: This README is up-to-date with respect to release v4.5.0.1 of EPICS
8+
Version 4.
9+
10+
Auth:
11+
Greg White, SLAC, 28-Oct-2015
12+
13+
Mod:
14+
Dave Hickin, Diamond, 01-Feb-2016
15+
Update for 4.5.0.1.
16+
17+
18+
Prerequisites
19+
-------------
20+
21+
The EPICS V4 Java bundle requires recent versions of the following software:
22+
23+
1. Java SDK v1.7 (Java 7)
24+
25+
Note that support for Channel Access operations through the pvAccess API
26+
"Channel Provider" interface is provided by CAJ and JCA, which are bundled
27+
in the EPICS-Java tar.
28+
29+
Build
30+
-----
31+
32+
The tar file distribution of the Java implementation of EPICS v4.5.0.1
33+
contains the jar files of Java executables, sources and documentation, for
34+
all the software modules of the EPICS v4.
35+
Therefore, simply untar the distribution tar file.
36+
37+
tar xvfz EPICS-Java-4.5.0.1.tar.gz [if you got it compressed]
38+
tar xvf EPICS-Java-4.5.0.1.tar [if you got it uncompressed]
39+
40+
41+
Further information
42+
-------------------
43+
44+
For the individual modules, consult the documentation in each one. In
45+
particular:
46+
47+
* README.md
48+
* RELEASE_VERSIONS.md
49+
* The documentation directory
50+
51+
For more information visit the
52+
[EPICS V4 website](http://epics-pvdata.sourceforge.net).
53+
54+
In particular:
55+
56+
* [Getting started guide](http://epics-pvdata.sourceforge.net/gettingStarted.html) -
57+
for detailed build instructions and where to go next.
58+
* [Developer guide](http://epics-pvdata.sourceforge.net/informative/developerGuide/developerGuide.html) -
59+
currently under development.
60+
* [Documentation page](http://epics-pvdata.sourceforge.net/literature.html) -
61+
Overview documents and doxygen for the various modules.

‎bundleJava/bundled_files/RELEASE_NOTES.md‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
4.5.0.1 (2016/02/05)
2+
====================
3+
4+
The main change since release 4.5.0 is:
5+
6+
pvDataJava (5.0.3)
7+
------------------
8+
9+
* Fixed buffer overflow in PVUnion.serialize() (issue #5)
10+
11+
The versions of the other modules and their dependencies have been updated,
12+
but are otherwise unchanged.
13+
14+
See individual RELEASE_NOTES.md in each module for more.
15+
16+
17+
4.5.0 (2015/10/16)
18+
==================
19+
20+
The following are the MAIN changes to the EPICS v4 software suite, since release 4.4.0. See individual RELEASE_NOTES.md in each module for more.
21+
22+
pvDataJava (5.0.2)
23+
------------------
24+
* New template versions of Structure::getField
25+
* Printing of structure and union arrays modified
26+
* minStep field added to Control
27+
* Changes to access specifiers in Display and PVDisplay
28+
29+
30+
pvAccessJava (4.1.2)
31+
--------------------
32+
* Async RPC service.
33+
34+
35+
pvDatabaseJava (4.1.2)
36+
---------------------
37+
This is the first release of pvDatabaseJava, an EPICS V4 record/database framework for providing services over pvAccess.
38+
39+
40+
normativeTypesJava (0.1.2)
41+
--------------------------
42+
This is the first release of normativeTypesJava.
43+
44+
* This release provides support through wrapper classes and builders for the
45+
following Normative Types:
46+
* NTScalar
47+
* NTScalarArray
48+
* NTEnum
49+
* NTMatrix
50+
* NTURI
51+
* NTNameValue
52+
* NTTable
53+
* NTAttribute
54+
* NTMultiChannel
55+
* NTNDArray
56+
* NTContinuum
57+
* NTHistogram
58+
* NTAggregate
59+
* NTUnion
60+
* NTScalarMultiChannel
61+
62+
* Release 0.1 therefore implements fully the
63+
[16 Mar 2015 version](http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes_20150316.html)
64+
of the normativeTypes specification.
65+
* Each type has a builder and a class for testing compatibility and wrapping
66+
existing structures.
67+
* Utility classes NTField and NTPVField for standard structure fields and
68+
NTUtils and NTID for type IDs.
69+
* Unit tests for all the implemented types and other classes, providing
70+
extensive coverage for all the Normative Types (except NTNDArray).
71+
72+
73+
pvaClientJava (4.1.3)
74+
--------------------
75+
pvaClientJava is the successor to easyPVAJava, a synchronous API for pvAccess.
76+
77+
* pvaClient uses exceptions to report most problem instead
78+
of requiring the client to call status methods.
79+
80+
81+
easyPVAJava (4.1.2)
82+
--------------------
83+
84+
* EasyPVA automatically starts ChannelProvider for both Channel Access and pvAccess.
85+
* EasyMultiChannel is now implemented
86+
* Support for monitors is now available both for EasyChannel and EasyMultiChannel.
87+
88+
89+
directoryService (0.4.2)
90+
-----------------------
91+
92+
(No significant changes)
93+
94+
95+
exampleJava (4.0.5)
96+
------------------
97+
98+
(No significant changes)

0 commit comments

Comments
 (0)