Fri, 13 Nov 2015 15:40:36 +0100 |
Tom Gottfried |
Add custom standalone.conf with timezone set to UTC.
|
Fri, 13 Nov 2015 13:42:25 +0100 |
Raimund Renkert |
Added validator and first rule for status.
|
Fri, 13 Nov 2015 13:41:36 +0100 |
Raimund Renkert |
Use status to get readonly flag for messungen.
|
Fri, 13 Nov 2015 13:40:25 +0100 |
Raimund Renkert |
Fixed status and messung services.
|
Thu, 12 Nov 2015 13:28:08 +0100 |
Raimund Renkert |
Fixed PersistenceException in PUT status.
|
Thu, 12 Nov 2015 12:20:12 +0100 |
Raimund Renkert |
merged.
|
Thu, 12 Nov 2015 12:19:34 +0100 |
Raimund Renkert |
Fixed status values on messung create.
|
Thu, 12 Nov 2015 12:17:29 +0100 |
Raimund Renkert |
Search the next StatusStufe and create a new copy of a Status in on PUT.
|
Thu, 12 Nov 2015 12:15:18 +0100 |
Raimund Renkert |
Return only reachable status values.
|
Thu, 12 Nov 2015 12:14:46 +0100 |
Raimund Renkert |
Authorize messungen with status and not the "fertig"-flag.
|
Thu, 12 Nov 2015 12:13:39 +0100 |
Raimund Renkert |
Added fields for status and user roles/functions.
|
Thu, 12 Nov 2015 12:12:11 +0100 |
Raimund Renkert |
Added methods to get plain objects.
|
Thu, 12 Nov 2015 12:11:43 +0100 |
Raimund Renkert |
Updated and added model for status workflow.
|
Thu, 12 Nov 2015 12:03:03 +0100 |
Raimund Renkert |
Updated database schema for status workflow.
|
Thu, 05 Nov 2015 10:52:40 +0100 |
Raimund Renkert |
Fixed stammdaten.ort service.
|
Wed, 11 Nov 2015 12:07:03 +0100 |
Tom Gottfried |
Adapt version of test dependencies.
|
Wed, 11 Nov 2015 11:55:36 +0100 |
Tom Gottfried |
Set auth headers for Stammdaten tests and reactivate them.
|
Wed, 11 Nov 2015 11:12:23 +0100 |
Tom Gottfried |
Hibernate needs nextval to insert new datasets.
|
Thu, 05 Nov 2015 10:13:01 +0100 |
Tom Gottfried |
Symlinks allow editing module config in place.
|
Wed, 04 Nov 2015 13:00:04 +0100 |
Tom Gottfried |
Tests should not depend on actual data nor order of attributes in JSON.
|
Tue, 03 Nov 2015 12:06:14 +0100 |
Tom Gottfried |
Package versions of Postgres and Postgres-JDBC do not match in jessie.
|
Tue, 03 Nov 2015 09:33:49 +0100 |
Raimund Renkert |
Removed log message.
|
Tue, 03 Nov 2015 09:23:20 +0100 |
Raimund Renkert |
Skip status and location tests.
|
Tue, 03 Nov 2015 09:22:38 +0100 |
Raimund Renkert |
Build war file in validator test to turn off the shibboleth filter.
|
Tue, 03 Nov 2015 09:21:34 +0100 |
Raimund Renkert |
Added authentication information to all requests.
|
Tue, 03 Nov 2015 09:15:59 +0100 |
Raimund Renkert |
Simply delete a messung object (the db uses on delete cascade)
|
Mon, 02 Nov 2015 10:01:01 +0100 |
Raimund Renkert |
Added stub to filter reachable status values.
|
Mon, 02 Nov 2015 09:58:50 +0100 |
Raimund Renkert |
Added "parentModified" attribute to status protocol.
|
Fri, 30 Oct 2015 15:08:08 +0100 |
Raimund Renkert |
merged.
|
Fri, 30 Oct 2015 15:07:22 +0100 |
Raimund Renkert |
Added grant to all sequences.
|
Fri, 30 Oct 2015 15:06:22 +0100 |
Raimund Renkert |
Updated lada schema: Added status workflow model and cleaned up some triggers.
|
Wed, 28 Oct 2015 12:14:22 +0100 |
Tom Gottfried |
Improve install doc.
|
Wed, 28 Oct 2015 11:05:28 +0100 |
Tom Gottfried |
Dockerfile: add comment where server is reachable.
|
Tue, 27 Oct 2015 18:38:54 +0100 |
Tom Gottfried |
Add dockerised setup for running the server.
|
Tue, 27 Oct 2015 10:29:30 +0100 |
Raimund Renkert |
Set the new created status protocol at messung.
|
Tue, 27 Oct 2015 09:59:21 +0100 |
Raimund Renkert |
merged.
|
Tue, 27 Oct 2015 09:58:25 +0100 |
Raimund Renkert |
Updated model and services for the new status workflow.
|
Tue, 27 Oct 2015 09:56:16 +0100 |
Raimund Renkert |
Added model and services for statusstufe and statuswert.
|
Mon, 26 Oct 2015 15:49:15 +0100 |
Tom Gottfried |
Add Dockerfile for dockerised DB-server.
|
Mon, 26 Oct 2015 15:47:51 +0100 |
Tom Gottfried |
Add script to set up database as user postgres.
|
Mon, 26 Oct 2015 15:44:15 +0100 |
Tom Gottfried |
Add initial DB schema script.
|
Fri, 09 Oct 2015 09:23:22 +0200 |
Michael Stanko |
add new entry in probenquery
|
Tue, 22 Sep 2015 11:51:50 +0200 |
Michael Stanko |
add new search 'HP-Nr-Filter'
|
Fri, 18 Sep 2015 14:35:45 +0200 |
Michael Stanko |
fix set media_from_mediadesk
|
Mon, 14 Sep 2015 11:20:32 +0200 |
Raimund Renkert |
Added tag 2.2.0 for changeset d4d43d846a60
|
Mon, 14 Sep 2015 11:20:25 +0200 |
Raimund Renkert |
Removed tag 2.2.0
2.2.0
|
Mon, 14 Sep 2015 11:20:14 +0200 |
Raimund Renkert |
Set fixed size for first deskriptoren request.
|
Mon, 14 Sep 2015 10:31:34 +0200 |
Raimund Renkert |
Added tag 2.2.0 for changeset d7c0b950c1ce
|
Mon, 14 Sep 2015 10:31:16 +0200 |
Raimund Renkert |
Removed tag 2.2.0
|
Mon, 14 Sep 2015 10:30:44 +0200 |
Raimund Renkert |
Fixed size of main descriptor fields and return 'null' instead of "" for empty
|
Fri, 11 Sep 2015 14:54:14 +0200 |
Raimund Renkert |
Added tag 2.2.0 for changeset 00aaa48d37fe
|
Fri, 11 Sep 2015 14:49:49 +0200 |
Raimund Renkert |
Updated version number.
|
Fri, 11 Sep 2015 12:50:28 +0200 |
Raimund Renkert |
Fixed validator for descriptor to umwelt.
|
Thu, 27 Aug 2015 10:50:59 +0200 |
Dustin Demuth |
Added tag 2.1.2 for changeset 2ba85d14160e
|
Thu, 27 Aug 2015 10:50:50 +0200 |
Dustin Demuth |
Increased Version Number to 2.1.2
2.1.2
|
Tue, 25 Aug 2015 10:49:31 +0200 |
Dustin Demuth |
Filter the group string. This should be tidied...
|
Fri, 14 Aug 2015 11:05:59 +0200 |
Dustin Demuth |
removed -dev from artifact id
|
Fri, 14 Aug 2015 10:33:58 +0200 |
Dustin Demuth |
Added tag 2.1.1 for changeset 9ff0882d73d8
|
Fri, 14 Aug 2015 10:33:35 +0200 |
Dustin Demuth |
Version 2.1.1
2.1.1
|
Fri, 14 Aug 2015 09:45:01 +0200 |
Raimund Renkert |
Switch to shibboleth authorization in all REST-services.
|
Fri, 14 Aug 2015 09:44:31 +0200 |
Raimund Renkert |
Added shibboleth authorization.
|
Fri, 14 Aug 2015 09:43:29 +0200 |
Raimund Renkert |
Removed the OpenId authentorization files and dependencies.
|
Thu, 06 Aug 2015 09:59:22 +0200 |
Raimund Renkert |
Added tag 2.1.0 for changeset 1fa184bc2768
|
Thu, 06 Aug 2015 09:59:15 +0200 |
Raimund Renkert |
Updated version numbers.
2.1.0
|
Thu, 06 Aug 2015 09:56:09 +0200 |
Raimund Renkert |
Fixed probe object delete service.
|
Mon, 27 Jul 2015 12:58:34 +0200 |
Raimund Renkert |
Added README file.
|
Mon, 27 Jul 2015 12:58:03 +0200 |
Raimund Renkert |
Fixed some tests to fit the changed database.
|
Mon, 27 Jul 2015 12:57:35 +0200 |
Raimund Renkert |
Fixed possible NPE.
|
Mon, 27 Jul 2015 12:57:12 +0200 |
Raimund Renkert |
Fixed possible NPE.
|
Wed, 22 Jul 2015 16:03:33 +0200 |
Raimund Renkert |
Fixed NPE in probe validation rule.
|
Wed, 22 Jul 2015 16:03:03 +0200 |
Raimund Renkert |
Code style and documentation.
|
Mon, 20 Jul 2015 12:19:40 +0200 |
Raimund Renkert |
get all netzbetreiber without filtering.
|
Wed, 15 Jul 2015 14:21:34 +0200 |
Marco Lechner, Bundesamt fuer Strahlenschutz, SW 2.1 |
added autofill Mediadescription
|
Wed, 15 Jul 2015 14:17:02 +0200 |
Marco Lechner, Bundesamt fuer Strahlenschutz, SW 2.1 |
fixed lower case search field
|
Tue, 14 Jul 2015 17:02:27 +0200 |
Marco Lechner, Bundesamt fuer Strahlenschutz, SW 2.1 |
added intellij project stuff to hgignore
|
Fri, 10 Jul 2015 18:56:22 +0200 |
Raimund Renkert |
Added tag 2.0.2 for changeset 3f21fd768c5e
|
Fri, 10 Jul 2015 18:56:06 +0200 |
Raimund Renkert |
Updated version.
2.0.2
|
Fri, 10 Jul 2015 18:55:49 +0200 |
Raimund Renkert |
Removed tag 2.0.2
|
Fri, 10 Jul 2015 18:39:20 +0200 |
Raimund Renkert |
Added tag 2.0.2 for changeset aa04157e4a60
|
Fri, 10 Jul 2015 18:37:16 +0200 |
Raimund Renkert |
Updated version number.
|
Fri, 10 Jul 2015 18:29:51 +0200 |
Raimund Renkert |
Fixed deskriptor validation.
|
Fri, 10 Jul 2015 18:29:27 +0200 |
Raimund Renkert |
fixed delete probe service.
|
Fri, 10 Jul 2015 14:54:21 +0200 |
Raimund Renkert |
Added owner attribute to probe listing.
|
Fri, 10 Jul 2015 14:03:56 +0200 |
Raimund Renkert |
Fixed ort generation from messprogramme.
|
Fri, 10 Jul 2015 14:03:27 +0200 |
Raimund Renkert |
Refactored finding the umwelt id to be able to use it for messprogramme.
|
Fri, 10 Jul 2015 12:56:00 +0200 |
Raimund Renkert |
Find the correct umweltbereich.
|
Thu, 09 Jul 2015 17:12:15 +0200 |
Raimund Renkert |
Find the umw_id for probe objects.
|
Wed, 08 Jul 2015 09:42:22 +0200 |
Raimund Renkert |
Filter messgroessen by messmethode if mmtId is set.
|
Wed, 08 Jul 2015 09:41:47 +0200 |
Raimund Renkert |
Added logical or for integer lists.
|
Tue, 07 Jul 2015 11:58:46 +0200 |
Raimund Renkert |
Fixed descriptor validation.
|
Tue, 07 Jul 2015 11:56:36 +0200 |
Raimund Renkert |
Documentation.
|
Wed, 01 Jul 2015 15:28:57 +0200 |
Michael Stanko |
probequery.json extended
|
Wed, 17 Jun 2015 17:16:08 +0200 |
Raimund Renkert |
Added missing dependency 'openid4java'
|
Wed, 17 Jun 2015 17:06:22 +0200 |
Raimund Renkert |
Configuration for remote deployment in CI process.
|
Fri, 29 May 2015 15:31:47 +0200 |
Raimund Renkert |
Added tag 2.0 for changeset 6dd008066756
|
Fri, 29 May 2015 15:30:58 +0200 |
Raimund Renkert |
Set version to 2.0
2.0
|
Fri, 29 May 2015 13:10:30 +0200 |
Raimund Renkert |
Fixed or supressed warnings.
|
Fri, 29 May 2015 13:09:37 +0200 |
Raimund Renkert |
Removed unused loggers.
|
Fri, 29 May 2015 13:08:41 +0200 |
Raimund Renkert |
Organized imports.
|
Fri, 29 May 2015 11:48:04 +0200 |
Raimund Renkert |
Fixed validation rules for messung objects.
|
Fri, 29 May 2015 11:47:29 +0200 |
Raimund Renkert |
Check if the messung object has child objects in delete service.
|
Fri, 29 May 2015 11:46:45 +0200 |
Raimund Renkert |
Reload the created probe object to have the 'probeIdAlt' field available.
|
Fri, 29 May 2015 11:46:03 +0200 |
Raimund Renkert |
Fixed LAF exporter.
|
Fri, 22 May 2015 15:15:52 +0200 |
Raimund Renkert |
Validate messung, messwert and ort objects.
|
Fri, 22 May 2015 15:15:14 +0200 |
Raimund Renkert |
Fixed validation rules.
|
Fri, 22 May 2015 15:14:54 +0200 |
Raimund Renkert |
Do not send deskriptor fields with sn = '00'.
|
Fri, 22 May 2015 15:14:08 +0200 |
Raimund Renkert |
Removed plain sql statements.
|
Fri, 22 May 2015 15:13:44 +0200 |
Raimund Renkert |
Added AND NOT to query builder.
|
Fri, 22 May 2015 15:12:54 +0200 |
Raimund Renkert |
Use Postgis dialect to talk to the database.
|
Fri, 22 May 2015 15:11:40 +0200 |
Raimund Renkert |
Validate imported Ort objects.
|
Fri, 22 May 2015 15:10:53 +0200 |
Raimund Renkert |
Create SOrt objects in importer and removed plain sql statements.
|
Fri, 22 May 2015 15:10:16 +0200 |
Raimund Renkert |
Updated hibernate model.
|
Wed, 20 May 2015 11:45:01 +0200 |
Raimund Renkert |
Send mst and netzbetreiber in login response.
|
Wed, 20 May 2015 10:14:24 +0200 |
Raimund Renkert |
Removed filtering of messstellen.
|
Wed, 20 May 2015 10:13:58 +0200 |
Raimund Renkert |
New REST service delivering the server version.
|
Wed, 13 May 2015 13:57:50 +0200 |
Raimund Renkert |
Added tag 2.0-beta2 for changeset 3b1755df4f33
|
Wed, 13 May 2015 13:57:40 +0200 |
Raimund Renkert |
Increased version number.
2.0-beta2
|
Wed, 13 May 2015 13:57:23 +0200 |
Raimund Renkert |
Fixed Index out of Bounds exception in validation.
|
Wed, 13 May 2015 13:56:29 +0200 |
Raimund Renkert |
Removed tag 2.0-beta2
|
Wed, 13 May 2015 11:30:41 +0200 |
Raimund Renkert |
Added tag 2.0-beta2 for changeset fa149968e60d
|
Wed, 13 May 2015 11:23:29 +0200 |
Raimund Renkert |
Added validation rules for probe deskriptor.
|
Tue, 12 May 2015 15:19:52 +0200 |
Raimund Renkert |
Code doc.
|
Tue, 12 May 2015 15:19:30 +0200 |
Raimund Renkert |
Added REST interface for deskriptoren.
|
Tue, 12 May 2015 15:19:14 +0200 |
Raimund Renkert |
Updated deskriptoren model.
|
Tue, 12 May 2015 15:18:47 +0200 |
Raimund Renkert |
New REST interface to create probe objects from messprogramm.
|
Tue, 12 May 2015 15:18:03 +0200 |
Raimund Renkert |
Added probe factory. This factory creates probe objects(and its childs) from
|
Tue, 12 May 2015 15:16:40 +0200 |
Raimund Renkert |
Use the new usertype in messprogramm_messmethode.
|
Tue, 12 May 2015 15:16:05 +0200 |
Raimund Renkert |
Use the extended dialect for lada datasources.
|
Tue, 12 May 2015 15:15:27 +0200 |
Raimund Renkert |
Implemented new hibernate usertype: integer array; registered new type in dialect.
|
Tue, 05 May 2015 14:24:10 +0200 |
Raimund Renkert |
Added empty validation rules for ort objects.
|
Tue, 05 May 2015 14:23:45 +0200 |
Raimund Renkert |
Added validator for ort objects.
|
Tue, 05 May 2015 14:23:10 +0200 |
Raimund Renkert |
Renamed package for messwert validation rules.
|
Tue, 05 May 2015 14:10:15 +0200 |
Raimund Renkert |
Added new validation rules for messwert objects.
|
Tue, 05 May 2015 14:09:50 +0200 |
Raimund Renkert |
Added validator for messwert objects.
|
Tue, 05 May 2015 14:09:31 +0200 |
Raimund Renkert |
Added new validation rules for messung objects.
|
Thu, 30 Apr 2015 17:28:19 +0200 |
Raimund Renkert |
Added tests for messprogramm service.
|
Thu, 30 Apr 2015 17:27:40 +0200 |
Raimund Renkert |
Updated messprogramm model.
|
Thu, 30 Apr 2015 16:30:13 +0200 |
Raimund Renkert |
Updated tests to fit the new requirements (authorization).
|
Thu, 30 Apr 2015 16:27:28 +0200 |
Raimund Renkert |
Removed old filter query configuration.
|
Thu, 30 Apr 2015 16:26:56 +0200 |
Raimund Renkert |
Added resources for filter queries to test env.
|
Thu, 30 Apr 2015 16:26:08 +0200 |
Raimund Renkert |
Fixed project dependencies and openid authentication/authorization for tests.
|
Thu, 30 Apr 2015 16:25:01 +0200 |
Raimund Renkert |
Added authorization class for test env.
|
Thu, 30 Apr 2015 16:23:21 +0200 |
Raimund Renkert |
Fixed path for POST requests on kommentarm service.
|
Wed, 29 Apr 2015 22:55:14 +0200 |
Michael Stanko |
Added column probe_id_alt in query 4 in probequery.json
|
Mon, 27 Apr 2015 18:51:23 +0200 |
Raimund Renkert |
Added services for messprogramm and messprogrammmmt.
|
Mon, 27 Apr 2015 18:50:42 +0200 |
Raimund Renkert |
Added new query config for messprogramme and serve it via QueryService.
|
Mon, 27 Apr 2015 18:48:59 +0200 |
Raimund Renkert |
Updated model.
|
Mon, 27 Apr 2015 18:48:26 +0200 |
Raimund Renkert |
Added empty beans.xml
|
Fri, 24 Apr 2015 13:34:18 +0200 |
Raimund Renkert |
Changed artifactId to 'lada-server'.
|
Thu, 23 Apr 2015 10:48:44 +0200 |
Raimund Renkert |
Code documentation.
|
Thu, 23 Apr 2015 10:44:19 +0200 |
Raimund Renkert |
listen to /object/{id} on PUT requests.
|
Thu, 23 Apr 2015 10:40:36 +0200 |
Raimund Renkert |
Code documentation.
|
Thu, 23 Apr 2015 08:45:25 +0200 |
Raimund Renkert |
Code documentation.
|
Wed, 22 Apr 2015 14:03:53 +0200 |
Raimund Renkert |
Code documentation.
|
Wed, 22 Apr 2015 09:18:29 +0200 |
Raimund Renkert |
Code documentation.
|
Mon, 20 Apr 2015 17:45:22 +0200 |
Raimund Renkert |
Code style and comments.
|
Mon, 20 Apr 2015 17:07:27 +0200 |
Raimund Renkert |
Code style and comments.
|
Mon, 20 Apr 2015 17:06:31 +0200 |
Raimund Renkert |
Replaced native query by criteria query.
|
Mon, 20 Apr 2015 17:04:50 +0200 |
Raimund Renkert |
Added methods for sql 'IN' queries.
|
Fri, 17 Apr 2015 15:19:39 +0200 |
Raimund Renkert |
Added tag 2.0-beta1 for changeset d9add6cd8f06
|
Fri, 17 Apr 2015 15:18:10 +0200 |
Raimund Renkert |
Updated query configsUpdated qunfigs..
2.0-beta1
|
Fri, 17 Apr 2015 14:14:11 +0200 |
Raimund Renkert |
Removed '\r' from laf exporter.
|
Fri, 17 Apr 2015 14:05:01 +0200 |
Raimund Renkert |
Add '\r\n' at the end of a line in laf-export files.
|
Fri, 17 Apr 2015 13:24:55 +0200 |
Raimund Renkert |
Added validation rule for probe.probeart.
|
Fri, 17 Apr 2015 13:23:17 +0200 |
Raimund Renkert |
Removed log messages.
|
Fri, 17 Apr 2015 13:22:45 +0200 |
Raimund Renkert |
Removed @Stateless annotations.
|
Fri, 17 Apr 2015 13:21:32 +0200 |
Raimund Renkert |
Updated importer: Do validation and object creation in the correct order.
|
Fri, 17 Apr 2015 13:17:45 +0200 |
Raimund Renkert |
Updated importer response item to take objects as value.
|
Thu, 16 Apr 2015 17:04:09 +0200 |
Raimund Renkert |
Use dynamic update/insert for *_translation tables
|
Thu, 16 Apr 2015 15:50:02 +0200 |
Raimund Renkert |
Added REST services for Im-/Export for laf files.
|
Thu, 16 Apr 2015 15:49:27 +0200 |
Raimund Renkert |
Added importer configuration.
|
Thu, 16 Apr 2015 15:49:04 +0200 |
Raimund Renkert |
Added importer impl for laf file format.
|
Thu, 16 Apr 2015 15:48:27 +0200 |
Raimund Renkert |
Added exporter impl. for laf file format.
|
Thu, 16 Apr 2015 15:47:30 +0200 |
Raimund Renkert |
Added interface and annotation for importer.
|
Thu, 16 Apr 2015 15:46:51 +0200 |
Raimund Renkert |
Added interface and annotation for exporter.
|
Thu, 16 Apr 2015 15:46:09 +0200 |
Raimund Renkert |
Updated persistence units.
|
Thu, 16 Apr 2015 15:45:26 +0200 |
Raimund Renkert |
Split header and query authentication.
|
Thu, 16 Apr 2015 15:44:19 +0200 |
Raimund Renkert |
Added method to check authorization with user infos and db object.
|
Thu, 16 Apr 2015 15:43:15 +0200 |
Raimund Renkert |
Made probe_id_alt and messungs_id_alt insertable.
|
Wed, 08 Apr 2015 10:45:55 +0200 |
Raimund Renkert |
Fixed messung delete operation.
|
Wed, 08 Apr 2015 10:45:27 +0200 |
Raimund Renkert |
Use the authorization filter in all REST operations.
|
Wed, 08 Apr 2015 10:44:24 +0200 |
Raimund Renkert |
Handle authorization of messung objects in a separate way.
|
Wed, 08 Apr 2015 10:43:21 +0200 |
Raimund Renkert |
Check the parents tree_modified timestamp for locking.
|
Wed, 08 Apr 2015 10:42:09 +0200 |
Raimund Renkert |
Updated owner getter/setter in probe.
|
Wed, 08 Apr 2015 10:41:33 +0200 |
Raimund Renkert |
Added new field to model classes to have the parent tree_modified timestamp available.
|
Wed, 25 Mar 2015 16:26:46 +0100 |
Raimund Renkert |
Update the 'letzteAenderung' field.
|
Wed, 25 Mar 2015 16:20:01 +0100 |
Raimund Renkert |
Use timestamp locker in REST services.
|
Wed, 25 Mar 2015 16:18:34 +0100 |
Raimund Renkert |
Added concrete class to lock objects based on the tree_modified timestamp.
|
Wed, 25 Mar 2015 16:17:41 +0100 |
Raimund Renkert |
Added interface, annotation and enum for Lock mechanism.
|
Wed, 25 Mar 2015 16:16:33 +0100 |
Raimund Renkert |
Added new column 'tree_modified' to entity classes.
|
Wed, 25 Mar 2015 16:14:25 +0100 |
Raimund Renkert |
Fixed hauptproben_nr validation.
|
Wed, 25 Mar 2015 16:12:49 +0100 |
Raimund Renkert |
Updated log4j config.
|