Skip to content

Commit c608df6

Browse files
Craigacpjhalexand
authored andcommitted
Removing olcut-config-jini.
1 parent cc5de9d commit c608df6

38 files changed

+10
-4212
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ manifest.mf
2020

2121
# Subproject files
2222
olcut-core/target
23-
olcut-config-jini/target
2423
olcut-config-json/target
2524
olcut-config-edn/target
2625
olcut-extras/target

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
We welcome your contributions! There are several directions that OLCUT could
44
be extended in. New config file formats could be added, more classes can be
55
added for the `@Config` annotation, more classes can be supported by the
6-
`CommandInterpreter`'s `@Command` methods. The remote component discovery based on
7-
Jini / Apache River could stand to be modernized. Have an idea? Talk to us and
6+
`CommandInterpreter`'s `@Command` methods. Have an idea? Talk to us and
87
let's make it happen. Just file an Issue to get in touch.
98

109
## Questions, Bugs, and Features

README-Configuration.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ they are not the right type. It also checks that only parameters defined in
6666
the object are included in the configuration file. Properties may be tagged
6767
as mandatory or not and may have default values (here, numThreads is given a
6868
default value of 1 if it is not included in the configuration file). Properties
69-
may also be tagged "redact" which will cause their values not to appear in
69+
may also be tagged `redact` which will cause their values not to appear in
7070
saved configuration files, or provenance objects.
7171

7272
To instantiate the pipeline in your code, you'd put something like the following
@@ -312,33 +312,6 @@ the necessary read locations are program specific. If you need to save an OLCUT
312312
configuration out then you will also need to add write permissions for the save
313313
location.
314314

315-
The remote component loading system requires a further set of permissions which
316-
we haven't completely captured.
317-
318-
## Remote Components
319-
320-
The configuration system can make use of Jini (a.k.a. Apache River) and RMI to help instantiate a
321-
distributed system. Through extensions to the component definition in the
322-
configuration file, components can be registered as services in Jini. When
323-
a component lists another component as a property, that component need not
324-
be on the same machine. If it is remote, the configuration system will
325-
automatically query Jini to find the service and it will return an RMI proxy
326-
for the object.
327-
328-
Documentation about how to start a class server, run a registry, specify an
329-
object as remote, provide `ConfigurationEntries`, deal with `RemoteComponentManager`
330-
and `RemoteMultiComponentManager`, etc will eventually be added here.
331-
332-
Remote loading in general works fine with Java 9+, but we have experienced some weird class
333-
loader issues when using serialization in RMI calls with Jini in another project.
334-
It's TBD on what the root cause is or how to fix it.
335-
336-
Note: remote components are currently deprecated as they depend on features
337-
deprecated by the integration of [JEP 385](https://openjdk.java.net/jeps/385)
338-
in Java 15. We are considering alternative approaches which will keep this
339-
functionality, though it will likely be structured differently to the current
340-
implementation.
341-
342315
## Other config formats
343316

344317
OLCUT 4.1 and above support json and edn (a Clojure based format) configuration files

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ components with standard and interoperable command line interfaces. It has its r
55
the Sphinx 4 speech recognizer but has been significantly extended. These pieces can
66
be used in concert or independently:
77

8-
* The Configuration System provides runtime configuration management (even over RMI) without recompiles
8+
* The Configuration System provides runtime configuration management without recompiles
99
* The Options Processor cleanly processes command-line arguments, including configuration changes
1010
* The Command Interpreter provides an Annotation-based interactive shell with tab completion
1111
* Additional Odds & Ends provide helpful utility classes
@@ -31,10 +31,6 @@ or from Gradle:
3131
implementation 'com.oracle.labs.olcut:olcut-core:5.1.4'
3232
```
3333

34-
The Jini-based remote configuration system in `olcut-config-jini` is deprecated as aspects of Jini are deprecated by
35-
[JEP 385](https://openjdk.java.net/jeps/385). At the moment we don't have
36-
a replacement approach which will function after the rmid tool is removed.
37-
3834
The `olcut-extras` artifact is designed as a small tool for developers, as such you should compile the appropriate
3935
version based on your needs.
4036

@@ -94,8 +90,7 @@ the appropriate fields.
9490

9591
This is just a small sample of what the Configuration system can do. It
9692
supports **inheritance**, many configurable types, **command line overrides**, self-description,
97-
a multiple file formats including **JSON**, and even remote implementation of
98-
components over RMI via Apache River (formerly Jini).
93+
and multiple file formats including **JSON**.
9994

10095
Read all about the [Configuration System](README-Configuration.md).
10196

THIRD_PARTY_LICENSES.txt

Lines changed: 0 additions & 256 deletions
Original file line numberDiff line numberDiff line change
@@ -35,262 +35,6 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
3535
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
3636
OF THE POSSIBILITY OF SUCH DAMAGE.
3737

38-
Apache River 2.2.3
39-
40-
Apache River
41-
Copyright 2009 The Apache Software Foundation
42-
43-
This product includes software developed at
44-
The Apache Software Foundation (http://www.apache.org/).
45-
46-
Copyright 2005 Sun Microsystems, Inc.
47-
This product includes material developed by Sun Microsystems, Inc.
48-
(http://www.sun.com).
49-
50-
Copyright 2002-2005 Geoffrey Arnold (http://www.geoffreyarnold.com)
51-
This product contains code derived from the Ant build script contributed
52-
to the Jini Community by Geoffrey Arnold (http://www.geoffreyarnold.com).
53-
54-
Copyright 2000-2005 Artima Software, Inc.
55-
Portions of this software were developed by Bill Venners of Artima, Inc., who
56-
led the ServiceUI project. The ServiceUI project, which was hosted at jini.org,
57-
was tasked with defining a "standard" approach to attaching UIs to Jini services.
58-
The ServiceUI specification and API represent the best amalgamation of the ideas
59-
contributed by all the people who participated in the serviceui project.
60-
61-
The original two releases of the ServiceUI API, including specifications
62-
and code, are available from:
63-
64-
http://www.artima.com/jini/serviceui/index.html
65-
66-
Apache License
67-
Version 2.0, January 2004
68-
http://www.apache.org/licenses/
69-
70-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
71-
72-
1. Definitions.
73-
74-
"License" shall mean the terms and conditions for use, reproduction,
75-
and distribution as defined by Sections 1 through 9 of this document.
76-
77-
"Licensor" shall mean the copyright owner or entity authorized by
78-
the copyright owner that is granting the License.
79-
80-
"Legal Entity" shall mean the union of the acting entity and all
81-
other entities that control, are controlled by, or are under common
82-
control with that entity. For the purposes of this definition,
83-
"control" means (i) the power, direct or indirect, to cause the
84-
direction or management of such entity, whether by contract or
85-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
86-
outstanding shares, or (iii) beneficial ownership of such entity.
87-
88-
"You" (or "Your") shall mean an individual or Legal Entity
89-
exercising permissions granted by this License.
90-
91-
"Source" form shall mean the preferred form for making modifications,
92-
including but not limited to software source code, documentation
93-
source, and configuration files.
94-
95-
"Object" form shall mean any form resulting from mechanical
96-
transformation or translation of a Source form, including but
97-
not limited to compiled object code, generated documentation,
98-
and conversions to other media types.
99-
100-
"Work" shall mean the work of authorship, whether in Source or
101-
Object form, made available under the License, as indicated by a
102-
copyright notice that is included in or attached to the work
103-
(an example is provided in the Appendix below).
104-
105-
"Derivative Works" shall mean any work, whether in Source or Object
106-
form, that is based on (or derived from) the Work and for which the
107-
editorial revisions, annotations, elaborations, or other modifications
108-
represent, as a whole, an original work of authorship. For the purposes
109-
of this License, Derivative Works shall not include works that remain
110-
separable from, or merely link (or bind by name) to the interfaces of,
111-
the Work and Derivative Works thereof.
112-
113-
"Contribution" shall mean any work of authorship, including
114-
the original version of the Work and any modifications or additions
115-
to that Work or Derivative Works thereof, that is intentionally
116-
submitted to Licensor for inclusion in the Work by the copyright owner
117-
or by an individual or Legal Entity authorized to submit on behalf of
118-
the copyright owner. For the purposes of this definition, "submitted"
119-
means any form of electronic, verbal, or written communication sent
120-
to the Licensor or its representatives, including but not limited to
121-
communication on electronic mailing lists, source code control systems,
122-
and issue tracking systems that are managed by, or on behalf of, the
123-
Licensor for the purpose of discussing and improving the Work, but
124-
excluding communication that is conspicuously marked or otherwise
125-
designated in writing by the copyright owner as "Not a Contribution."
126-
127-
"Contributor" shall mean Licensor and any individual or Legal Entity
128-
on behalf of whom a Contribution has been received by Licensor and
129-
subsequently incorporated within the Work.
130-
131-
2. Grant of Copyright License. Subject to the terms and conditions of
132-
this License, each Contributor hereby grants to You a perpetual,
133-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
134-
copyright license to reproduce, prepare Derivative Works of,
135-
publicly display, publicly perform, sublicense, and distribute the
136-
Work and such Derivative Works in Source or Object form.
137-
138-
3. Grant of Patent License. Subject to the terms and conditions of
139-
this License, each Contributor hereby grants to You a perpetual,
140-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
141-
(except as stated in this section) patent license to make, have made,
142-
use, offer to sell, sell, import, and otherwise transfer the Work,
143-
where such license applies only to those patent claims licensable
144-
by such Contributor that are necessarily infringed by their
145-
Contribution(s) alone or by combination of their Contribution(s)
146-
with the Work to which such Contribution(s) was submitted. If You
147-
institute patent litigation against any entity (including a
148-
cross-claim or counterclaim in a lawsuit) alleging that the Work
149-
or a Contribution incorporated within the Work constitutes direct
150-
or contributory patent infringement, then any patent licenses
151-
granted to You under this License for that Work shall terminate
152-
as of the date such litigation is filed.
153-
154-
4. Redistribution. You may reproduce and distribute copies of the
155-
Work or Derivative Works thereof in any medium, with or without
156-
modifications, and in Source or Object form, provided that You
157-
meet the following conditions:
158-
159-
(a) You must give any other recipients of the Work or
160-
Derivative Works a copy of this License; and
161-
162-
(b) You must cause any modified files to carry prominent notices
163-
stating that You changed the files; and
164-
165-
(c) You must retain, in the Source form of any Derivative Works
166-
that You distribute, all copyright, patent, trademark, and
167-
attribution notices from the Source form of the Work,
168-
excluding those notices that do not pertain to any part of
169-
the Derivative Works; and
170-
171-
(d) If the Work includes a "NOTICE" text file as part of its
172-
distribution, then any Derivative Works that You distribute must
173-
include a readable copy of the attribution notices contained
174-
within such NOTICE file, excluding those notices that do not
175-
pertain to any part of the Derivative Works, in at least one
176-
of the following places: within a NOTICE text file distributed
177-
as part of the Derivative Works; within the Source form or
178-
documentation, if provided along with the Derivative Works; or,
179-
within a display generated by the Derivative Works, if and
180-
wherever such third-party notices normally appear. The contents
181-
of the NOTICE file are for informational purposes only and
182-
do not modify the License. You may add Your own attribution
183-
notices within Derivative Works that You distribute, alongside
184-
or as an addendum to the NOTICE text from the Work, provided
185-
that such additional attribution notices cannot be construed
186-
as modifying the License.
187-
188-
You may add Your own copyright statement to Your modifications and
189-
may provide additional or different license terms and conditions
190-
for use, reproduction, or distribution of Your modifications, or
191-
for any such Derivative Works as a whole, provided Your use,
192-
reproduction, and distribution of the Work otherwise complies with
193-
the conditions stated in this License.
194-
195-
5. Submission of Contributions. Unless You explicitly state otherwise,
196-
any Contribution intentionally submitted for inclusion in the Work
197-
by You to the Licensor shall be under the terms and conditions of
198-
this License, without any additional terms or conditions.
199-
Notwithstanding the above, nothing herein shall supersede or modify
200-
the terms of any separate license agreement you may have executed
201-
with Licensor regarding such Contributions.
202-
203-
6. Trademarks. This License does not grant permission to use the trade
204-
names, trademarks, service marks, or product names of the Licensor,
205-
except as required for reasonable and customary use in describing the
206-
origin of the Work and reproducing the content of the NOTICE file.
207-
208-
7. Disclaimer of Warranty. Unless required by applicable law or
209-
agreed to in writing, Licensor provides the Work (and each
210-
Contributor provides its Contributions) on an "AS IS" BASIS,
211-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
212-
implied, including, without limitation, any warranties or conditions
213-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
214-
PARTICULAR PURPOSE. You are solely responsible for determining the
215-
appropriateness of using or redistributing the Work and assume any
216-
risks associated with Your exercise of permissions under this License.
217-
218-
8. Limitation of Liability. In no event and under no legal theory,
219-
whether in tort (including negligence), contract, or otherwise,
220-
unless required by applicable law (such as deliberate and grossly
221-
negligent acts) or agreed to in writing, shall any Contributor be
222-
liable to You for damages, including any direct, indirect, special,
223-
incidental, or consequential damages of any character arising as a
224-
result of this License or out of the use or inability to use the
225-
Work (including but not limited to damages for loss of goodwill,
226-
work stoppage, computer failure or malfunction, or any and all
227-
other commercial damages or losses), even if such Contributor
228-
has been advised of the possibility of such damages.
229-
230-
9. Accepting Warranty or Additional Liability. While redistributing
231-
the Work or Derivative Works thereof, You may choose to offer,
232-
and charge a fee for, acceptance of support, warranty, indemnity,
233-
or other liability obligations and/or rights consistent with this
234-
License. However, in accepting such obligations, You may act only
235-
on Your own behalf and on Your sole responsibility, not on behalf
236-
of any other Contributor, and only if You agree to indemnify,
237-
defend, and hold each Contributor harmless for any liability
238-
incurred by, or claims asserted against, such Contributor by reason
239-
of your accepting any such warranty or additional liability.
240-
241-
END OF TERMS AND CONDITIONS
242-
243-
APPENDIX: How to apply the Apache License to your work.
244-
245-
To apply the Apache License to your work, attach the following
246-
boilerplate notice, with the fields enclosed by brackets "[]"
247-
replaced with your own identifying information. (Don't include
248-
the brackets!) The text should be enclosed in the appropriate
249-
comment syntax for the file format. We also recommend that a
250-
file or class name and description of purpose be included on the
251-
same "printed page" as the copyright notice for easier
252-
identification within third-party archives.
253-
254-
Copyright [yyyy] [name of copyright owner]
255-
256-
Licensed under the Apache License, Version 2.0 (the "License");
257-
you may not use this file except in compliance with the License.
258-
You may obtain a copy of the License at
259-
260-
http://www.apache.org/licenses/LICENSE-2.0
261-
262-
Unless required by applicable law or agreed to in writing, software
263-
distributed under the License is distributed on an "AS IS" BASIS,
264-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
265-
See the License for the specific language governing permissions and
266-
limitations under the License.
267-
268-
ASM examples: examples showing how ASM can be used
269-
Copyright (c) 2000-2005 INRIA, France Telecom
270-
All rights reserved.
271-
Redistribution and use in source and binary forms, with or without
272-
modification, are permitted provided that the following conditions
273-
are met:
274-
1. Redistributions of source code must retain the above copyright
275-
notice, this list of conditions and the following disclaimer.
276-
2. Redistributions in binary form must reproduce the above copyright
277-
notice, this list of conditions and the following disclaimer in the
278-
documentation and/or other materials provided with the distribution.
279-
3. Neither the name of the copyright holders nor the names of its
280-
contributors may be used to endorse or promote products derived from
281-
this software without specific prior written permission.
282-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
283-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
284-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
285-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
286-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
287-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
288-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
289-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
290-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
291-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
292-
THE POSSIBILITY OF SUCH DAMAGE.
293-
29438
jackson-core, jackson-databind 2.11.2
29539

29640

docs/Internals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ it goes out of scope.
5858

5959
## Lifetime of a ConfigurationManager processing Options
6060

61-
This summerises the steps executed by a `ConfigurationManager` on construction
61+
This summarises the steps executed by a `ConfigurationManager` on construction
6262
when parsing options.
6363

6464
1. A class implementing Options, with fields marked @Option for values that can be read in from the command line is constructed.

olcut-config-jini/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

olcut-config-jini/policy.all

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)