diff --git a/.circleci/config.yml b/.circleci/config.yml index e925a6c3..fe9a9ffa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,6 +17,6 @@ jobs: - run: mvn -B install -Psamply - setup_remote_docker - - run: docker build -t martinbreu/samply-connector:latest . + - run: docker build -t martinbreu/samply-connector:${CIRCLE_SHA1} . - run: docker login -u martinbreu -p "${DOCKER_HUB_PASSWD}" - - run: docker push martinbreu/samply-connector:latest + - run: docker push martinbreu/samply-connector:${CIRCLE_SHA1} diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..33ac41c0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,29 @@ +**Describe your problem.** + +A clear and concise description of what the problem is. + + +**If it is a bug name steps to reproduce** + +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + + +**If it is a bug complete the following information:** + + - Version: [e.g. 1.2.3] + - OS: [e.g. Windows, Linux, OS X] + - Browser: [e.g. chrome, firefox, safari] + + +**Describe the solution you'd like** + +A clear and concise description of what you want to happen. + + +**Additional context** + +Add any other context or screenshots about the feature request here. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..6e5061ae --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +**What's in the PR** +* ... + +**How to test manually** +* ... diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..fa4df8a3 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,32 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: [ push, pull_request ] + +jobs: + build: + + runs-on: ubuntu-latest + services: + postgres: + image: postgres + env: + POSTGRES_DB: samply.connector + POSTGRES_PASSWORD: samply + POSTGRES_USER: samply + POSTGRES_HOST: localhost + ports: + - 5432:5432 + + steps: + - uses: actions/checkout@v2 + + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 8 + + - name: Build with Maven + run: mvn -B package -P samply diff --git a/CHANGELOG.md b/CHANGELOG.md index 78ca305d..5fa79fe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [7.0.0 - 2020-11-27] +- Github release +### Changed +- Samply parent 11.1.0 +## Added +- Github Actions +- Google Code Style +### Bugfix +- fixed functional tests for BLAZE + ## [6.13.0 - 2020-10-14] ### Changed - changed locale default from de to en diff --git a/GETTINGSTARTED.md b/GETTINGSTARTED.md new file mode 100644 index 00000000..bbe67fa1 --- /dev/null +++ b/GETTINGSTARTED.md @@ -0,0 +1,95 @@ +# Getting started + +## Cloning the repository + +Choose or create a directory for the repository to get cloned into, such as your Desktop. This is the directory we'll be working out of, so pick somewhere convenient. + +Using a CLI, run the following command in the directory: `git clone https://github.com/samply/share-client.git` + +Once the command has finished executing, you should have a copy of this repository named `share-client` inside your project directory. + +## Setting up the environment + +### Requirements + +You will need [Intelj IDEA](https://www.jetbrains.com/idea/) (the community edition is freely available for download) and [Java SDK](https://www.oracle.com/java/technologies/javase-downloads.html) to build the project, aswell as [Maven](https://maven.apache.org/). + +## Working in this repository + +From now on, whenever you want to make a change in the repository, you will first need to branch off the master branch. Using a CLI in the `share-client` directory, first check if the master branch is fully up to date: + +``` +git checkout master +git fetch +git pull +``` + +Now you can create a new branch. Please use the `feature-` prefix so that it's clear that your branch is a temporary, in-progress development branch. Creating your branch can be done using one of two methods: + +### CLI + +Simply enter `git checkout -b feature-somenamehere` to have a branch created for you. + +### GitHub for Desktop + +In the application, go to ``Branch -> New branch...``. Give this an appropriate name (don't forget the prefix) and ensure that the branch is based on the `master` branch. + + +### Test your changes +After you are done with your changes, you need to test it locally before you create a new pull request. +This can be done using [Tomcat](#tomcat) or [Docker](#docker). + +#### Tomcat +If you do not have [Tomcat](http://tomcat.apache.org/) please install the newest version of it. +Then do the following steps: +* Add Tomcat to the "Run/Debug Configurations" of Intellij +* In the "Server" tab you can choose the port of Tomcat (default 8080) +* Go to the "Deployment" tab and add the "share-client:war" artifact + +#### Postgres +You also need [Postgres](https://www.postgresql.org/download/) for the manual version of deploying. +The connector uses jooq and flyway to create the database. + +Depends on which maven profile you use, the configuration for the postgres can change. +In the [pom.xml](https://github.com/samply/share-client/blob/master/pom.xml) you can see the configurations for each profile. +Please create the user and the database in postgres according to the selected profile. +After you created the database run in Intellij the command `mvn flyway:clean flyway:migrate jooq-codegen:generate` to initialise the empty database. + +After the configuration of Tomcat and Postgres run the maven command `mvn clean install` and run Tomcat in Intellij to deploy and run the connector with your changes. + +#### Docker (Only works with Maven profile "samply") +If you want to use [Docker](https://www.docker.com/) for testing your changes you can do it by running the following commands. +* `mvn clean install` to create a WAR-file for the Docker image +* Run at the directory of the share-client project the following script to deploy a Postgres container and then a connector container: + + + + docker rm pg-connector + + docker run \ + --name pg-connector \ + -e POSTGRES_USER=samply \ + -e POSTGRES_DB=samply.connector \ + -e POSTGRES_PASSWORD=samply \ + -p 5432:5432 \ + postgres:9.6 + + docker rm connector + + docker build . -t connector:latest + + docker run \ + --name=connector \ + -p 8082:8080 \ + -e POSTGRES_HOST='pg-connector' \ + -e POSTGRES_DB='samply.connector' \ + -e POSTGRES_USER='samply' \ + -e POSTGRES_PASS='samply' \ + -e MDR_URL='https://mdr.germanbiobanknode.de/v3/api/mdr' \ + -e STORE_URL='http://store:8080' \ + -e QUERY_LANGUAGE='CQL' \ + -e CATALINA_OPTS='"-Xmx2g"' \ + connector + +### Pull Request +After you tested your changes you can create on Github a new pull request. Please merge new feature branches only into develop. diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..508c51ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 The Samply Development Community + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index cbc35c58..6d1d0af1 100644 --- a/README.md +++ b/README.md @@ -1,345 +1,23 @@ +UNMERGED BRANCH -CHANGES FROM OTHER SAMPLY TEAMS MISSING # Connector -The Connector (or "Samply Share Client" or "Teiler" ) connects Store and [Searchbroker](https://code.mitro.dkfz.de/projects/SHAR/repos/samply.share.broker.rest) as part of the [Bridgehead-Deployment](https://github.com/samply/bridgehead-deployment). -Currently the [classic Store](https://code.mitro.dkfz.de/projects/STOR/repos/samply.store.rest) is used, in future [Blaze](https://github.com/life-research/blaze). - -You can access the Connector under http://localhost:8082 and login under (default credentials are **admin**, **adminpass**). -By default the Connector and Store use the same default credentials (**local_admin**, **local_admin**). - -To change the default credentials for Connector & Store add a new user to the Connector and add credentials satisfying - -|Key|Value| -|---|---| -|Target| Local Datamanagement| -|CredentialType| Basic | -|Username| [username of new user] | -|Password| [password of new user] | -|Domain|| -|Workstation|| - -If the Store runs while logging in the first time with this new user, the default credentials of the Store get deactivated. From now on, Connector and Store share the same new credentials instead of the old ones. +The Connector (or "Samply Share Client" or "Teiler" ) connects the [Blaze](https://github.com/life-research/blaze) store and the central Sample-Locator which consists of two modules, [UI](https://github.com/samply/sample-locator) and [backend](https://github.com/samply/share-broker-rest), as part of the [Bridgehead-Deployment](https://github.com/samply/bridgehead-deployment). To register a Searchbroker, see [Bridgehead-Deployment](https://github.com/samply/bridgehead-deployment#connect-sample-locator). [Manifest](https://samply.github.io/manifest) -## Build - -Requirements: - -- [Java 8](#java) -- [Database](#database) -- Maven - -``` -git clone ssh://git@code.mitro.dkfz.de:7999/shar/samply.share.client.v2.git -cd samply.share.client.v2 -mvn clean install -Psamply -``` - - -## Run ([Docker](#docker) or [Manual](#manual)) - -### Docker - -Use the Docker-Compose of the [GBA-Bridgehead](https://github.com/samply/bridgehead-deployment) and run only the Connector with: - -``` -docker-compose up connector -``` - -#### Or build and run manually: - -If postgres connection errors occur, try your ip for POSTGRES_HOST. For all Environments, see `/src/docker/start.sh` - - docker network create gba - - - docker rm pg-connector - - docker run \ - --name pg-connector \ - --network=gba \ - -e POSTGRES_USER=samply \ - -e POSTGRES_DB=samply.connector \ - -e POSTGRES_PASSWORD=samply \ - -p 5432:5432 \ - postgres:9.6 - - - docker rm connector - - docker build . -t connector:latest - - docker run \ - --name=connector \ - --network=gba \ - -p 8082:8080 \ - -e POSTGRES_HOST='pg-connector' \ - -e POSTGRES_DB='samply.connector' \ - -e POSTGRES_USER='samply' \ - -e POSTGRES_PASS='samply' \ - -e MDR_URL='https://mdr.germanbiobanknode.de/v3/api/mdr' \ - -e STORE_URL='http://store:8080' \ - -e QUERY_LANGUAGE='CQL' \ - -e CATALINA_OPTS='"-Xmx2g"' \ - connector:latest - - -### Manual - -Requirements: - -- [Database](#database) -- [Tomcat](#tomcat) -- The Connector webapp as .war file: [build yourselve](#build) or download from release tab of Github - - - -Steps: - -- Delete folder ${tomcat.home}/webapps/ROOT. -- Rename .war file to ROOT.war -- Copy ROOT.war to ${tomcat.home}/webapps/ - -Start tomcat by executing ${tomcat.home}/bin/startup.sh (Windows: startup.bat) or by running the tomcat-service if you [created one.](#tomcat-service-for-autostart) - - -## Environment - -### Database - -The Open-Source database Postresql 9.6 is used. The database connection uses the connection pool of Tomcat. - -This webapp needs schema '**samply**' in the database '**samply.connector**' under user '**samply**' and password '**samply**' under port `5432`. - -To change these settings during build, search for these values in the **src/pom.xml** and adapt to your needs. -During run, see context.xml (described under [Configurations](#Configurations)). - - - -- Follow installation for port **5432** - - - Windows: https://www.enterprisedb.com/downloads/postgres-postgresql-downloads - - Linux Mint: - - ``` - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" > /etc/apt/sources.list.d/postgresql.list' - - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - - sudo apt-get install postgresql-9.6 - ``` - - ​ Other Linux: - - ``` - sudo add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -sc)-pgdg main" - - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - - sudo apt-get install postgresql-9.6 - ``` - -- Create database and user: - - - pgAdmin installed: Having Server opened, under "Databases": rightclick on "Login/Group Roles". Select "Create"?"Login/Group Role". Tab Generel: Enter Name. Tab Definition: Enter Password. Tab Privileges: enable "Can Login?" and "Superuser". By creating new Databases, select this user as "Owner"* - - - command line: - - ``` - (sudo su postgres) - psql - CREATE DATABASE "samply.searchbroker"; - CREATE USER samply WITH PASSWORD 'samply'; - GRANT ALL PRIVILEGES ON DATABASE "samply.searchbroker" to samply; - ``` - - - -### Tomcat - -Requirements: - -- [Java 8](#java) - - - -1. Download and unzip: http://mirror.funkfreundelandshut.de/apache/tomcat/tomcat-8/v8.5.38/bin/apache-tomcat-8.5.38.zip (eg. to /opt/tomcat-connector) - -2. Change ports: Every webapp has its own tomcat, so change ports for Store-Tomcat in ${tomcat.base}/conf/server.xml: - - ``` - ... - ...... - ... - ... ... - ... - ...... - ... - ``` - - - -### Java - -Is a dependency of tomcat, - -if you install different jre versions on this machine, set jre 8 for tomcat by creating a so called "setenv.sh". - -Linux: [OpenJDK](https://openjdk.java.net/install/) - -Windows: [Oracle](https://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) - - - -### Configurations - -These configuration files are used: - -``` -src/main/java/webapp/WEB-INF/conf/ -(log4j2.xml, mailSending.xml, samply_bridgehead_info.xml, samply_common_config.xml, samply_common_operator.xml, samply_common_urls.xml) - -src/main/java/webapp/META-INF/ -(context.xml) -``` - -The `context.xml` will be auto-copied by tomcat at startup to `${tomcat.base}/conf/Catalina/localhost/ROOT.xml`. -This file will not be overwritten by updating the WAR file due to tomcat settings. - -All files under `WEB-INF/conf` will always be found from FileFinder as ultimate fallback. - -If you want to save your configurations, copy all files under `WEB-INF/conf` (tomcat or code source) to `${tomcat.base}/conf`. - -**IntelliJ** creates a *tomcat.base* directory for every startup of the application. So save your configuration files to *tomcat.home* and it will copy these files and logs every time to *tomcat.base*. You will see the paths at startup in the first lines of the console output. - -According to the `log4j2.xml`, all logs can be found in ${tomcat.base}/logs/connector. - -To use a **proxy**, set your url in file **samply_common_config.xml**. - -#### Configuration files - -bridgehead_info.xml: -``` - - name of the bridgehead - url of the centralsearch server (only for dktk) - url of the decentrealsearch server - name of the querylanguage (CQL or QUERY) - -``` -common_urls.xml: -``` - - Ip of the connector - url of the id-manager (only for dktk necessary) - url of the local data management - url of the mdr server - url of the directory - -``` -common_operator.xml: -``` - - - first name from the bridgehead admin - - last name from the bridgehead admin - - email from the bridgehead admin - - phone number from the bridgehead admin - -``` - -common_config.xml -``` - - - - - url of the proxy server - username for the proxy server - password for the proxy server - - - url of the proxy server - username for the proxy server - password for the proxy server - - - - hosts where the proxy should not be used - - - -``` - -#### Directory Sync: -Add the directory credentials at the admin page "credentials" so that the directory synchronization can work. -The job will terminate at 03:00 every day. -For more information about the directory sync go to: -https://github.com/samply/directory-sync - - - -### Productive Settings - -#### Tomcat service for autostart - -​ Linux: - -​ Remember path of output: - -``` -sudo update-java-alternatives -l - -``` - -​ Create new service file: - -``` -sudo nano /etc/systemd/system/tomcat-connector.service - -``` - -​ Copy the remembered path to JAVA_HOME and add `/jre` to the end of this path, also check tomcat path: - -``` -[Unit] -Description=Apache Tomcat Web Application Container -After=network.target - -[Service] -Type=forking - -Environment=JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre -Environment=CATALINA_PID=/opt/tomcat-connector/temp/tomcat.pid -Environment=CATALINA_HOME=/opt/tomcat-connector -Environment=CATALINA_BASE=/opt/tomcat-connector -Environment='CATALINA_OPTS=-Xms512M -Xmx1024M -server -XX:+UseParallelGC' -Environment='JAVA_OPTS=-Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom' - -ExecStart=/opt/tomcat-connector/bin/startup.sh -ExecStop=/opt/tomcat-connector/bin/shutdown.sh - -User=tomcat -Group=tomcat -UMask=0007 -RestartSec=10 -Restart=always - -[Install] -WantedBy=multi-user.target - -``` - - - -​ Windows: +## Building -​ Follow installer: http://ftp.fau.de/apache/tomcat/tomcat-8/v8.5.38/bin/apache-tomcat-8.5.38.exe +Check [GETTINGSTARTED.md](https://github.com/samply/share-client/blob/master/GETTINGSTARTED.md) for the detailed steps. -​ And check service (one per app/tomcat): http://www.ansoncheunghk.info/article/5-steps-install-multiple-apache-tomcat-instance-windows \ No newline at end of file +## License + +Copyright 2020 The Samply Development Community + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_de.properties b/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_de.properties deleted file mode 100644 index 5cc5a1a1..00000000 --- a/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_de.properties +++ /dev/null @@ -1,466 +0,0 @@ -# translations for commonly used words -common_yes=Ja -common_no=Nein -common_save=Speichern -common_cancel=Abbrechen -common_error=Fehler -common_delete=L\u00F6schen -common_username=Benutzername -common_password=Passwort -common_changePassword=Passwort \u00E4ndern -common_email=E-Mail Adresse -common_changeEmail=E-Mail Adresse \u00E4ndern -common_wrongPassword=Falsches Passwort -common_passwordMismatch=Passw\u00F6rter stimmen nicht \u00FCberein -common_passwordChanged=Passwort erfolgreich ge\u00E4ndert -common_passwordChangeTitle=Passwort \u00E4ndern -common_logout=Abmelden -common_selectFile=Datei ausw\u00E4hlen - -ConfigurationController_configuration=Konfiguration -ConfigurationController_configurationSaved=Konfiguration gespeichert -LoginController_loginFailedMessage=Anmeldeinformationen ung\u00FCltig -LoginController_loginFailedTitle=Fehler bei der Anmeldung - -#WebUtils -WebUtils_caseDateYear=aus dem Jahr -WebUtils_caseDateUnknown=unbekannten Datums - -# Inquiry Status Enum -IS_NEW=neu -IS_ARCHIVED=archiviert -IS_PROCESSING=wird bearbeitet -IS_LDM_ERROR=Fehler (LDM) - -# index.xhtml -index_ldm=Lokales Datenmanagement -index_idmanager=ID-Manager -index_teiler=Teiler -index_unreachable=Nicht erreichbar - -# configuration.xhtml -configuration_title=Konfiguration -configuration_manageCredentials=Zugangsdaten verwalten -configuration_manageCredentialsLink=Zur Zugangsdatenverwaltung -configuration_centralSearch=Zentrale Suche -configuration_centralSearchBaseUrl=URL der zentralen Suche -configuration_centralSearchPath=Standortspezifischer Pfad -configuration_noCentralSearchPath=Verbindung zur zentralen MDS Datenbank nicht konfiguriert -configuration_noCentralSearchPathDetails=Der standortspezifische Pfad der zentralen MDS Datenbank ist nicht konfiguriert. Sie k\u00F6nnen dies auf der Konfigurationsseite korrigieren. -configuration_disabledDbTooltip=Diese Einstellung wird Ihnen hier nur zur Information angezeigt. Sollten Sie diese \u00E4ndern wollen, m\u00FCssen Sie dies direkt in der Datenbank tun. -configuration_disabledXmlTooltip=Diese Einstellung wird Ihnen hier nur zur Information angezeigt. Sollten Sie diese \u00E4ndern wollen, m\u00FCssen Sie dies direkt im entsprechenden Config-File tun. -configuration_monitoring=\u00DCbermittlung von Metadaten -configuration_seconds=Sekunden -configuration_days=Tage -configuration_interfaces=Schnittstellen zu anderen Komponenten -configuration_mdr=Metadata Repository -configuration_mdrUrl=MDR URL -configuration_mdrMdskGroup=URN der MDS-K Datenelementgruppe -configuration_mdrMdsbGroup=URN der MDS-B Datenelementgruppe -configuration_ldmUrl=URL des lokalen Datenmanagements -configuration_ldmEnableCaching=Caching von Ergebnissen aktivieren -configuration_ldmCachingMaxSize=Maxmiale Anzahl von Seiten im Cache -configuration_ldmCachingMaxSizeValidationError=Bitte eine nat\u00FCrliche Zahl zwischen 1 und 5000 eingeben -configuration_idManagerUrl=ID Manager URL -configuration_networkSettings=Netzwerkeinstellungen -configuration_httpProxy=HTTP Proxy -configuration_httpsProxy=HTTPS Proxy -configuration_uploadPatientsWithLocalConsent=Patienten mit lokaler Einwilligung hochladen -configuration_sendTotalCount=Gesamtzahl Patienten \u00FCbermitteln -configuration_sendDktkCount=Anzahl der Patienten mit DKTK Flag \u00FCbermitteln -configuration_sendReferenceQueryCount=Anzahl der Patienten f\u00FCr Referenzquery \u00FCbermitteln -configuration_sendReferenceQueryTime=Ausf\u00FChrungszeit des Referenzquery \u00FCbermitteln -configuration_sendCentraxxMappingVersion=Centraxx SQL Mappingversion \u00FCbermitteln -configuration_misc=Sonstiges -configuration_mailNotifyEmptyResults=Suchanfragen ohne Ergebnis in E-Mails aufnehmen - -configurationTimings=Timings -configurationTimings_collectInquiriesInterval=Suchanfragen abholen alle -configurationTimings_checkInquiryStatusInitialDelay=Erstmalige Wartezeit zwischen Anfrage stellen und Status pr\u00FCfen -configurationTimings_checkInquiryStatusStatsRetryInterval=Wartezeit zwischen zwei Versuchen, Ergebnisstatistiken abzurufen -configurationTimings_checkInquiryStatusStatsRetryAttempts=Anzahl der Versuche, Ergebnisstatistiken abzurufen -configurationTimings_checkInquiryStatusResultsRetryInterval=Wartezeit zwischen zwei Versuchen, Ergebnisdatens\u00E4tze abzurufen -configurationTimings_checkInquiryStatusResultsRetryAttempts=Anzahl der Versuche, Ergebnisdatens\u00E4tze abzurufen -configurationTimings_parseException=Bitte eine nat\u00FCrliche Zahl eingeben -configurationTimings_archiveInquiries=Anfragen archivieren nach - -# c_loginPanel.xhtml -loginPanel_login=Anmeldung -loginPanel_doLogin=Anmelden - -# dashboard.xhtml -dashboard_title=\u00DCbersicht -dashboard_configuration=Konfiguration -dashboard_configurationDetails=Verwalten Sie die Einstellungen Ihres Teilers -dashboard_schedule=Geplante Aufgaben -dashboard_scheduleDetails=Aufgaben derzeit geplant -dashboard_qualityReport=Qualit\u00E4tsbericht -dashboard_qualityReportDetails=Hier k\u00F6nnen Sie Qualit\u00E4tsberichte erzeugen und ansehen -dashboard_brokerList=Suchbroker -dashboard_brokerListDetails=derzeit registrierte Suchbroker -dashboard_eventLog=Log -dashboard_eventLogDetails=Ereignisse \u00FCberpr\u00FCfen -dashboard_inquiryHandling=Behandlung von Suchanfragen -dashboard_inquiryHandlingDetails=Hier k\u00F6nnen Sie einstellen, wie eingehende Suchanfragen behandelt werden sollen -dashboard_userList=Benutzer -dashboard_userListDetails=Benutzer verwalten -dashboard_credentials=Zugangsdaten -dashboard_credentialsDetails=Zugangsdaten f\u00FCr Suchbroker und andere Dienste verwalten -dashboard_uploads=Uploads -dashboard_uploadsDetails=Liste vorheriger uploads -dashboard_inquiriesList=Suchanfragen -dashboard_inquiriesListDetails=Suchanfragen derzeit -dashboard_inquiriesError=Fehlerhafte Suchanfragen -dashboard_inquiriesErrorDetails=Suchanfragen, die nicht korrekt ausgef\u00FChrt wurden -dashboard_inquiriesArchive=Archivierte Anfragen -dashboard_inquiriesArchiveDetails=Suchanfragen im Archiv derzeit -dashboard_tests=Funktionstests -dashboard_testsDetails=\u00DCberpr\u00FCfen Sie die Kommunikation mit anderen Komponenten - -# export.xhtml -export_criteria=Exportkriterien -export_dateConjunction=und -pleaseWait=Bitte warten -export_saveModalTitle=Export-Vorlage speichern -export_setName=Bitte geben sie einen Namen zum Speichern der Export-Vorlage ein: -export_query=Suchkriterien f\u00FCr Patienten - -# chart*.xhtml -charts_query=Patientenmenge einschr\u00E4nken -charts_setName=Bitte geben sie einen Namen zum Speichern der Auswertung ein: -charts_noChart=Keine Daten vorhanden -charts_nofOccurences=Anzahl der Patienten -charts_deleteChartModalTitle=Diagramm l\u00F6schen -charts_deleteChartText=Wollen Sie das Diagramm mit dem Parameter "{0}" wirklich l\u00F6schen? -charts_deleteChart=Diagramm l\u00F6schen - -# event_log.xhtml -el_title=Log -el_timestamp=Zeitpunkt -el_message=Nachricht - -# qualityreport_list.xhtml -qr_title=Qualit\u00E4tsbericht -qr_generation=Generieren -qr_inProgress=Qualit\u00E4tsbericht in Bearbeitung... -qr_timestamp=Zeitstempel -qr_version=Version -qr_consumedTime=Bisherige Laufzeit -qr_remainingTime=Restlaufzeit -qr_startTime=Startzeit - -# job_list.xhtml -jl_title=Geplante Aufgaben -jl_info=Die folgende Liste zeigt diejenigen Aufgaben an, die regelm\u00E4\u00DFig ausgef\u00FChrt werden. Sie k\u00F6nnen die Ausf\u00FChrungszeiten hier anpassen. Sollten Sie Hilfe bzgl. des Formats ben\u00F6tigen, finden Sie diese z.B. auf http://www.cronmaker.com/ -jl_jobGroup=Gruppe -jl_jobDescription=Beschreibung -jl_cronExpression=Cron Expression -jl_nextFireTime=N\u00E4chste Ausf\u00FChrung -jl_previousFireTime=Vorherige Ausf\u00FChrung -jl_rescheduleJobs=Speichern -jl_fireNow=Jetzt starten -jl_actions=Aktionen -jl_suspend=Anhalten -jl_resume=Fortsetzen - -# rorList.xhtml -ror_list=Registerverzeichnisliste -ror_url=Adresse - -# brokerList.xhtml -bl_title=Suchbrokerliste -bl_broker=Broker -bl_status=Status -bl_lastCheck=Zuletzt abgerufen -bl_completeActivation=Aktivieren -bl_joinNewBroker=Neuem Suchbroker beitreten -bl_newAdress=Broker Adresse -bl_newAdressRequiredMsg=Bitte Adresse eingeben -bl_newEmail=Ihre Email Adresse -bl_emailRequiredMsg=Bitte Email Adresse eingeben -bl_joinBtn=Beitreten -bl_requestFullResultsTooltip=Wenn aktiviert, werden direkt nach der Anfrage, die Ergebnisdatens\u00E4tze vom lokalen Datenmanagement berechnet. Die kann mitunter viel Zeit in Anspruch nehmen. Daher kann es hilfreich sein, dies zu deaktivieren. Bei \u00E4lteren Versionen der REST-Schnittstelle kann unter Umst\u00E4nden die Option nicht deaktiviert werden, -bl_requestFullResults=Erg. anfordern - -# BrokerStatusType -BS_UNREACHABLE=Unerreichbar -BS_USER_UNKNOWN=Unbekannter Nutzer -BS_AUTHENTICATION_ERROR=Anmeldung fehlgeschlagen -BS_ACTIVATION_PENDING=Aktivierung steht aus -BS_OK=OK - -# userList.xhtml -ul_title=Benutzerverwaltung -ul_createNewUser=Neuen Benutzer anlegen -ul_userCreated=Benutzer angelegt -ul_passwordRepeat=Passwort wiederholen -ul_usernameRequiredMsg=Bitte geben Sie einen Benutzernamen ein -ul_passwordRequiredMsg=Bitte geben Sie ein Passwort ein -ul_passwordRepeatRequiredMsg=Bitte wiederholen Sie das Passwort -ul_createBtn=Anlegen -ul_setNewPassword=Neues Passwort -ul_notifyBiomaterial=Per E-Mail bei Anfragen zu Biomaterial benachrichtigen -ul_notifyClinicalData=Per E-Mail bei Anfragen zu klinischen Daten benachrichtigen -ul_notifyPatients=Per E-Mail bei Anfragen zu Studienpatienten benachrichtigen -ul_userNameExists=Username existiert bereits - -# showInquiry.xhtml -si_title=Suchanfrage anzeigen -si_noDescription=Der Anfragesteller hat keinen Beschreibungstext eingegeben. -si_inquiry=Suchanfrage -si_description=Beschreibung -si_downloadExpose=Expos\u00E9 herunterladen -si_contact=Kontakt -si_phone=Telefonnummer -si_subject=Ihre Anfrage -si_institution=Institution -si_criteria=Suchkriterien -si_executeInquiry=Anfrage erneut ausf\u00FChren -si_matchingResults=Passende Datens\u00E4tze ({0}) -si_exportResults=Exportieren -si_details=Details der Anfrage -si_events=Verlauf -si_reply=Beantworten -si_replyHeader=Antwort -si_replySent=Bereits beantwortet -si_archive=Archivieren -si_resultsHidden=Ergebnisliste deaktiviert -si_resultsHiddenDetails=Die Anzeige von Ergebnissen wurde durch den Br\u00FCckenkopfadministrator deaktiviert. -si_resultsNotDone=Ergebnisse liegen derzeit nicht vor -si_resultsNotDoneDetails=Die erste Ergebnisseite kann derzeit nicht abgerufen werden. -si_resultsNotAvailable=Ergebnisse liegen nicht vor -si_resultsStatsOnly=Nur Statistiken abgefragt -si_resultsStatsOnlyCount=In Ihrem System wurden {0} passende Datens\u00E4tze zur Anfrage gefunden. -si_resultsStatsOnlyDetails=F\u00FCr diese Anfrage wurden nur Statistiken erstellt aber keine Ergebnisliste. Sie k\u00F6nnen die Anfrage erneut ausf\u00FChren, mit Erzeugung von Ergebnissen, indem Sie den den entsprechenden Knopf ganz oben auf der Seite dr\u00FCcken und in der Dropdown-Liste die entsprechende Option w\u00E4hlen. -si_resultsError=Fehlermeldung vom lokalen Datenmanagement -si_resultsErrorDetails=Bei der Vearbeitung der Anfrage wurde vom lokalen Datenmanagement ein Fehler berichtet. Pr\u00FCfen Sie die Meldung indem Sie im Verlauf Tab weiter oben auf dieser Seite, den neusten stats Link ansehen. -si_executeInquiryStatsOnlyFalse=Ergebnisliste erzeugen -si_executeInquiryStatsOnlyTrue=Nur Anzahl abfragen -si_showQuery=Query anzeigen -si_showStats=Stats anzeigen -si_generating=Wird erzeugt -si_exportToExcel=Export in Tabellenkalkulation -si_handleInvalidEntries=Syntaktische Validierung -si_graphs=Diagramme -si_documents=Dokumente -si_document=Dokument -si_actions=Aktionen -si_noDocuments=Keine Dokumente angeh\u00E4ngt -si_uploadedAt=Hochgeladen am -si_noResults=Die Anfrage lieferte keine Ergebnisse - -# inquiries_list.xhtml / archived-inquiries.xhtml / erroneous-inquiries.xhtml -inqs_inquiriesActiveTitle=Aktive Suchanfragen -inqs_inquiriesErroneousTitle=Fehlgeschlagene Suchanfragen -inqs_inquiriesArchiveTitle=Archivierte Suchanfragen -inqs_source=Quelle -inqs_receivedAt=Erhalten am -inqs_archivedAt=Archiviert am -inqs_answeredAt=Beantwortet am -inqs_reply=Antwort -inqs_found=Gefundene Datens\u00E4tze -inqs_asOf=Stand vom -inqs_searchingFor=Suche nach -inqs_noResults=Keine Ergebnisse -inqs_noLabel=Unbenannte Anfrage -inqs_errorCode=Fehlercode -inqs_abandoned=Status\u00FCberpr\u00FCfung beendet -inqs_processing=wird berechnet - -# credentials_list.xhtml -cl_title=Liste der Zugangsdaten -cl_credentials=Zugangsdaten -cl_workstation=Workstation -cl_domain=Dom\u00E4ne -cl_targetType=Ziel -cl_credentialType=Art der Authentifizierung -cl_addCredentials=Zugangsdaten hinzuf\u00FCgen -cl_newUserNameRequiredMsg=Bitte Benutzernamen eingeben -cl_newPasswordRequiredMsg=Bitte Passwort eingeben - -# upload_list.xhtml -ull_title=Uploads zur zentralen MDS Datenbank -ull_manualUpload=Upload manuell ausf\u00FChren -ull_id=Upload ID -ull_triggeredAt=Gestartet um -ull_triggeredBy=Gestartet von -ull_status=Status -ull_cancelUpload=Upload abbrechen -ull_spawnUpload=Starten - -# inquiry_handling.xhtml -ih_title=Behandlung von Anfragen -ih_autoReply=Automatisch antworten - -# tests.xhtml -tests_title=Funktionstests -tests_check=Pr\u00FCfen -tests_centralSearch=Verbindung zur zentralen MDS Datenbank pr\u00FCfen -tests_idManager=Verbindung zum ID-Manager pr\u00FCfen -tests_broker=Verbindung zu dem/den Suchbroker(n) pr\u00FCfen -tests_localDatamanagement=Verbindung zum lokalen Datenmanagement pr\u00FCfen -tests_checkConnection=Erreichbarkeit pr\u00FCfen -tests_checkConnectionDescription=Sendet einen HTTP GET request an die konfigurierte Adresse, um zu pr\u00FCfen ob der Dienst erreichbar ist. -tests_brokerCheckRetrieveTestInquiry=Testanfrage herunterladen -tests_brokerCheckRetrieveTestInquiryDescription=L\u00E4dt eine einfache, vom Suchbroker generierte, Testanfrage herunter. -tests_uploadAndDeleteDummyPatient=Testpatient hochladen und anschlie\u00DFend l\u00F6schen -tests_uploadAndDeleteDummyPatientDescription=Sendet einen einfachen Testpatienten Datensatz zur zentralen MDS Datenbank hoch und l\u00F6scht diesen anschlie\u00DFend wieder. -tests_retrieveExportIds=Export ID anfordern -tests_retrieveExportIdsDescription=Holt ein Exportpseudonym f\u00FCr eine gegebene DKTK-Standort ID ab. Die zu pr\u00FCfende ID bitte nachfolgend angeben. -tests_brokerCheckRetrieveAndExecuteTestInquiry=Testanfrage herunterladen und ausf\u00FChren -tests_brokerCheckRetrieveAndExecuteTestInquiryDescription=L\u00E4dt eine einfache, vom Suchbroker generierte, Testanfrage herunter und schickt diese an das lokale Datenmanagement. -test_localId=DKTK-Standort ID - -# monitoring.xhtml -mon_title=\u00DCbermittlung von Metadaten -mon_info=Legen Sie fest, welche Telemetriedaten zu einer zentralen Monitoring Instanz \u00FCbermittelt werden. - -# show_upload.xhtml -su_events=Verlauf -su_dryrun=Testlauf -su_fullUpload=Kompletter Upload -su_successfulUploads=Erfolgreich -su_failedUploads=Fehlgeschlagen -su_details=Details -su_incremental=inkrementell -su_full=komplett -su_upload=Upload -su_dktk=DKTK - -# TargetTypes -TT_CENTRALSEARCH=Zentrale Suche -TT_HTTP_PROXY=HTTP Proxy -TT_HTTPS_PROXY=HTTPS Proxy -TT_LDM=Lokales Datenmanagement -TT_BROKER=Suchbroker - -# AuthSchemeTypes -AS_APIKEY=Api Key -AS_BASIC=Basic -AS_SPNEGO=Simple and Protected GSSAPI Negotiation Mechanism -AS_DIGEST=Digest -AS_KERBEROS=Kerberos -AS_NTLM=NT LAN Manager - -# Reply Rule Types -RR_NO_AUTOMATIC_ACTION=Keine automatischen Antworten -RR_TOTAL_COUNT=Nur Anzahl -RR_DATA=Patientendaten - -# Operator List -IS_NOT_NULL = Ist vorhanden -IS_NULL = Ist nicht vorhanden -LIKE = Enth\u00E4lt -NOT_EQUAL_TO = Ungleich -LESS_THEN = Kleiner als -LESS_OR_EQUAL_THEN = Kleiner oder gleich -EQUAL = Gleich -GREATER_OR_EQUAL = Gr\u00F6\u00DFer oder gleich -GREATER = Gr\u00F6\u00DFer als -BETWEEN = Zwischen -IN = Eines von -AND = UND -OR = ODER - -# Session Timeout Modal -session_runs_out=Ihre Session l\u00E4uft ab. -session_runs_out_explain=Sie k\u00F6nnen die Session verl\u00E4ngern indem Sie auf den unten angezeigten Button klicken. Ansonsten werden Sie vom System nach Ablauf der Session automatisch abgemeldet. -session_freshup=Session verl\u00E4ngern -session_timeout_one=Session l\u00E4uft in -session_timeout_one_under=unter -session_timeout_two=Sekunden ab. -session_timeout_two_min=Minuten ab. - -# Confirm Upload of Patients without Consent Modal -uploadWithLocalConsent_title=Bitte best\u00E4tigen -uploadWithLocalConsent_content=Sie sind im Begriff das System so zu konfigurieren, dass der festgelegte und datensparsame MDS-K und MDS-B von Patienten in die zentrale MDS-Datenbank hochgeladen wird. Es werden keine Daten in die zentrale MDS-Datenbank hochgeladen, die eine eindeutige Identifikation erlauben. Vor der Aktivierung dieser Funktion sollte das Einverst\u00E4ndnis der zust\u00E4ndigen lokalen Gremien vorliegen. Wenn Sie sich nicht sicher sind, ob Sie dies aktivieren sollten, kontaktieren Sie bitte Ihren lokalen CCP-Koordinator oder das CCP-Office. Weitere Informationen finden Sie auch im -uploadWithLocalConsent_linkText=Datenschutzkonzept der CCP-IT -uploadWithLocalConsent_mayDelete=Sie k\u00F6nnen diese Einstellung jederzeit r\u00FCckg\u00E4ngig machen. - -# Entity Types -E_BIOMATERIAL=Biomaterial -E_CLINICAL_DATA=Klinische Daten -E_PATIENT_FOR_STUDY=Studienpatienten -E_BIOMATERIAL_ABBR=bio -E_CLINICAL_DATA_ABBR=klin. -E_PATIENT_FOR_STUDY_ABBR=pat - -# pleaseWaitModal.xhtml -pwm.pleaseWait=Bitte warten... - -# EVENT_LOG_MESSAGES -E_SYSTEM_STARTUP=System gestartet -E_SYSTEM_SHUTDOWN=System abgeschaltet -E_NEW_INQUIRY_RECEIVED=Neue Suchanfrage von {0} erhalten -E_NEW_INQUIRY_CREATED_FOR_UPLOAD=Neue Suchanfrage f\u00FCr den Upload erstellt -E_COULD_NOT_GET_RESULT=Konnte Ergebnis nicht laden -E_RESULT_EMPTY=Ergebnis ist leer. Nichts weiter zu tun. -E_START_EXECUTE_INQUIRY_JOB=Schicke Anfrage an lokales Datenmanagement -E_REPEAT_EXECUTE_INQUIRY_JOB_WITHOUT_UNKNOWN_KEYS=Wiederhole Anfrage unter auslassung unbekannter MDR IDs: {0} -E_INQUIRY_RESULT_AT=Ergebnis unter {0} -E_LDM_ERROR=Fehler bei lokalem Datenmanagement -E_UNKNOWN_KEYS=Unbekannte MDR IDs in der Anfrage: {0} -E_STATISTICS_READY=Ergebnisstatistik erhalten. {0} Ergebnisse gefunden. -E_INQUIRY_ARCHIVED=Suchanfrage archiviert -E_BROKER_REPLY_ERROR=Fehler beim Senden der Antwort -E_STATUS_CHECK_ABANDONED=\u00DCberpr\u00FCfung des Status eingestellt -E_ARCHIVE_INQUIRY_AFTER_THRESHOLD=Suchanfrage wurde nach {0} Tagen archiviert -E_ARCHIVE_INQUIRY_RESULT_UNAVAILABLE=Suchanfrage wurde archiviert, da das Ergebnis nicht mehr abrufbar ist. -E_RESULT_NOT_SET_ABORTING=Ergebnislink nicht erhalten. Abbruch. -E_FAILED_JAXB_ERROR=JAXB Fehler. -E_REPLY_SENT_TO_BROKER=Antwort an Broker gesendet. Erhaltene Antwort: {0} -E_DRYRUN_COMPLETE=Testlauf abgeschlossen -E_UPLOAD_COMPLETE=Upload abgeschlossen mit {0} fehlgeschlagenen und {1} erfolgreichen Datens\u00E4tzen. -E_DELETE_ANONYMIZED_PATIENTS=L\u00F6schen anonymisierter Patienten lieferte [0} -E_CENTRALSEARCH_COULD_NOT_CONNECT=Konnte nicht zur zentralen MDS DB verbinden. -E_UPLOADSTATS_UNPARSABLE=Kann Uploadstats XML nicht parsen -E_UPLOAD_SET_TIMESTAMP=Uploadzeitpunkt auf {0} setzen lieferte {1} -E_PATIENT_UPLOAD_RESULT=Hochladen von Patient {0} verursachte den Fehlercode {1} -E_UNAUTHORIZED_ATTEMPT_TO_ACCESS_ADMIN_AREA=Unerlaubter Versuch auf Adminbereich zuzugreifen -E_USER_CREATED=Benutzer erstellt: {0} -E_USER_DELETED=Benutzer gel\u00F6scht: {0} -E_NO_CREDENTIALS_CS=Keine Zugangsdaten f\u00FCr zentrale Suche eingetragen -E_NO_PREVIOUS_UPLOADS=Keine vorhergehenden Uploads gefunden -E_PREVIOUS_UPLOAD_AT=Vorheriger Upload am {0} -E_CS_ERROR_LASTUPLOADTIMESTAMP=Statuscode {0} erhalten beim Versuch den Zeitpunkt des letzten Uploads zu ermitteln - -# Shorter versions of the EVENT_LOG_MESSAGES for show_inquiry and show_upload -E_NEW_INQUIRY_RECEIVED-SHORT=Vom Suchbroker erhalten -E_NEW_INQUIRY_CREATED_FOR_UPLOAD-SHORT=Neue Suchanfrage erstellt -E_COULD_NOT_GET_RESULT-SHORT=Konnte Ergebnis nicht laden -E_RESULT_EMPTY-SHORT=Ergebnis ist leer -E_START_EXECUTE_INQUIRY_JOB-SHORT=An lokales Datenmanagement geschickt -E_REPEAT_EXECUTE_INQUIRY_JOB_WITHOUT_UNKNOWN_KEYS-SHORT=Anfrage unter auslassung unbekannter MDR IDs wiederholt -E_INQUIRY_RESULT_AT-SHORT=Ergebnis unter {0} -E_LDM_ERROR-SHORT=Fehler bei lokalem Datenmanagement -E_STATISTICS_READY-SHORT={0} Ergebnisse gefunden. -E_INQUIRY_ARCHIVED-SHORT=Suchanfrage archiviert -E_BROKER_REPLY_ERROR-SHORT=Fehler beim Senden der Antwort -E_STATUS_CHECK_ABANDONED-SHORT=\u00DCberpr\u00FCfung des Status eingestellt -E_ARCHIVE_INQUIRY_AFTER_THRESHOLD-SHORT=Suchanfrage wurde nach {0} Tagen archiviert -E_ARCHIVE_INQUIRY_RESULT_UNAVAILABLE-SHORT=Suchanfrage wurde archiviert, da das Ergebnis nicht mehr abrufbar ist. -E_RESULT_NOT_SET_ABORTING-SHORT=Ergebnislink nicht erhalten. Abbruch. -E_FAILED_JAXB_ERROR-SHORT=JAXB Fehler. -E_REPLY_SENT_TO_BROKER-SHORT=Antwort an Broker gesendet -E_DRYRUN_COMPLETE-SHORT=Testlauf abgeschlossen -E_UPLOAD_COMPLETE-SHORT=Upload abgeschlossen -E_DELETE_ANONYMIZED_PATIENTS-SHORT=L\u00F6schen anonymisierter Patienten lieferte [0} -E_CENTRALSEARCH_COULD_NOT_CONNECT-SHORT=Konnte nicht zur zentralen MDS DB verbinden. -E_UPLOADSTATS_UNPARSABLE-SHORT=Kann Uploadstats XML nicht parsen -E_UPLOAD_SET_TIMESTAMP-SHORT=Uploadzeitpunkt auf {0} setzen lieferte {1} -E_PATIENT_UPLOAD_RESULT-SHORT=Hochladen von Patient {0} verursachte den Fehlercode {1} -E_UNAUTHORIZED_ATTEMPT_TO_ACCESS_ADMIN_AREA-SHORT=Unerlaubter Versuch auf Adminbereich zuzugreifen -E_USER_CREATED-SHORT=Benutzer erstellt: {0} -E_USER_DELETED-SHORT=Benutzer gel\u00F6scht: {0} -E_NO_CREDENTIALS_CS-SHORT=Keine Zugangsdaten f\u00FCr zentrale Suche eingetragen -E_NO_PREVIOUS_UPLOADS-SHORT=Keine vorhergehenden Uploads gefunden -E_PREVIOUS_UPLOAD_AT-SHORT=Vorheriger Upload am {0} -E_CS_ERROR_LASTUPLOADTIMESTAMP-SHORT=Statuscode {0} erhalten beim Versuch den Zeitpunkt des letzten Uploads zu ermitteln - -# EnumValidationHandling -NO_VALIDATION=Keine Validierung vornehmen. Das erzeugte Dokument kann deshalb Eintr\u00E4ge enthalten, die nicht konform zu den im MDR hinterlegten Validierungsinformationen sind. -REMOVE_INVALID_ENTRIES=Werte, die nicht konform zu den im MDR hinterlegten Validierungsinformationen sind, werden nicht in das erzeugte Dokument aufgenommen. -KEEP_INVALID_ENTRIES=Werte, die nicht konform zu den im MDR hinterlegten Validierungsinformationen sind, werden im erzeugten Dokument orange hinterlegt. - -# Notification mails -MAIL_NEW_INQUIRIES_SUBJECT=Neue Suchanfragen in Ihrem Teiler \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_en.properties b/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_en.properties deleted file mode 100644 index d4ce51d3..00000000 --- a/classes/production/samply.share.client.v2/main/java/de/samply/share/client/messages/messages_en.properties +++ /dev/null @@ -1,466 +0,0 @@ -# translations for commonly used words -common_yes=Yes -common_no=No -common_save=Save -common_cancel=Cancel -common_error=Error -common_delete=Delete -common_username=Username -common_password=Password -common_changePassword=Change Password -common_email=Email address -common_changeEmail=Change email address -common_wrongPassword=Your old password is incorrect -common_passwordMismatch=Password and repeated password do not match -common_passwordChanged=Password changed -common_passwordChangeTitle=Change Password -common_logout=Logout -common_selectFile=Select file - -ConfigurationController_configuration=Configuration -ConfigurationController_configurationSaved=Configuration saved -LoginController_loginFailedMessage=Login Data invalid -LoginController_loginFailedTitle=Login error - -# WebUtils -WebUtils_caseDateYear=from the year -WebUtils_caseDateUnknown=of unknown date - -# Inquiry Status Enum -IS_NEW=new -IS_ARCHIVED=archived -IS_PROCESSING=processing -IS_LDM_ERROR=LDM connection error - -# index.xhtml -index_ldm=Local datamanagement -index_idmanager=ID-Manager -index_teiler=Samply Share -index_unreachable=Unreachable - -# configuration.xhtml -configuration_title=Configuration -configuration_manageCredentials=Manage credentials -configuration_manageCredentialsLink=to credentials management -configuration_centralSearch=Central Search -configuration_centralSearchBaseUrl=Central Search Base URL -configuration_centralSearchPath=Central Search Path -configuration_noCentralSearchPath=Central MDS database not correctly configured -configuration_noCentralSearchPathDetails=The site specific path to the central search application is not configured. You can set it on the configuration page. -configuration_disabledDbTooltip=This setting is just shown to you for informational purposes. If you ever need to change it, you have to do so directly in the database. -configuration_disabledXmlTooltip=This setting is just shown to you for informational purposes. If you ever need to change it, you have to do so directly in the config file. -configuration_monitoring=Reporting to central services -configuration_seconds=seconds -configuration_days=days -configuration_interfaces=Interfaces to other components -configuration_mdr=Metadata Repository -configuration_mdrUrl=URL of MDR -configuration_mdrMdskGroup=URN of the MDS-K Dataelementgroup -configuration_mdrMdsbGroup=URN of the MDS-B Dataelementgroup -configuration_ldmUrl=URL of local data management -configuration_ldmEnableCaching=Enable caching for query result pages -configuration_ldmCachingMaxSize=Maximum amount of pages cached -configuration_ldmCachingMaxSizeValidationError=Please enter a number between 1 and 5000 -configuration_idManagerUrl=URL of ID-Management -configuration_networkSettings=Network settings -configuration_httpProxy=HTTP Proxy -configuration_httpsProxy=HTTPS Proxy -configuration_uploadPatientsWithLocalConsent=Upload Patients without consent -configuration_sendTotalCount=Send total patient count -configuration_sendDktkCount=Send dktk flagged patient count -configuration_sendReferenceQueryCount=Send reference query patient count -configuration_sendReferenceQueryTime=Send reference query execution time -configuration_sendCentraxxMappingVersion=Send centraxx mapping script version -configuration_misc=Misc -configuration_mailNotifyEmptyResults=Include empty results in notification mail - -configurationTimings=Timings -configurationTimings_collectInquiriesInterval=Check for inquiries each -configurationTimings_checkInquiryStatusInitialDelay=Initial delay between posting an inquiry and checking its status -configurationTimings_checkInquiryStatusStatsRetryInterval=Delay between two attempts to retrieve query result statistics -configurationTimings_checkInquiryStatusStatsRetryAttempts=Number of attempts to retrieve query result statistics -configurationTimings_checkInquiryStatusResultsRetryInterval=Delay between two attempts to retrieve query result -configurationTimings_checkInquiryStatusResultsRetryAttempts=Number of attempts to retrieve query result -configurationTimings_parseException=Please enter an integer -configurationTimings_archiveInquiries=Archive inquiries after - -# c_loginPanel.xhtml -loginPanel_login=Login -loginPanel_doLogin=Login - -# dashboard.xhtml -dashboard_title=Dashboard -dashboard_configuration=Configuration -dashboard_configurationDetails=Manage the settings of your samply share client -dashboard_schedule=Scheduled Tasks -dashboard_scheduleDetails=tasks currently scheduled -dashboard_qualityReport=Quality Report -dashboard_qualityReportDetails=Generate and Download quality reports -dashboard_brokerList=Searchbrokers -dashboard_brokerListDetails=brokers currently configured -dashboard_eventLog=Event log -dashboard_eventLogDetails=Check the chronology of events -dashboard_inquiryHandling=Inquiry handling -dashboard_inquiryHandlingDetails=Define rules to be applied to incoming inquiries -dashboard_userList=Users -dashboard_userListDetails=Manage the users with access to samply share client -dashboard_credentials=Credentials -dashboard_credentialsDetails=Manage credentials for brokers and other services -dashboard_uploads=Uploads -dashboard_uploadsDetails=List of previous uploads -dashboard_inquiriesList=Inquiries -dashboard_inquiriesListDetails=inquiries at the moment -dashboard_inquiriesError=Erroneous inquiries -dashboard_inquiriesErrorDetails=inquiries that could not be processed -dashboard_inquiriesArchive=Archived inquiries -dashboard_inquiriesArchiveDetails=inquiries currently archived -dashboard_tests=Tests -dashboard_testsDetails=Check the connectivity with other local components - -# export.xhtml -export_criteria=Export criteria -export_dateConjunction=and -pleaseWait=Please wait -export_saveModalTitle=Save export definition -export_setName=Please enter a name for saving the export definition: -export_query=Search criteria - -# chart*.xhtml -charts_query=Patient search criteria -charts_setName=Please enter a name for saving the chart group: -charts_noChart=No data available -charts_nofOccurences=Occurences in patients -charts_deleteChartModalTitle=Remove chart -charts_deleteChartText=Do you really want to remove the chart with item "{0}"? -charts_deleteChart=Remove chart - -# event_log.xhtml -el_title=Log -el_timestamp=Timestamp -el_message=Message - -# qualityreport_list.xhtml -qr_title=Quality Report -qr_generation=generate -qr_inProgress=Quality Report in Progress... -qr_timestamp=timestamp -qr_version=version -qr_consumedTime=Time consumed -qr_remainingTime=Time remaining -qr_startTime=Start time - -# job_list.xhtml -jl_title=Scheduled Jobs -jl_info=The following list shows the jobs that are scheduled to be executed regularly. You can change the schedule here, but please do so with caution. If you need help generating cron expressions, check http://www.cronmaker.com/ -jl_jobGroup=Group -jl_jobDescription=Description -jl_cronExpression=Cron Expression -jl_nextFireTime=Next fire time -jl_previousFireTime=Previous fire time -jl_rescheduleJobs=Reschedule jobs -jl_fireNow=Run now -jl_actions=Actions -jl_suspend=Suspend -jl_resume=Resume - -# rorList.xhtml -ror_list=RoR list -ror_url=Address - -# brokerList.xhtml -bl_title=List of Searchbrokers -bl_broker=Broker -bl_status=Status -bl_lastCheck=Last Check -bl_completeActivation=Activate -bl_joinNewBroker=Join new Searchbroker -bl_newAdress=Address -bl_newAdressRequiredMsg=Please enter the address of the Searchbroker -bl_newEmail=Your email address -bl_emailRequiredMsg=Please enter your email address -bl_joinBtn=Join -bl_requestFullResultsTooltip=When activated, local datamanagement will write all result datasets to the disk. This might be unwanted in some scenarios and can take a while. However, some older versions of the REST api of the local datamanagement might not support turning this off. -bl_requestFullResults=Request Result - -# BrokerStatusType -BS_UNREACHABLE=Unreachable -BS_USER_UNKNOWN=Unknown user -BS_AUTHENTICATION_ERROR=Authentication error -BS_ACTIVATION_PENDING=Activation pending -BS_OK=OK - -# userList.xhtml -ul_title=User management -ul_createNewUser=Create new user -ul_userCreated=User created -ul_passwordRepeat=Repeat password -ul_usernameRequiredMsg=Please specify a username -ul_passwordRequiredMsg=Please specify a password -ul_passwordRepeatRequiredMsg=Please repeat the password -ul_createBtn=Create -ul_setNewPassword=New password -ul_notifyBiomaterial=Notify on new inquiries requesting biomaterial -ul_notifyClinicalData=Notify on new inquiries requesting clinical data -ul_notifyPatients=Notify on new inquiries requesting study patients -ul_userNameExists=Username already existing - -# showInquiry.xhtml -si_title=Show inquiry -si_noDescription=The inquirer has not entered any description text. -si_inquiry=Inquiry -si_description=Description -si_downloadExpose=Download expos\u00E9 -si_contact=Contact -si_phone=Phone -si_subject=Your inquiry -si_institution=Organization -si_criteria=Search criteria -si_executeInquiry=Execute inquiry again -si_matchingResults=Matching datasets -si_exportResults=Export -si_details=Details of the inquiry -si_events=Events -si_reply=Reply -si_replyHeader=Reply -si_replySent=Reply sent -si_archive=Archive -si_resultsHidden=List of results deactivated -si_resultsHiddenDetails=The display of results has been deactivated by the administrator. -si_resultsNotDone=Results are not available at the moment -si_resultsNotDoneDetails=The first result page can not be retrieved right now. -si_resultsNotAvailable=Results not available -si_resultsStatsOnly=Only statistics were requested -si_resultsStatsOnlyCount=Your system has {0} results matching this inquiry. -si_resultsStatsOnlyDetails=When querying the local datamanagement, only the statistics file was requested. So no results were generated. You can post the request again, this time including results, by clicking the button at the beginning of this page and choosing the corresponding option in the drop-down menu. -si_resultsError=Local Datamanagement reported an error -si_resultsErrorDetails=While processing this request, an error occurred at the local datamanagement. Check the latest stats link in the events tab on the top of this page. -si_executeInquiryStatsOnlyFalse=Generate result list -si_executeInquiryStatsOnlyTrue=Only count results -si_showQuery=Show raw query -si_showStats=Show stats -si_generating=Generating -si_exportToExcel=Export to spreadsheet -si_handleInvalidEntries=Syntax validation -si_graphs=Diagrams -si_documents=Documents -si_document=Document -si_actions=Actions -si_noDocuments=No documents attached -si_uploadedAt=Uploaded at -si_noResults=No results found for inquiry - -# inquiries_list.xhtml / archived-inquiries.xhtml / erroneous-inquiries.xhtml -inqs_inquiriesActiveTitle=Active inquiries -inqs_inquiriesErroneousTitle=Failed inquiries -inqs_inquiriesArchiveTitle=Archived inquiries -inqs_source=Source -inqs_receivedAt=Received at -inqs_archivedAt=Archived at -inqs_answeredAt=Replied at -inqs_reply=Reply -inqs_found=Matching datasets -inqs_asOf=As of -inqs_searchingFor=looking for -inqs_noResults=No results -inqs_noLabel=Unnamed inquiry -inqs_errorCode=Error Code -inqs_abandoned=Timed out -inqs_processing=processing - -# credentials_list.xhtml -cl_title=Credentials list -cl_credentials=Credentials -cl_workstation=Workstation -cl_domain=Domain -cl_targetType=Target -cl_credentialType=CredentialType -cl_addCredentials=Add credentials -cl_newUserNameRequiredMsg=Please enter the username -cl_newPasswordRequiredMsg=Please enter the password - -# upload_list.xhtml -ull_title=Uploads to central mds database -ull_manualUpload=Trigger Upload manually -ull_id=Upload ID -ull_triggeredAt=Triggered at -ull_triggeredBy=Triggered by -ull_status=Status -ull_cancelUpload=Cancel Upload Task -ull_spawnUpload=Start - -# inquiry_handling.xhtml -ih_title=Inquiry Handling -ih_autoReply=Automatic reply - -# tests.xhtml -tests_title=Connectivity Checks -tests_check=Check -tests_centralSearch=Check connection to the central MDS database -tests_idManager=Check connection to the ID-Manager -tests_broker=Check connection to the broker(s) -tests_localDatamanagement=Check connection to local datamanagement -tests_checkConnection=Check reachability -tests_checkConnectionDescription=Sends an HTTP GET request to the configured address to check if the service is reachable at all. -tests_brokerCheckRetrieveTestInquiry=Retrieve test inquiry -tests_brokerCheckRetrieveTestInquiryDescription=Downloads a simple test inquiry that was generated by the searchbroker. -tests_uploadAndDeleteDummyPatient=Upload test patient -tests_uploadAndDeleteDummyPatientDescription=Sends a simple test patient dataset to the central mds database and deletes it afterwards. -tests_retrieveExportIds=Retrieve export ID -tests_retrieveExportIdsDescription=Gets an export ID for a given DKTK site id. The latter has to be provided in order to check. -tests_brokerCheckRetrieveAndExecuteTestInquiry=Retrieve and execute test inquiry -tests_brokerCheckRetrieveAndExecuteTestInquiryDescription=Downloads a simple test inquiry that was generated by the searchbroker and posts it to the local datamanagement. -test_localId=Local DKTK ID to check - -# monitoring.xhtml -mon_title=Reporting to central services -mon_info=Control, which of the following telemetric data will be submitted to central monitoring services. - -# show_upload.xhtml -su_events=Events -su_dryrun=Dryrun -su_fullUpload=Full upload -su_successfulUploads=Successful -su_failedUploads=Failed -su_details=Details -su_incremental=incremental -su_full=complete -su_upload=Upload -su_dktk=DKTK - -# TargetTypes -TT_CENTRALSEARCH=Central Search -TT_HTTP_PROXY=HTTP Proxy -TT_HTTPS_PROXY=HTTPS Proxy -TT_LDM=Local Datamanagement -TT_BROKER=Searchbroker - -# AuthSchemeTypes -AS_APIKEY=Api Key -AS_BASIC=Basic -AS_SPNEGO=Simple and Protected GSSAPI Negotiation Mechanism -AS_DIGEST=Digest -AS_KERBEROS=Kerberos -AS_NTLM=NT LAN Manager - -# Reply Rule Types -RR_NO_AUTOMATIC_ACTION=No automatic action -RR_TOTAL_COUNT=Total Size -RR_DATA=Patient data - -# Operator List -IS_NOT_NULL = Is set -IS_NULL = Is not set -LIKE = Contains -NOT_EQUAL_TO = Not equal to -LESS_THEN = Less than -LESS_OR_EQUAL_THEN = Less or equal than -EQUAL = Equals -GREATER_OR_EQUAL = Greater or equal than -GREATER = Greater than -BETWEEN = Between -IN = One of -AND = AND -OR = OR - -# Session Timeout Modal -session_runs_out=Your session is expiring. -session_runs_out_explain=You can refresh the session by pressing the button below. You will be logged out automatically otherwise. -session_freshup=Refresh session -session_timeout_one=Session expires in -session_timeout_one_under=under -session_timeout_two=seconds. -session_timeout_two_min=minutes. - -# Confirm Upload of Patients with local Consent Modal -uploadWithLocalConsent_title=Please confirm this setting -uploadWithLocalConsent_content=You are about to enable the upload of patients without consent to the central search database. Please be aware of the implications of this. If you are not sure whether to enable this or not, please contact your local dktk spokesperson. -uploadWithLocalConsent_linkText=data protection concept of the CCP-IT -uploadWithLocalConsent_mayDelete=You can revert this setting at any time. - -# Entity Types -E_BIOMATERIAL=Biomaterial -E_CLINICAL_DATA=Clinical data -E_PATIENT_FOR_STUDY=Patients -E_BIOMATERIAL_ABBR=bio -E_CLINICAL_DATA_ABBR=clin. -E_PATIENT_FOR_STUDY_ABBR=pat - -# pleaseWaitModal.xhtml -pwm.pleaseWait=Please wait... - -# EVENT_LOG_MESSAGES -E_SYSTEM_STARTUP=System startup -E_SYSTEM_SHUTDOWN=System shutdown -E_NEW_INQUIRY_RECEIVED=New inquiry received from broker {0} -E_NEW_INQUIRY_CREATED_FOR_UPLOAD=New inquiry created for upload -E_COULD_NOT_GET_RESULT=Could not get result. -E_RESULT_EMPTY=No results. Nothing to do here. -E_START_EXECUTE_INQUIRY_JOB=Posting inquiry to local datamanagement -E_REPEAT_EXECUTE_INQUIRY_JOB_WITHOUT_UNKNOWN_KEYS=Repeating post to local datamanagement without unknown MDR keys: {0} -E_INQUIRY_RESULT_AT=Result at {0} -E_LDM_ERROR=Error from Local Datamanagement -E_UNKNOWN_KEYS=Unknown MDR IDs in inquiry: {0} -E_STATISTICS_READY=QueryResultStatistics received. Found {0} results. -E_INQUIRY_ARCHIVED=Inquiry archived -E_BROKER_REPLY_ERROR=Error while trying to reply to broker -E_STATUS_CHECK_ABANDONED=Status check abandoned -E_ARCHIVE_INQUIRY_AFTER_THRESHOLD=Moving inquiry to archive after {0} days -E_ARCHIVE_INQUIRY_RESULT_UNAVAILABLE=Inquiry was archived since the result is no longer available -E_RESULT_NOT_SET_ABORTING=Result location not set. Aborting job. -E_FAILED_JAXB_ERROR=Failed due to JAXB Error -E_REPLY_SENT_TO_BROKER=Reply sent to broker. Got reply {0} -E_DRYRUN_COMPLETE=Dry-run complete -E_UPLOAD_COMPLETE=Upload completed with {0} failed Patients and {1} successfully uploaded patients -E_DELETE_ANONYMIZED_PATIENTS=Deleting anonymized patients command got reply {0} -E_CENTRALSEARCH_COULD_NOT_CONNECT=Could not connect to central mds database -E_UPLOADSTATS_UNPARSABLE=Could not parse Uploadstats XML -E_UPLOAD_SET_TIMESTAMP=Setting upload timestamp to {0} got reply {1} -E_PATIENT_UPLOAD_RESULT=Trying to upload patient {0} caused error code {1} -E_UNAUTHORIZED_ATTEMPT_TO_ACCESS_ADMIN_AREA=Unauthorized attempt to access admin area -E_USER_CREATED=User created: {0} -E_USER_DELETED=User deleted: {0} -E_NO_CREDENTIALS_CS=No credentials entered for central mds db -E_NO_PREVIOUS_UPLOADS=No previous uploads found -E_PREVIOUS_UPLOAD_AT=Previous upload at {0} -E_CS_ERROR_LASTUPLOADTIMESTAMP=Got status code {0} while trying to get last upload timestamp - -# Shorter versions of the EVENT_LOG_MESSAGES for show_inquiry and show_upload -E_NEW_INQUIRY_RECEIVED-SHORT=Received from broker -E_NEW_INQUIRY_CREATED_FOR_UPLOAD-SHORT=New inquiry created -E_COULD_NOT_GET_RESULT-SHORT=Could not get result. -E_RESULT_EMPTY-SHORT=No results. Nothing to do here. -E_START_EXECUTE_INQUIRY_JOB-SHORT=Posted to Local Datamanagement -E_REPEAT_EXECUTE_INQUIRY_JOB_WITHOUT_UNKNOWN_KEYS-SHORT=Re-posted without unknown MDR keys -E_INQUIRY_RESULT_AT-SHORT=Result at {0} -E_LDM_ERROR-SHORT=Error from Local Datamanagement -E_STATISTICS_READY-SHORT=Found {0} results. -E_INQUIRY_ARCHIVED-SHORT=Inquiry archived -E_BROKER_REPLY_ERROR-SHORT=Error while trying to reply to broker -E_STATUS_CHECK_ABANDONED-SHORT=Status check abandoned -E_ARCHIVE_INQUIRY_AFTER_THRESHOLD-SHORT=Moving inquiry to archive after {0} days -E_ARCHIVE_INQUIRY_RESULT_UNAVAILABLE-SHORT=Inquiry was archived since the result is no longer available -E_RESULT_NOT_SET_ABORTING-SHORT=Result location not set. Aborting job. -E_FAILED_JAXB_ERROR-SHORT=Failed due to JAXB Error -E_REPLY_SENT_TO_BROKER-SHORT=Reply sent to broker. Got reply {0} -E_DRYRUN_COMPLETE-SHORT=Dry-run complete -E_UPLOAD_COMPLETE-SHORT=Upload completed with {0} failed Patients and {1} successfully uploaded patients -E_DELETE_ANONYMIZED_PATIENTS-SHORT=Deleting anonymized patients command got reply {0} -E_CENTRALSEARCH_COULD_NOT_CONNECT-SHORT=Could not connect to central mds database -E_UPLOADSTATS_UNPARSABLE-SHORT=Could not parse Uploadstats XML -E_UPLOAD_SET_TIMESTAMP-SHORT=Setting upload timestamp to {0} got reply {1} -E_PATIENT_UPLOAD_RESULT-SHORT=Trying to upload patient {0} caused error code {1} -E_UNAUTHORIZED_ATTEMPT_TO_ACCESS_ADMIN_AREA-SHORT=Unauthorized attempt to access admin area -E_USER_CREATED-SHORT=User created: {0} -E_USER_DELETED-SHORT=User deleted: {0} -E_NO_CREDENTIALS_CS-SHORT=No credentials entered for central mds db -E_NO_PREVIOUS_UPLOADS-SHORT=No previous uploads found -E_PREVIOUS_UPLOAD_AT-SHORT=Previous upload at {0} -E_CS_ERROR_LASTUPLOADTIMESTAMP-SHORT=Got status code {0} while trying to get last upload timestamp - -# EnumValidationHandling -NO_VALIDATION=Do not validate. The resulting document may contain entries that are not compliant with the permitted values in the MDR. -REMOVE_INVALID_ENTRIES=Values that are not compliant with the permitted values in the MDR will be left out of the document. -KEEP_INVALID_ENTRIES=Values that are not compliant with the permitted values in the MDR will be kept in the document and marked as such by orange background colour. - -# Notification mails -MAIL_NEW_INQUIRIES_SUBJECT=New inquiries in your samply share client \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/centraxx.dataelements.txt b/classes/production/samply.share.client.v2/main/resources/centraxx.dataelements.txt deleted file mode 100644 index 33129e69..00000000 --- a/classes/production/samply.share.client.v2/main/resources/centraxx.dataelements.txt +++ /dev/null @@ -1,123 +0,0 @@ -urn:dktk:dataelement:1:3 PAT_GENDER_TYPE -urn:dktk:dataelement:10:2 TNM_MULTIPLE -urn:dktk:dataelement:100:1 TNM_T -urn:dktk:dataelement:101:1 TNM_N -urn:adt:dataelement:103:1 PAT_DATEOFDEATH -urn:adt:dataelement:104:1 PAT_TUMOURDEATH -urn:adt:dataelement:105:1 DEATH_ICDCODE -urn:adt:dataelement:106:1 DEATH_ICDTEXT -urn:dktk:dataelement:108:xxx NOT_MAPPED -urn:dktk:dataelement:109:2018-08-13 14:16:02 NOT_MAPPED -urn:adt:dataelement:109:1 DIAG_DIAGNOSISCODE -urn:adt:dataelement:110:2 SYSADV_GRADE -urn:dktk:dataelement:18:2 TNM_VERSION -urn:dktk:dataelement:19:2 SURGERY_RCLASSIFIC_LOCAL -urn:dktk:dataelement:2:3 TNM_CLASSDATE -urn:dktk:dataelement:20:3 SURGERY_RCLASSIFIC -urn:dktk:dataelement:21:3 METASTASIS_METASDATE -urn:dktk:dataelement:23:3 SURGERY_INTENTION -urn:dktk:dataelement:24:3 PROGRESS_FULLASSESSMENT -urn:dktk:dataelement:25:4 PROGRESS_EXAMINATIONDATE -urn:dktk:dataelement:26:4 PAT_BIRTHDATE -urn:adt:dataelement:26:1 PAT_BIRTHDATE -urn:adt:dataelement:27:1 CATALOG_VERSION -urn:dktk:dataelement:28:1 DIAG_AGE_OF_DIAG -urn:adt:dataelement:28:1 DIAG_DIAGNOSISTEXT -urn:dktk:dataelement:29:2 DIAG_DIAGNOSISCODE -urn:adt:dataelement:29:1 DIAG_ICD_O_CODE -urn:dktk:dataelement:3:2 CATALOG_VERSION -urn:adt:dataelement:30:1 TLOC_VERSION -urn:adt:dataelement:31:2 TUMOUR_DIAG_DATE -urn:adt:dataelement:32:1 TUMOUR_ACCURACY -urn:adt:dataelement:33:1 TLOC_SIDE -urn:dktk:dataelement:33:2 PROGRESS_SURGERY -urn:dktk:dataelement:34:2 PROGRESS_RADIATION -urn:dktk:dataelement:36:2 PROGRESS_CHEMO -urn:adt:dataelement:37:1 HISTO_CODE -urn:adt:dataelement:38:1 HISTO_VERSION -urn:dktk:dataelement:38:2 PROGRESS_IMMUNE -urn:dktk:dataelement:39:2 PROGRESS_HORMONE -urn:dktk:dataelement:4:2 TLOC_LOCALISATIONCODE -urn:adt:dataelement:40:1 HISTO_GRADING -urn:dktk:dataelement:40:2 PROGRESS_KMT -urn:dktk:dataelement:43:3 PROGRESS_EXAMINATIONDATE -urn:dktk:dataelement:45:3 PROGRESS_EXAMINATIONDATE -urn:adt:dataelement:45:1 TNM_DATE -urn:dktk:dataelement:46:3 PROGRESS_EXAMINATIONDATE -urn:adt:dataelement:46:1 TNM_VERSION -urn:adt:dataelement:47:1 TNM_Y_SYMBOL -urn:adt:dataelement:48:1 TNM_RECIDIV_CLASSIFICATION -urn:dktk:dataelement:48:3 PAT_LAST_VITAL_DATE -urn:dktk:dataelement:49:4 SAMPLE_SAMPLINGDATE -urn:dktk:dataelement:5:2 TLOC_VERSION -urn:dktk:dataelement:50:2 SAMPLE_EXISTS -urn:adt:dataelement:50:1 TNM_PRAEFIX_T -urn:adt:dataelement:51:1 TNM_PRAEFIX_N -urn:adt:dataelement:52:1 TNM_PRAEFIX_M -urn:adt:dataelement:53:1 TNM_T -urn:dktk:dataelement:53:3 PAT_VITALSTATUS -urn:adt:dataelement:54:1 TNM_MULTIPLE -urn:dktk:dataelement:54:1 DKTK_GLOBAL -urn:adt:dataelement:55:1 TNM_N -urn:adt:dataelement:56:1 TNM_M -urn:adt:dataelement:57:1 TNM_L -urn:adt:dataelement:58:1 TNM_V -urn:adt:dataelement:59:1 TNM_PNI -urn:dktk:dataelement:6:2 TLOC_SIDE -urn:adt:dataelement:60:1 TNM_S -urn:dktk:dataelement:62:1 DKTK_PATIENT_CONSENT -urn:dktk:dataelement:63:2 LAST_CHANGE -urn:dktk:dataelement:64:3 LAST_CHANGE -urn:adt:dataelement:65:1 METASTASIS_LOCALISATIONCODE -urn:adt:dataelement:66:1 METASTASIS_METASDATE -urn:dktk:dataelement:67:2 RAD_INTENTION -urn:dktk:dataelement:68:3 RAD_THERAPYKIND -urn:adt:dataelement:68:1 PROGRESS_THERAPYINTENTION -urn:dktk:dataelement:69:2 SYSTHPY_INTENTION -urn:dktk:dataelement:7:2 HISTO_CODE -urn:dktk:dataelement:70:3 SYSTHPY_THERAPYKIND -urn:dktk:dataelement:72:2 PROGRESS_ASSESSMENTPRIMARY -urn:adt:dataelement:73:1 RAD_INTENTION -urn:dktk:dataelement:73:2 PROGRESS_ASSESSMENTLYMPH -urn:dktk:dataelement:74:2 PROGRESS_ASSESSMENTMETA -urn:adt:dataelement:74:1 RAD_THERAPYKIND -urn:adt:dataelement:75:1 RAD_TARGETAREA -urn:adt:dataelement:76:1 RAD_SIDE -urn:adt:dataelement:77:1 RAD_THERAPYSTART -urn:dktk:dataelement:77:1 METASTASIS_LOCCODE_EXISTS -urn:dktk:dataelement:78:1 TNM_PRAEFIX_T -urn:adt:dataelement:78:1 RAD_THERAPYEND -urn:adt:dataelement:79:1 RAD_APPLICATIONKIND -urn:dktk:dataelement:79:1 TNM_PRAEFIX_N -urn:dktk:dataelement:8:2 HISTO_VERSION -urn:dktk:dataelement:80:1 TNM_PRAEFIX_M -urn:adt:dataelement:80:1 RAD_COMPLETEDOSE -urn:adt:dataelement:81:1 RAD_SINGLEDOSE -urn:dktk:dataelement:81:1 TNM_RECIDIV_CLASSIFICATION -urn:dktk:dataelement:82:1 TNM_Y_SYMBOL -urn:adt:dataelement:82:1 RAD_FINALSTATE -urn:adt:dataelement:83:3 RADADV_GRADE -urn:dktk:dataelement:83:3 DIAG_DIAG_DATE -urn:adt:dataelement:84:1 RADADV_KIND -urn:adt:dataelement:85:1 RADADV_VERSION -urn:adt:dataelement:86:1 SYSTHPY_INTENTION -urn:adt:dataelement:87:1 SYSTHPY_THERAPYKIND -urn:adt:dataelement:88:1 SYSTHPY_THERAPYTYPE -urn:adt:dataelement:89:1 SYSTHPY_PROTOCOLID -urn:dktk:dataelement:89:1 TNM_STADIUM -urn:dktk:dataelement:9:2 HISTO_GRADING -urn:adt:dataelement:9:2 PAT_GENDER_TYPE -urn:adt:dataelement:90:1 SYSTHPY_THERAPYSTART -urn:dktk:dataelement:90:1 SAMPLE_STOCKTYPE -urn:dktk:dataelement:91:1 DKTK_LOCAL -urn:adt:dataelement:91:1 SYSTHPY_DESCRIPTION -urn:adt:dataelement:92:1 SYSTHPY_FINALSTATE -urn:adt:dataelement:93:1 SYSTHPY_THERAPYEND -urn:adt:dataelement:94:1 SYSADV_KIND -urn:adt:dataelement:95:1 SYSADV_VERSION -urn:dktk:dataelement:95:2 SAMPLE_SAMPLEKIND -urn:adt:dataelement:96:1 PROGRESS_EXAMINATIONDATE -urn:adt:dataelement:97:1 PROGRESS_FULLASSESSMENT -urn:dktk:dataelement:97:1 SAMPLE_SAMPLETYPE -urn:dktk:dataelement:98:1 METASTASIS_LOCALISATIONCODE -urn:dktk:dataelement:99:1 TNM_M \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/centraxx.values.txt b/classes/production/samply.share.client.v2/main/resources/centraxx.values.txt deleted file mode 100644 index febcd919..00000000 --- a/classes/production/samply.share.client.v2/main/resources/centraxx.values.txt +++ /dev/null @@ -1,83 +0,0 @@ -urn:dktk:dataelement:1:3 M MALE -urn:dktk:dataelement:1:3 W FEMALE -urn:dktk:dataelement:1:3 S HERMAPHRODIT -urn:dktk:dataelement:1:3 U UNKNOWN -urn:dktk:dataelement:19:2 R2 R2a -urn:dktk:dataelement:19:2 R2 R2b -urn:dktk:dataelement:19:2 RX Rx -urn:dktk:dataelement:20:3 RX Rx -urn:dktk:dataelement:20:3 R2 R2a -urn:dktk:dataelement:20:3 R2 R2b -urn:dktk:dataelement:24:3 V E -urn:dktk:dataelement:24:3 V F -urn:dktk:dataelement:24:3 V O -urn:dktk:dataelement:33:2 true J -urn:dktk:dataelement:33:2 false N -urn:dktk:dataelement:33:2 false A -urn:dktk:dataelement:34:2 false A -urn:dktk:dataelement:34:2 true J -urn:dktk:dataelement:34:2 false N -urn:dktk:dataelement:36:2 true J -urn:dktk:dataelement:36:2 false N -urn:dktk:dataelement:36:2 false A -urn:dktk:dataelement:36:2 false A -urn:dktk:dataelement:38:2 false A -urn:dktk:dataelement:38:2 true J -urn:dktk:dataelement:38:2 false N -urn:dktk:dataelement:39:2 true J -urn:dktk:dataelement:39:2 false N -urn:dktk:dataelement:39:2 false A -urn:dktk:dataelement:40:2 false A -urn:dktk:dataelement:40:2 true J -urn:dktk:dataelement:40:2 false N -urn:dktk:dataelement:6:2 U X -urn:dktk:dataelement:6:2 T S -urn:dktk:dataelement:68:3 O R -urn:dktk:dataelement:68:3 A P -urn:dktk:dataelement:70:3 A P -urn:dktk:dataelement:70:3 O R -urn:dktk:dataelement:72:2 T E -urn:dktk:dataelement:72:2 P B -urn:dktk:dataelement:73:2 T E -urn:dktk:dataelement:73:2 P B -urn:dktk:dataelement:74:2 M E -urn:dktk:dataelement:74:2 P B -urn:dktk:dataelement:77:1 nicht erfasst false -urn:dktk:dataelement:77:1 ja true -urn:dktk:dataelement:9:2 B Grenzfall bzw. Borderline (nur bei Ovar !) -urn:dktk:dataelement:9:2 1 G1 (Gut differenziert) -urn:dktk:dataelement:9:2 B Grenzfall bzw. Borderline (nur bei Ovar!) -urn:dktk:dataelement:9:2 H High grade (G3/G4) -urn:dktk:dataelement:9:2 L Low grade (G1/G2) -urn:dktk:dataelement:9:2 2 G2 (Mäßig differenziert) -urn:dktk:dataelement:9:2 3 G3 (Schlecht differenziert) -urn:dktk:dataelement:9:2 X GX (Differenzierungsgrad oder Herkunft nicht zu bestimmen) -urn:dktk:dataelement:9:2 4 G4 (Undifferenziert) -urn:dktk:dataelement:9:2 M Intermediate grade -urn:dktk:dataelement:9:2 U unbekannt -urn:dktk:dataelement:9:2 T trifft nicht zu -urn:adt:dataelement:9:2 M MALE -urn:adt:dataelement:9:2 W FEMALE -urn:adt:dataelement:9:2 S HERMAPHRODIT -urn:adt:dataelement:9:2 U UNKNOWN -urn:dktk:dataelement:9:2 T N -urn:dktk:dataelement:9:2 B G -urn:dktk:dataelement:90:1 Paraffin (FFPE) NBF -urn:dktk:dataelement:90:1 Kryo/Frisch (FF) SNP -urn:dktk:dataelement:95:2 Flüssigprobe LIQUID -urn:dktk:dataelement:95:2 Gewebeprobe TISSUE -urn:dktk:dataelement:97:1 Tumorgewebe TGW -urn:dktk:dataelement:97:1 Tumorgewebe NRT -urn:dktk:dataelement:97:1 Tumorgewebe TIS -urn:dktk:dataelement:97:1 Tumorgewebe PTM -urn:dktk:dataelement:97:1 Normalgewebe NGW -urn:dktk:dataelement:97:1 Vollblut VBL -urn:dktk:dataelement:97:1 Serum SER -urn:dktk:dataelement:97:1 Plasma PL1 -urn:dktk:dataelement:97:1 Urin URN -urn:dktk:dataelement:97:1 Liquor CSF -urn:dktk:dataelement:97:1 Knochenmark BMA -urn:dktk:dataelement:97:1 DNA DNA -urn:dktk:dataelement:97:1 RNA RNA -urn:dktk:dataelement:97:1 Protein PROTEIN -urn:dktk:dataelement:98:1 OTH SPL \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V1__create_schema_and_types.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V1__create_schema_and_types.sql deleted file mode 100644 index 34e02b0c..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V1__create_schema_and_types.sql +++ /dev/null @@ -1,100 +0,0 @@ -CREATE SCHEMA IF NOT EXISTS samply; -SET search_path TO samply,public; - -CREATE TYPE auth_scheme_type AS ENUM ( - 'AS_APIKEY', - 'AS_BASIC', - 'AS_NTLM', - 'AS_SPNEGO', - 'AS_KERBEROS', - 'AS_DIGEST' -); - -CREATE TYPE inquiry_status_type AS ENUM ( - 'IS_NEW', - 'IS_PROCESSING', - 'IS_READY', - 'IS_LDM_ERROR', - 'IS_ABANDONED', - 'IS_ARCHIVED' -); - -CREATE TYPE target_type AS ENUM ( - 'TT_CENTRALSEARCH', - 'TT_HTTP_PROXY', - 'TT_HTTPS_PROXY', - 'TT_LDM', - 'TT_BROKER' -); - -CREATE TYPE reply_rule_type AS ENUM ( - 'RR_NO_AUTOMATIC_ACTION', - 'RR_TOTAL_COUNT', - 'RR_DATA' -); - -CREATE TYPE entity_type AS ENUM ( - 'E_BIOMATERIAL', - 'E_CLINICAL_DATA', - 'E_PATIENT_FOR_STUDY' -); - -CREATE TYPE broker_status_type AS ENUM ( - 'BS_UNREACHABLE', - 'BS_USER_UNKNOWN', - 'BS_AUTHENTICATION_ERROR', - 'BS_ACTIVATION_PENDING', - 'BS_OK' -); - -CREATE TYPE upload_status_type AS ENUM ( - 'US_NEW', - 'US_QUERY_POSTED', - 'US_QUERY_READY', - 'US_UPLOADING', - 'US_COMPLETED', - 'US_COMPLETED_WITH_ERRORS', - 'US_LDM_ERROR', - 'US_CENTRAL_MDSDB_ERROR', - 'US_IDMANAGER_ERROR', - 'US_ABANDONED', - 'US_CANCELED' -); - -CREATE TYPE event_message_type AS ENUM ( - 'E_SYSTEM_STARTUP', - 'E_SYSTEM_SHUTDOWN', - 'E_NEW_INQUIRY_RECEIVED', - 'E_NEW_INQUIRY_CREATED_FOR_UPLOAD', - 'E_COULD_NOT_GET_RESULT', - 'E_RESULT_EMPTY', - 'E_START_EXECUTE_INQUIRY_JOB', - 'E_REPEAT_EXECUTE_INQUIRY_JOB_WITHOUT_UNKNOWN_KEYS', - 'E_INQUIRY_RESULT_AT', - 'E_LDM_ERROR', - 'E_STATISTICS_READY', - 'E_INQUIRY_ARCHIVED', - 'E_BROKER_REPLY_ERROR', - 'E_STATUS_CHECK_ABANDONED', - 'E_ARCHIVE_INQUIRY_AFTER_THRESHOLD', - 'E_ARCHIVE_INQUIRY_RESULT_UNAVAILABLE', - 'E_RESULT_NOT_SET_ABORTING', - 'E_FAILED_JAXB_ERROR', - 'E_REPLY_SENT_TO_BROKER', - 'E_DRYRUN_COMPLETE', - 'E_UPLOAD_COMPLETE', - 'E_DELETE_ANONYMIZED_PATIENTS', - 'E_CENTRALSEARCH_COULD_NOT_CONNECT', - 'E_UPLOADSTATS_UNPARSABLE', - 'E_UPLOAD_SET_TIMESTAMP', - 'E_PATIENT_UPLOAD_RESULT', - 'E_UNAUTHORIZED_ATTEMPT_TO_ACCESS_ADMIN_AREA', - 'E_USER_CREATED', - 'E_USER_DELETED', - 'E_NO_CREDENTIALS_CS', - 'E_NO_PREVIOUS_UPLOADS', - 'E_PREVIOUS_UPLOAD_AT', - 'E_CS_ERROR_LASTUPLOADTIMESTAMP' -); - -COMMENT ON SCHEMA samply IS 'schema used for samply share'; \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V2__initial_tables.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V2__initial_tables.sql deleted file mode 100644 index 731f74b6..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V2__initial_tables.sql +++ /dev/null @@ -1,270 +0,0 @@ --- noinspection SqlNoDataSourceInspectionForFile - -CREATE TABLE configuration ( - name text PRIMARY KEY, - setting text , - visible boolean DEFAULT true NOT NULL - ); - -CREATE TABLE configuration_timings ( - name text PRIMARY KEY, - setting integer DEFAULT 0 NOT NULL , - visible boolean DEFAULT true NOT NULL - ); - -CREATE TABLE credentials ( - id SERIAL PRIMARY KEY, - auth_scheme auth_scheme_type , - target target_type NOT NULL, - username text , - passcode text NOT NULL, - workstation text , - "domain" text - ); - -CREATE TABLE requested_entity ( - id SERIAL PRIMARY KEY, - name entity_type UNIQUE NOT NULL - ); - -CREATE TABLE token ( - id SERIAL PRIMARY KEY, - apikey text UNIQUE NOT NULL, - signin_token text , - expires_at timestamp - ); - -CREATE TABLE upload ( - id SERIAL PRIMARY KEY, - status upload_status_type DEFAULT 'US_NEW' NOT NULL, - triggered_at TIMESTAMP DEFAULT current_timestamp NOT NULL, - triggered_by text DEFAULT 'scheduled' NOT NULL, - is_dryrun boolean DEFAULT FALSE, - is_full_upload boolean DEFAULT FALSE, - dktk_flagged boolean, - success_count integer, - failure_count integer, - failed_patients text, - time_to_set TIMESTAMP WITHOUT TIME ZONE - ); - -CREATE TABLE "user" ( - id SERIAL PRIMARY KEY, - token_id integer UNIQUE, - username text UNIQUE NOT NULL, - password_hash text NOT NULL, - real_name text , - email text , - admin_privilege boolean DEFAULT FALSE NOT NULL - ); - -CREATE INDEX idx_user ON "user" ( token_id ); - -CREATE TABLE user_notification ( - user_id integer NOT NULL, - requested_entity_id integer NOT NULL, - PRIMARY KEY ("user_id", "requested_entity_id") - ); - -CREATE TABLE broker ( - id SERIAL PRIMARY KEY, - address text NOT NULL, - name text , - last_checked timestamp , - credentials_id integer , - status broker_status_type - ); - -CREATE INDEX idx_broker ON broker ( credentials_id ); - -CREATE TABLE inquiry_handling_rule ( - id SERIAL PRIMARY KEY, - broker_id integer , - full_result boolean DEFAULT true NOT NULL, - automatic_reply reply_rule_type DEFAULT 'RR_NO_AUTOMATIC_ACTION' NOT NULL - ); - -CREATE INDEX idx_inquiry_handling_rule ON inquiry_handling_rule ( broker_id ); - -CREATE TABLE event_log ( - id SERIAL PRIMARY KEY, - event_type event_message_type, - inquiry_id integer , - upload_id integer , - user_id integer , - quality_report_id integer , - event_time timestamp DEFAULT current_timestamp NOT NULL, - show_in_global boolean DEFAULT true NOT NULL, - entry text - ); - -CREATE INDEX idx_event_log ON event_log ( inquiry_id ); -CREATE INDEX idx_event_log_0 ON event_log ( upload_id ); -CREATE INDEX idx_event_log_1 ON event_log ( user_id ); - -CREATE TABLE inquiry ( - id SERIAL PRIMARY KEY, - upload_id integer , - source_id integer NOT NULL, - label text , - description text , - broker_id integer , - latest_details_id integer , - archived_at timestamp , - deleted_at timestamp - ); - -CREATE INDEX idx_inquiry ON inquiry ( broker_id ); -CREATE INDEX idx_inquiry_0 ON inquiry ( latest_details_id ); - -CREATE TABLE inquiry_answer ( - id SERIAL PRIMARY KEY, - inquiry_details_id integer UNIQUE NOT NULL, - sent_at timestamp DEFAULT current_timestamp NOT NULL, - content text NOT NULL - ); - -CREATE INDEX idx_inquiry_answer ON inquiry_answer ( inquiry_details_id ); - -CREATE TABLE inquiry_details ( - id SERIAL PRIMARY KEY, - inquiry_id integer NOT NULL, - contact_id integer , - revision integer NOT NULL, - received_at timestamp DEFAULT current_timestamp NOT NULL, - status inquiry_status_type NOT NULL, - criteria_original text NOT NULL, - criteria_modified text , - expose_location text - ); - -CREATE INDEX idx_inquiry_details ON inquiry_details ( inquiry_id ); - -CREATE TABLE inquiry_requested_entity ( - inquiry_id integer NOT NULL, - requested_entity_id integer NOT NULL, - PRIMARY KEY ("inquiry_id", "requested_entity_id") - ); - -CREATE TABLE inquiry_result ( - id SERIAL PRIMARY KEY, - inquiry_details_id integer NOT NULL, - is_error boolean DEFAULT false NOT NULL, - "location" text , - "size" integer , - executed_at timestamp DEFAULT current_timestamp NOT NULL, - valid_until timestamp , - statistics_only boolean DEFAULT false NOT NULL, - notification_sent boolean DEFAULT false NOT NULL, - "error_code" text - ); - -CREATE INDEX idx_inquiry_result ON inquiry_result ( inquiry_details_id ); - -CREATE TABLE inquiry_result_stats ( - id SERIAL PRIMARY KEY, - inquiry_result_id INTEGER UNIQUE NOT NULL, - stats_gender TEXT, - stats_age TEXT -); - -CREATE INDEX idx_inquiry_result_stats ON inquiry_result_stats ( inquiry_result_id ); - -CREATE TABLE user_seen_inquiry ( - user_id integer NOT NULL, - inquiry_id integer NOT NULL, - PRIMARY KEY ("user_id", "inquiry_id") - ); - -CREATE TABLE contact ( - id SERIAL PRIMARY KEY, - title text, - first_name text, - last_name text NOT NULL, - phone text, - email text, - organization_name text -); - -CREATE TABLE job_schedule ( - id SERIAL PRIMARY KEY, - job_key text UNIQUE NOT NULL, - cron_expression text NOT NULL, - paused boolean -); - -CREATE TABLE document ( - id SERIAL PRIMARY KEY, - inquiry_id INTEGER NOT NULL, - user_id INTEGER NOT NULL, - uploaded_at date NOT NULL DEFAULT CURRENT_DATE, - filetype TEXT, - filename TEXT, - data BYTEA -); - -CREATE INDEX idx_document ON document ( inquiry_id ); - - -ALTER TABLE broker ADD CONSTRAINT broker_credentials_id_fkey FOREIGN KEY ( credentials_id ) REFERENCES credentials( id ) ON DELETE SET NULL; -ALTER TABLE event_log ADD CONSTRAINT event_log_inquiry_id_fkey FOREIGN KEY ( inquiry_id ) REFERENCES inquiry( id ) ON DELETE CASCADE; -ALTER TABLE event_log ADD CONSTRAINT event_log_upload_id_fkey FOREIGN KEY ( upload_id ) REFERENCES upload( id ) ON DELETE CASCADE; -ALTER TABLE event_log ADD CONSTRAINT event_log_user_id_fkey FOREIGN KEY ( user_id ) REFERENCES "user"( id ) ON DELETE CASCADE; -ALTER TABLE inquiry ADD CONSTRAINT inquiry_upload_id_fkey FOREIGN KEY ( upload_id ) REFERENCES upload( id ) ON DELETE CASCADE; -ALTER TABLE inquiry ADD CONSTRAINT inquiry_broker_id_fkey FOREIGN KEY ( broker_id ) REFERENCES broker( id ) ON DELETE CASCADE; -ALTER TABLE inquiry ADD CONSTRAINT inquiry_broker_xor_upload CHECK ((upload_id IS NULL AND broker_id IS NOT NULL) OR (broker_id IS NULL AND upload_id IS NOT NULL)); -ALTER TABLE inquiry ADD CONSTRAINT inquiry_latest_details_id_fkey FOREIGN KEY ( latest_details_id ) REFERENCES inquiry_details( id ) ON DELETE SET NULL; -ALTER TABLE inquiry_answer ADD CONSTRAINT inquiry_answer_inquiry_details_id_fkey FOREIGN KEY ( inquiry_details_id ) REFERENCES inquiry_details( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_details ADD CONSTRAINT inquiry_details_inquiry_id_fkey FOREIGN KEY ( inquiry_id ) REFERENCES inquiry( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_details ADD CONSTRAINT inquiry_details_contact_id_fkey FOREIGN KEY ( contact_id ) REFERENCES contact( id ) ON DELETE SET NULL; -ALTER TABLE inquiry_handling_rule ADD CONSTRAINT inquiry_handling_rule_broker_id_fkey FOREIGN KEY ( broker_id ) REFERENCES broker( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_requested_entity ADD CONSTRAINT inquiry_requested_entity_inquiry_id_fkey FOREIGN KEY ( inquiry_id ) REFERENCES inquiry( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_requested_entity ADD CONSTRAINT inquiry_requested_entity_requested_entity_id_fkey FOREIGN KEY ( requested_entity_id ) REFERENCES requested_entity( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_result ADD CONSTRAINT inquiry_result_inquiry_details_id_fkey FOREIGN KEY ( inquiry_details_id ) REFERENCES inquiry_details( id ) ON DELETE CASCADE; -ALTER TABLE inquiry_result_stats ADD CONSTRAINT inquiry_result_stats_inquiry_result_id_fkey FOREIGN KEY ( inquiry_result_id ) REFERENCES inquiry_result( id ) ON DELETE CASCADE; -ALTER TABLE "user" ADD CONSTRAINT user_token_id_fkey FOREIGN KEY ( token_id ) REFERENCES token( id ) ON DELETE SET NULL; -ALTER TABLE user_notification ADD CONSTRAINT user_notification_user_id_fkey FOREIGN KEY ( user_id ) REFERENCES "user"( id ) ON DELETE CASCADE; -ALTER TABLE user_notification ADD CONSTRAINT user_notification_requested_entity_id_fkey FOREIGN KEY ( requested_entity_id ) REFERENCES requested_entity( id ) ON DELETE CASCADE; -ALTER TABLE user_seen_inquiry ADD CONSTRAINT user_seen_inquiry_user_id_fkey FOREIGN KEY ( user_id ) REFERENCES "user"( id ) ON DELETE CASCADE; -ALTER TABLE user_seen_inquiry ADD CONSTRAINT user_seen_inquiry_inquiry_id_fkey FOREIGN KEY ( inquiry_id ) REFERENCES inquiry( id ) ON DELETE CASCADE; -ALTER TABLE document ADD CONSTRAINT document_inquiry_id_fkey FOREIGN KEY (inquiry_id) REFERENCES inquiry(id) ON DELETE CASCADE; - - -COMMENT ON COLUMN configuration.visible IS 'Is this visible on the web interface?'; -COMMENT ON TABLE configuration_timings IS 'Use an extra table for timing parameters for the sake of simply using integers'; -COMMENT ON TABLE credentials IS 'Stored credentials for central search, searchbrokers, local datamanagement...'; -COMMENT ON COLUMN credentials.target IS 'proxy? central search? broker? user?'; -COMMENT ON COLUMN credentials.passcode IS 'May be a hashed password for the user login or a plain password for central search or maybe just an apikey'; -COMMENT ON COLUMN credentials.workstation IS 'Currently not used. Might be relevant for other auth schemes'; -COMMENT ON COLUMN credentials."domain" IS 'Currently not used. Might be relevant for other auth schemes'; -COMMENT ON TABLE requested_entity IS 'An inquirer can request different types of entities (biomaterial, clinical data...)'; -COMMENT ON TABLE upload IS 'Uploads to central search.'; -COMMENT ON COLUMN upload.triggered_by IS 'Who triggered the upload? Was it automatically by the scheduler, or did a user do it?'; -COMMENT ON COLUMN upload.success_count IS 'How many upload datasets were acknowledged with a 2xx status code'; -COMMENT ON COLUMN upload.failure_count IS 'How many upload datasets were finally denied'; -COMMENT ON COLUMN upload.failed_patients IS 'A JSON array of DKTK site ids of the failed patients'; -COMMENT ON COLUMN upload.time_to_set IS 'The timestamp that will be set at the central mds db at the end of the upload'; -COMMENT ON COLUMN "user".token_id IS 'The user might have a login token assigned to himself in order to allow logging in from other components (e.g. OSSE.EDC)'; -COMMENT ON COLUMN "user".password_hash IS 'bcrypt encoded password'; -COMMENT ON COLUMN "user".real_name IS 'The real name(s) of the user, may include title(s)'; -COMMENT ON TABLE user_notification IS 'Which user shall receive which notifications?'; -COMMENT ON COLUMN broker.address IS 'The base URL of the searchbroker'; -COMMENT ON COLUMN broker.name IS 'A self-assigned name of the searchbroker (e.g. "Decentral Searchbroker for DKTK")'; -COMMENT ON COLUMN broker.last_checked IS 'When was this searchbroker queries the last time?'; -COMMENT ON TABLE inquiry_handling_rule IS 'Incoming inquiries may be handled differently, depending on several criteria. Allow to define an "if" part which has to be handled in the application, a link to a specific broker (may be null), a link to a certain result type (may also be null) as well as an action to take (e.g. instantly reply a number)'; -COMMENT ON COLUMN inquiry_handling_rule.full_result IS 'Should the full result be generated here?'; -COMMENT ON CONSTRAINT inquiry_handling_rule_broker_id_fkey ON inquiry_handling_rule IS 'May be linked to a certain broker (but does not have to)'; -COMMENT ON TABLE event_log IS 'Log certain events that happen during job execution. E.g. Upload was triggered or inquiry was received/executed'; -COMMENT ON COLUMN event_log.event_time IS 'when did the logged event occur?'; -COMMENT ON COLUMN event_log.entry IS 'Either a message or a set of parameters. As a JSON String'; -COMMENT ON CONSTRAINT inquiry_broker_xor_upload ON inquiry IS 'Uploads can also spawn inquiries. In this case, set the upload id. upload_id XOR broker_id have to be set'; -COMMENT ON COLUMN inquiry.archived_at IS 'if this inquiry was archived...set the timestamp here. if it is not archived, this shall be null'; -COMMENT ON COLUMN inquiry.deleted_at IS 'allow to mark an inquiry as deleted. set to null if it is not deleted'; -COMMENT ON COLUMN inquiry_answer.inquiry_details_id IS 'which revision of the inquiry was answered?'; -COMMENT ON COLUMN inquiry_answer.content IS 'What was sent? This may contain different types of data...use json to keep it generic'; -COMMENT ON COLUMN inquiry_details.criteria_original IS 'the criteria xml snippet as received from source'; -COMMENT ON COLUMN inquiry_details.criteria_modified IS 'if the original criteria had unknown keys which were removed...keep the modified one as well'; -COMMENT ON COLUMN inquiry_result."location" IS 'The URL where the result can be found'; -COMMENT ON COLUMN inquiry_result.notification_sent IS 'has the user been notified about this inquiry?'; -COMMENT ON TABLE job_schedule IS 'For regularly executed tasks, set the cron schedule expression here'; -COMMENT ON TABLE document IS 'Users can upload (modified) export files in order to track what they may have sent to other people' \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V3__initial_dml.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V3__initial_dml.sql deleted file mode 100644 index 145914e3..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V3__initial_dml.sql +++ /dev/null @@ -1,103 +0,0 @@ -INSERT INTO requested_entity(name) SELECT unnest(enum_range(NULL::entity_type)); - -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_BASE_URL', 'https://centralsearch-test.ccpit.dktk.dkfz.de'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_PATH', ''); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_AUTOMATIC_UPLOAD', 'false'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_AUTOMATIC_UPLOAD_AT', '03:00'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_UPLOAD_PATIENTS_WITH_LOCAL_CONSENT', 'false'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_UPLOAD_RANDOMIZE_EXPORT_IDS', 'false'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_DELETE_BEFORE_UPLOAD', 'false'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_NEXT_UPLOAD_FULL', 'false'); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_SHOW_UPLOAD_PATIENTS_WITH_LOCAL_CONSENT', ''); -INSERT INTO samply.configuration(name, setting) VALUES ('DECENTRAL_SEARCH_MAIL_RECEIVER_ADDRESS', ''); -INSERT INTO samply.configuration(name, setting) VALUES ('DECENTRAL_SEARCH_MAIL_SHARE_URL', ''); -INSERT INTO samply.configuration(name, setting) VALUES ('MDR_URL', 'https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr'); -INSERT INTO samply.configuration(name, setting) VALUES ('LDM_URL', 'http://localhost:8080/centraxx/'); -INSERT INTO samply.configuration(name, setting) VALUES ('ID_MANAGER_URL', 'http://localhost:8180/ID-Manager'); -INSERT INTO samply.configuration(name, setting) VALUES ('ID_MANAGER_NETWORK_ID', 'DKTK'); -INSERT INTO samply.configuration(name, setting) VALUES ('ID_MANAGER_INSTANCE_ID', ''); -INSERT INTO samply.configuration(name, setting) VALUES ('CENTRAL_MDS_DATABASE_ANONYMIZED_PATIENTS_PREFIX', 'TESTANO_'); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_GRP_MDSK', 'urn:dktk:dataelementgroup:7:latest', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_GRP_MDSB', 'urn:dktk:dataelementgroup:8:latest', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_UPLOAD_FROM', 'urn:dktk:dataelement:64:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_UPLOAD_TO', 'urn:dktk:dataelement:63:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_CONSENT_DKTK', 'urn:dktk:dataelement:62:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_DKTK_GLOBAL_ID', 'urn:dktk:dataelement:54:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_GENDER', 'urn:dktk:dataelement:1:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_AGE_AT_DIAGNOSIS', 'urn:dktk:dataelement:28:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_CASE_DATE', 'urn:dktk:dataelement:27:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_CENTRAXX_MAPPING_VERSION', 'urn:dktk:dataelement:108:', false); -INSERT INTO samply.configuration(name, setting, visible) values('MDR_KEY_CENTRAXX_MAPPING_DATE', 'urn:dktk:dataelement:109:', false); - --- Quality Report Parameters -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_NAMESPACE', 'dktk', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_AUTH_USER_ID', '20', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_AUTH_KEY_ID', '2', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_AUTH_URL', 'https://auth.ccp-it.dktk.dkfz.de', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_AUTH_PRIVATE_KEY_BASE_64', 'MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCgjwoT/b16fxVjMbytIUYryC+YnZwrUdRCmxX8aTaeB0riup6NUscv2Bw8Z//G5i7mV7O6jpQEmhpbqlmyQDGXVGpJIovTs0U/WDrGhnshudvGUiRz4i/cYhnUd2JFKXNObZVs8PyoFluZt1INgcDnM0KM6bjflnzFGzyJq0DdpK4AswqeNlbV5Ge6Hx1e6iAUIM5dAorGHOGCCslzIYFOmgfD5KafrS3bhDg4QZp9roOkKAgmjSCrzePND012FQXyAhG/bkCCesm/G2Db4ih5h4ae2WTz88YNu5AAhWQd5yAjCk9s2GG0TeK4j5nAFrqql3Ms6RI1kImCr5erhjH9CrjLO+YK2tuHrynnyULcypmTKhhI22E0Ce6c4kKhQPfRzMe9H2b4djwDJAhftcveXu01FauB7QWqf+vwP30JlQ7V4jWA2o44q1IdzyzcWCEaJ7ebkXOy08ArocyNlquZVUppgdIVjV6sSyPOR4++pEBn9tKIwcN9qgp/dwoG+mwEWQtv74o221FINUgcc2OIHGQxkEJH4c3SsVK5HX5XwLYGDH4WJy+DibSvX5lxuM7Jv+I12oyckX6QbBdyWrkY/brq0SyUe57T93vyMc3aZDg+YXNuENkFiYqFhk56Rp/R+Bef3S/bcq3iShzjlgntPupIUATR2hdwEzFF5o0o8wIDAQABAoICADP6GmkeW5isS2AxWcMyYmUKCV5+p2/erbhiPFvaM7Q06Ck+ANX/VjxG2d00Tbk2CzjGa4iZX5Gd0aqbGy55WZSD32SNqnZ+MoyvI1fhcTsZz+wD64kYUCYoG/SMMWPyZ0GceCMsYJ6Jnl3E2utEdg5iqci0YQUA0qN8jbyDlBwsk6fmTimprbLQnkPCjt+LK5dYh3XUvNglwVs34r9CuXmYo6rm+on2pkHKK+kKU9kcBcG+s+THCyyTGovnyEvRwnr18IjoSDn1Rhp34oNMU44EMbB68BOJdzQ65ANHK4ICsISncc7qvbaBAER/OGbW9NcE8GQ5j4uHnvyPm6oLZ2Le38XyP7+Q2o71Y5MhSyB9Er77aret6EyDxez+4XMY6KrASnMXo5OY9Mcf+cc9VaHJo7YRPqYB8g5zK5J79PFwwamxDBa9EHBE3yE1RmIh2MKHuFb3je61n1TV9LxMjr8q+wdS0DlgD0DHtBv59IRfbIh2nbJnutLxvflOk6R4OXZn5XU4nttGSfC/zQANfR9Ogd2ms96kpCZb1+AoRhPmvyPGjcri8l1ZEA8eYkdt45E8TCqeui/eoiAe3jNabwuOcrNCPgJ3FCdHned9FdYQrLEyVUI6bzv/VRkKq0BUegkLFiqsZuFobfXDHjuwW3QqqozmYbRM6IOcMuWQM80BAoIBAQDpmo3Np8yQP4Paf3sehBI1KmBzHNLul3tDpq4G04HqaAES9YQs1GtsepBlr5LW8hU1LsupKDqFjx+87RnxQGH+9jYWL4r4Cgawp9yTy0sKbebqUTISPXVlpu5vd+RtwIXrQqmqb0E4efwgOLEXjIP16joo3W03OLuMU+oCSp0tc+uW1+l7hGxOgXlAjApQGPE/+0nDOlMOuI/eL5m2TSoviiNl1o0NA6KQuZ7zqI7+Kp/3bAdBTflQdepuco1XX/iX9qvJChvD7DfSxzb6j8sVd09Ggdy27h+zaMcvXv0q1IZ6V+Ue3xTqVoNcfmuWMHrZajnI0LkCwfsx0yv8D4JXAoIBAQCv87VMMg776T3xZsACzXFKS1YRN9oFHTEZdhDHLmw+rFglrhQ9l9IyMpTbrm7DeUP1jP3UIU8elNkU7QHYxAW7UdZmmJfyQseJuyu/ut2oHVTTqf/ktAprOe7xWLAYLoGI/X1C1Ja90Jl+12CW6JtbgI6u/kQEyJoxlmb4Qncr+wJY1uPrF7LvNdpsEvNQgH4CPFrDKqSZ5y35Yn7GGnFevt8bcBwDbFufPP4ZfJegQI3KbHIJ705kueTqvouFcWFL6taGkymxogbDufRsLHQB4btgXjTg2aM/VlktkYcmrG9Wwo5O5mzEZCJ8oS+eRFk5f2LiieFy+ueAkKmEP4TFAoIBAFpH0OXaI8Tbxyl6eyqgAClr5zqVuS9ce9b5Y+hfdaYR69hX6m0o6xtRgtzJrgZEKM4U98C4O2XCmpF5UL1cFINkxCJu3VZfCZbcSPMVbjrpnoSQPLmv5t8SVLPfsfh4n0j8ynWD6cDZ5AbP4iEnvRgdHb0NVlgxJMpm49le3L/kPPhfGW0TEIiGoUXA2Xt7KEGB7E/3CoJ18aP84XsC93rH+EYzVO/ip8Em+7dPPXQdJRWKOoOSjvf5mlB1FQrfnEOeoWVg8roVYL2lICpVyDbTlV+6cIKCJN5BcDlujIkw+Yfu0C3OKVcneD0W3p18vv2ngA2MHPRj46Ct7CHOHKECggEAYEEmUQShhdXW+RSIvf+9ljMYZlrzfhC2J4ObMhuHQ9HsdtCAaiF/784T+Qm3tl/EebQjt8RxD/3Fs9jkRb0WlZ7zdzTLCtDVb9dg24ZSdAF3wkMhpe+IM5iByq4Fx3TJkDN8Lu81d6mCDw2r3WJqeugdJkYa17MWB0KMGgviPcEXS5pjHNzeGlaPosfLK6LfTEHQNSxC157MW70yNRWKJ5arXss5x/WjOb2YFEFAgX5PEwm4aQ7tB9VaEcEjemDIJUvXB8/B41cL9E7qE7NN0ym148Ylj0wALkoChxcxpEp4rjHIwAj2P4m4BA35is9BMF8rrVpYZxozQvXghmRpMQKCAQA7ipiFZGZY7UhvrHgxQAoVkJG2aHmw0sXVF2MoetxAw612onpu9icp6O6zON37T60GXVnjIXYjxXoJnKBAnu4LFKykub800fxoPUb982V6KBicivtFvKmCeHyP1dSGi1w04jDDaEtae4Km8HMlgh4X6q6MllMpg07XHOtPROh3x+K5La3HewyolvODBRTtIbHaZDoh6M6HcSmA/ycqJigGcn3NkgZEYtN+bfVAGwPwH/G4TdsIwGuKYAEbFSjm4RM0ZLSfxn+Cz2CgDIMfAWocXNbFdgZDVs3LOyZUX84Hqe4+V4sWLgDnJgM7tiWp4gm2YVi0fnyXSeigUrkZeo7t', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MAX_ATTEMPTS', '54', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MAX_TIME_TO_WAIT_IN_MILLIS', '300000', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_ONLY_STATISTICS_AVAILABLE', 'true', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_LINK_PREFIX', 'https://mdr.ccp-it.dktk.dkfz.de/detail.xhtml?urn=', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MAX_NUMBER_OF_PATIENT_IDS_TO_BE_SHOWN', '200', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_CENTRAXX_DATAELEMENTS_FILE', 'centraxx.dataelements.txt', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_CENTRAXX_ATTRIBUTES_FILE', 'centraxx.attributes.txt', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_IGNORED_DATAELEMENTS', 'urn:dktk:dataelement:41:3, urn:dktk:dataelement:47:3, urn:dktk:dataelement:71:2, urn:dktk:dataelement:84:2, urn:dktk:dataelement:20:3', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_DIRECTORY', 'C:\ProgramData\dktk\reports', true); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_LOCATION', 'LocalDev', true); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_BASIC_FILENAME', 'quality-report', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_SCHEDULER_FORMAT', 'by-year', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_SCHEDULER_YEARS', '20', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_GROUP_MODUL', '5', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_SCHEDULER_BY_YEAR', '', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_SCHEDULER_BY_MONTH', '', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_STATISTICS_FILENAME', 'quality-report-statistics.txt', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_EXCEL_INFO_FILENAME', 'quality-report-info.xlsx', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_EXCEL_INFO_URL', 'https://deployment.ccp-it.dktk.dkfz.de/static/qualityreport/quality-report-info.xlsx', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_LANGUAGE_CODE', 'de', false); - --- Configuration for Report to Monitoring -INSERT INTO samply.configuration(name, setting, visible) VALUES ('MONITORING_REPORT_COUNT_TOTAL', 'false', true); -INSERT INTO samply.configuration(name, setting, visible) VALUES ('MONITORING_REPORT_COUNT_DKTKFLAG', 'false', true); -INSERT INTO samply.configuration(name, setting, visible) VALUES ('MONITORING_REPORT_COUNT_REFERENCEQUERY', 'false', true); -INSERT INTO samply.configuration(name, setting, visible) VALUES ('MONITORING_REPORT_TIME_REFERENCEQUERY', 'false', true); -INSERT INTO samply.configuration(name, setting, visible) VALUES ('MONITORING_REPORT_CENTRAXX_MAPPING_INFORMATION', 'false', true); - --- Configuration for Job Parameters -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_COLLECT_INQUIRIES_INTERVAL_SECONDS', 5, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_CHECK_INQUIRY_STATUS_INITIAL_DELAY_SECONDS', 5, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_CHECK_INQUIRY_STATUS_STATS_RETRY_INTERVAL_SECONDS', 10, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_CHECK_INQUIRY_STATUS_STATS_RETRY_ATTEMPTS', 6, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_CHECK_INQUIRY_STATUS_RESULTS_RETRY_INTERVAL_SECONDS', 60, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_CHECK_INQUIRY_STATUS_RESULTS_RETRY_ATTEMPTS', 10, false); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('JOB_MOVE_INQUIRIES_TO_ARCHIVE_AFTER_DAYS', 28, true); - --- Configuration for Upload -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('UPLOAD_RETRY_PATIENT_UPLOAD_ATTEMPTS', 6, true); -INSERT INTO samply.configuration_timings(name, setting, visible) VALUES ('UPLOAD_RETRY_PATIENT_UPLOAD_INTERVAL', 10, true); - --- Configuration for Caching on LDM connection -INSERT INTO samply.configuration(name, setting, visible) VALUES ('LDM_CACHING_ENABLED', 'false', true); -INSERT INTO samply.configuration(name, setting, visible) VALUES ('LDM_CACHING_MAX_SIZE', '1000', true); - --- Configuration for misc entries -INSERT INTO samply.configuration(name, setting, visible) VALUES ('DECENTRAL_SEARCH_MAIL_INCLUDE_EMPTY_RESULTS', 'true', true); - --- Set the cron expressions for some of the jobs -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('DecentralSearchGroup.CollectInquiriesJob', '0/10 * * * * ?', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('DecentralSearchGroup.ExecuteInquiriesJob', '0/5 * * * * ?', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('DecentralSearchGroup.SendNotificationsJob', '0 0 * * * ?', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('CentralSearchGroup.UploadToCentralMdsDbJobDktkFlag', '0 0 23 1/1 * ? *', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('CentralSearchGroup.UploadToCentralMdsDbJobNoDktkFlag', '0 0 2 ? 1/1 SAT#1 *', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('MaintenanceGroup.CheckLocalComponentsJob', '0 0 0/1 1/1 * ?', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('MaintenanceGroup.DbCleanupJob', '0 30 0 1/1 * ?', false); -INSERT INTO samply.job_schedule(job_key, cron_expression, paused) VALUES ('MaintenanceGroup.ReportToMonitoringJob', '0 0 1 1/1 * ? *', true); - --- Add additional keys for the viewfields when posting to local datamanagement -INSERT INTO samply.configuration(name, setting, visible) values('INQUIRY_ADDITIONAL_MDRKEYS', 'urn:adt:dataelement:77:*;urn:adt:dataelement:78:*;urn:adt:dataelement:90:*;urn:adt:dataelement:93:*;urn:adt:dataelement:89:*;urn:adt:dataelement:91:*', false); - -with tmp_token as ( - INSERT INTO Token(apikey) VALUES('ZvDKWpgCXSeed23MfbHs') RETURNING id -) -INSERT INTO samply.user(username, password_hash, token_id, admin_privilege) VALUES ('admin','$2a$10$nMAQW9ZUf8evd2KUU4Op.eWHK18hkiBDKYxpWnp6oxxQY8yApK4CS', (SELECT id from tmp_token), true); --- adminpass \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V4__site_specific_dml.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V4__site_specific_dml.sql deleted file mode 100644 index eb0bc76c..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V4__site_specific_dml.sql +++ /dev/null @@ -1,54 +0,0 @@ --- WITH --- teilerIds AS (SELECT --- 'TeilerB' AS Berlin, --- 'ttlrb1' AS BerlinTest, --- 'TeilerDD' AS Dresden, --- 'ttlrdd1' AS DresdenTest, --- 'TeilerE' AS Essen, --- 'ttlre1' AS EssenTest, --- 'TeilerF' AS Frankfurt, --- 'ttlef1' AS FrankfurtTest, --- 'TeilerFR' AS Freiburg, --- 'ttlrfr1' AS FreiburgTest, --- 'TeilerHD' AS Heidelberg, --- 'ttlrhd1' AS HeidelbergTest, --- 'TeilerMZ' AS Mainz, --- 'ttlrmz1' AS MainzTest, --- 'TeilerML' AS MuenchenLMU, --- 'ttlrmu1' AS MuenchenLMUTest, --- 'TeilerMT' AS MuenchenTUM, --- 'ttlrmu2' AS MuenchenTUMTest, --- 'TeilerTÜ' AS Tuebingen, --- 'ttlrtu1' AS TuebingenTest), --- instanceIds AS (SELECT --- 'berlin' AS Berlin, --- 'berlin' AS BerlinTest, --- 'dresden' AS Dresden, --- 'dresden' AS DresdenTest, --- 'essen' AS Essen, --- 'essen' AS EssenTest, --- 'frankfurt' AS Frankfurt, --- 'frankfurt' AS FrankfurtTest, --- 'freiburg' AS Freiburg, --- 'freiburg' AS FreiburgTest, --- 'heidelberg' AS Heidelberg, --- 'heidelberg' AS HeidelbergTest, --- 'mainz' AS Mainz, --- 'mainz' AS MainzTest, --- 'lmu' AS MuenchenLMU, --- 'lmu' AS MuenchenLMUTest, --- 'tum' AS MuenchenTUM, --- 'tum' AS MuenchenTUMTest, --- 'tübingen' AS Tuebingen, --- 'tübingen' AS TuebingenTest) --- UPDATE samply.configuration --- SET setting = ('/dktk/sites/' || --- (SELECT instanceIds.INSTANCEIDPLACEHOLDER --- FROM instanceIds)::TEXT || --- '/teiler/' || --- (SELECT teilerIds.INSTANCEIDPLACEHOLDER --- FROM teilerIds)::TEXT || --- '/') --- WHERE name = 'CENTRAL_MDS_DATABASE_PATH'; --- --- UPDATE samply.configuration SET setting = 'INSTANCEIDPLACEHOLDER' where name = 'ID_MANAGER_INSTANCE_ID'; diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V5__tables.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V5__tables.sql deleted file mode 100644 index 356472f3..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V5__tables.sql +++ /dev/null @@ -1,24 +0,0 @@ -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_GROUPS', 'urn:dktk:dataelementgroup:7:latest;urn:dktk:dataelementgroup:8:latest', false); - -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_ADDITIONAL_MDR_DATA_ELEMENTS', 'urn:adt:dataelement:77:1, urn:adt:dataelement:78:1, urn:adt:dataelement:89:1, urn:adt:dataelement:90:1, urn:adt:dataelement:91:1, urn:adt:dataelement:93:1', false); - -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_NAMESPACE', 'dktk, adt', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_AUTH_USER_ID', '20', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_AUTH_KEY_ID', '2', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_AUTH_URL', 'https://auth.ccp-it.dktk.dkfz.de', false); -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_MDR_AUTH_PRIVATE_KEY_BASE_64', 'MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCgjwoT/b16fxVjMbytIUYryC+YnZwrUdRCmxX8aTaeB0riup6NUscv2Bw8Z//G5i7mV7O6jpQEmhpbqlmyQDGXVGpJIovTs0U/WDrGhnshudvGUiRz4i/cYhnUd2JFKXNObZVs8PyoFluZt1INgcDnM0KM6bjflnzFGzyJq0DdpK4AswqeNlbV5Ge6Hx1e6iAUIM5dAorGHOGCCslzIYFOmgfD5KafrS3bhDg4QZp9roOkKAgmjSCrzePND012FQXyAhG/bkCCesm/G2Db4ih5h4ae2WTz88YNu5AAhWQd5yAjCk9s2GG0TeK4j5nAFrqql3Ms6RI1kImCr5erhjH9CrjLO+YK2tuHrynnyULcypmTKhhI22E0Ce6c4kKhQPfRzMe9H2b4djwDJAhftcveXu01FauB7QWqf+vwP30JlQ7V4jWA2o44q1IdzyzcWCEaJ7ebkXOy08ArocyNlquZVUppgdIVjV6sSyPOR4++pEBn9tKIwcN9qgp/dwoG+mwEWQtv74o221FINUgcc2OIHGQxkEJH4c3SsVK5HX5XwLYGDH4WJy+DibSvX5lxuM7Jv+I12oyckX6QbBdyWrkY/brq0SyUe57T93vyMc3aZDg+YXNuENkFiYqFhk56Rp/R+Bef3S/bcq3iShzjlgntPupIUATR2hdwEzFF5o0o8wIDAQABAoICADP6GmkeW5isS2AxWcMyYmUKCV5+p2/erbhiPFvaM7Q06Ck+ANX/VjxG2d00Tbk2CzjGa4iZX5Gd0aqbGy55WZSD32SNqnZ+MoyvI1fhcTsZz+wD64kYUCYoG/SMMWPyZ0GceCMsYJ6Jnl3E2utEdg5iqci0YQUA0qN8jbyDlBwsk6fmTimprbLQnkPCjt+LK5dYh3XUvNglwVs34r9CuXmYo6rm+on2pkHKK+kKU9kcBcG+s+THCyyTGovnyEvRwnr18IjoSDn1Rhp34oNMU44EMbB68BOJdzQ65ANHK4ICsISncc7qvbaBAER/OGbW9NcE8GQ5j4uHnvyPm6oLZ2Le38XyP7+Q2o71Y5MhSyB9Er77aret6EyDxez+4XMY6KrASnMXo5OY9Mcf+cc9VaHJo7YRPqYB8g5zK5J79PFwwamxDBa9EHBE3yE1RmIh2MKHuFb3je61n1TV9LxMjr8q+wdS0DlgD0DHtBv59IRfbIh2nbJnutLxvflOk6R4OXZn5XU4nttGSfC/zQANfR9Ogd2ms96kpCZb1+AoRhPmvyPGjcri8l1ZEA8eYkdt45E8TCqeui/eoiAe3jNabwuOcrNCPgJ3FCdHned9FdYQrLEyVUI6bzv/VRkKq0BUegkLFiqsZuFobfXDHjuwW3QqqozmYbRM6IOcMuWQM80BAoIBAQDpmo3Np8yQP4Paf3sehBI1KmBzHNLul3tDpq4G04HqaAES9YQs1GtsepBlr5LW8hU1LsupKDqFjx+87RnxQGH+9jYWL4r4Cgawp9yTy0sKbebqUTISPXVlpu5vd+RtwIXrQqmqb0E4efwgOLEXjIP16joo3W03OLuMU+oCSp0tc+uW1+l7hGxOgXlAjApQGPE/+0nDOlMOuI/eL5m2TSoviiNl1o0NA6KQuZ7zqI7+Kp/3bAdBTflQdepuco1XX/iX9qvJChvD7DfSxzb6j8sVd09Ggdy27h+zaMcvXv0q1IZ6V+Ue3xTqVoNcfmuWMHrZajnI0LkCwfsx0yv8D4JXAoIBAQCv87VMMg776T3xZsACzXFKS1YRN9oFHTEZdhDHLmw+rFglrhQ9l9IyMpTbrm7DeUP1jP3UIU8elNkU7QHYxAW7UdZmmJfyQseJuyu/ut2oHVTTqf/ktAprOe7xWLAYLoGI/X1C1Ja90Jl+12CW6JtbgI6u/kQEyJoxlmb4Qncr+wJY1uPrF7LvNdpsEvNQgH4CPFrDKqSZ5y35Yn7GGnFevt8bcBwDbFufPP4ZfJegQI3KbHIJ705kueTqvouFcWFL6taGkymxogbDufRsLHQB4btgXjTg2aM/VlktkYcmrG9Wwo5O5mzEZCJ8oS+eRFk5f2LiieFy+ueAkKmEP4TFAoIBAFpH0OXaI8Tbxyl6eyqgAClr5zqVuS9ce9b5Y+hfdaYR69hX6m0o6xtRgtzJrgZEKM4U98C4O2XCmpF5UL1cFINkxCJu3VZfCZbcSPMVbjrpnoSQPLmv5t8SVLPfsfh4n0j8ynWD6cDZ5AbP4iEnvRgdHb0NVlgxJMpm49le3L/kPPhfGW0TEIiGoUXA2Xt7KEGB7E/3CoJ18aP84XsC93rH+EYzVO/ip8Em+7dPPXQdJRWKOoOSjvf5mlB1FQrfnEOeoWVg8roVYL2lICpVyDbTlV+6cIKCJN5BcDlujIkw+Yfu0C3OKVcneD0W3p18vv2ngA2MHPRj46Ct7CHOHKECggEAYEEmUQShhdXW+RSIvf+9ljMYZlrzfhC2J4ObMhuHQ9HsdtCAaiF/784T+Qm3tl/EebQjt8RxD/3Fs9jkRb0WlZ7zdzTLCtDVb9dg24ZSdAF3wkMhpe+IM5iByq4Fx3TJkDN8Lu81d6mCDw2r3WJqeugdJkYa17MWB0KMGgviPcEXS5pjHNzeGlaPosfLK6LfTEHQNSxC157MW70yNRWKJ5arXss5x/WjOb2YFEFAgX5PEwm4aQ7tB9VaEcEjemDIJUvXB8/B41cL9E7qE7NN0ym148Ylj0wALkoChxcxpEp4rjHIwAj2P4m4BA35is9BMF8rrVpYZxozQvXghmRpMQKCAQA7ipiFZGZY7UhvrHgxQAoVkJG2aHmw0sXVF2MoetxAw612onpu9icp6O6zON37T60GXVnjIXYjxXoJnKBAnu4LFKykub800fxoPUb982V6KBicivtFvKmCeHyP1dSGi1w04jDDaEtae4Km8HMlgh4X6q6MllMpg07XHOtPROh3x+K5La3HewyolvODBRTtIbHaZDoh6M6HcSmA/ycqJigGcn3NkgZEYtN+bfVAGwPwH/G4TdsIwGuKYAEbFSjm4RM0ZLSfxn+Cz2CgDIMfAWocXNbFdgZDVs3LOyZUX84Hqe4+V4sWLgDnJgM7tiWp4gm2YVi0fnyXSeigUrkZeo7t', false); - -INSERT INTO samply.configuration(name, setting, visible) values('MDR_SOURCE_GROUPS', 'urn:dktk:dataelementgroup:7:latest;urn:dktk:dataelementgroup:8:latest;urn:adt:dataelementgroup:17:latest', false); -- for versions beyond CentraXX 3.9.0 --- INSERT INTO samply.configuration(name, setting, visible) values('MDR_SOURCE_GROUPS', 'urn:dktk:dataelementgroup:7:latest;urn:dktk:dataelementgroup:8:latest', false); -- for versions before CentraXX 3.9.0 - - -INSERT INTO samply.configuration(name, setting, visible) values('QUALITY_REPORT_CENTRAXX_VALUES_FILE', 'centraxx.values.txt', false); -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_CENTRAXX_ATTRIBUTES_FILE'; - -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_NAMESPACE' ; -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_AUTH_USER_ID'; -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_AUTH_KEY_ID'; -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_AUTH_URL'; - -DELETE FROM samply.configuration WHERE name='QUALITY_REPORT_AUTH_PRIVATE_KEY_BASE_64'; - diff --git a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V6__tables.sql b/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V6__tables.sql deleted file mode 100644 index dc6f234e..00000000 --- a/classes/production/samply.share.client.v2/main/resources/db/migration/samply/V6__tables.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE samply.configuration SET setting='urn:dktk:dataelement:41:3, urn:dktk:dataelement:47:3, urn:dktk:dataelement:71:2, urn:dktk:dataelement:84:2' WHERE name='QUALITY_REPORT_IGNORED_DATAELEMENTS'; \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/dktk_bridgehead_info.xml b/classes/production/samply.share.client.v2/main/resources/dktk_bridgehead_info.xml deleted file mode 100644 index 6f2d4041..00000000 --- a/classes/production/samply.share.client.v2/main/resources/dktk_bridgehead_info.xml +++ /dev/null @@ -1,10 +0,0 @@ - - string - string - string - string - string - string - string - string - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/dktk_common_config.xml b/classes/production/samply.share.client.v2/main/resources/dktk_common_config.xml deleted file mode 100644 index 722e3ee6..00000000 --- a/classes/production/samply.share.client.v2/main/resources/dktk_common_config.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/dktk_common_operator.xml b/classes/production/samply.share.client.v2/main/resources/dktk_common_operator.xml deleted file mode 100644 index 15c01e6f..00000000 --- a/classes/production/samply.share.client.v2/main/resources/dktk_common_operator.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - token - - token - - token - - token - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/dktk_common_urls.xml b/classes/production/samply.share.client.v2/main/resources/dktk_common_urls.xml deleted file mode 100644 index 1bc81728..00000000 --- a/classes/production/samply.share.client.v2/main/resources/dktk_common_urls.xml +++ /dev/null @@ -1,5 +0,0 @@ - - http://www.company.org/cum/sonoras - http://172.22.53.221:8180/ID-Manager - http://172.22.53.221:8080/centraxx - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/log4j2.xml b/classes/production/samply.share.client.v2/main/resources/log4j2.xml deleted file mode 100644 index 7fc022c5..00000000 --- a/classes/production/samply.share.client.v2/main/resources/log4j2.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - /tmp/log/ - C:/ProgramData/dktk/log/ - samply.share.client - .log - - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/mailTemplates/Footer.soy b/classes/production/samply.share.client.v2/main/resources/mailTemplates/Footer.soy deleted file mode 100644 index 3e167af2..00000000 --- a/classes/production/samply.share.client.v2/main/resources/mailTemplates/Footer.soy +++ /dev/null @@ -1,17 +0,0 @@ -{delpackage Footer} -{namespace samply.mailing} - -/** - * The footer of the mail - * @param? locale The locale of the mail - */ -{deltemplate footer} - {switch $locale} - {case 'de', 'de_DE'} - Mit freundlichen Grüßen,{\r}{\n} - Ihr DKTK-Brückenkopf - {default} - Yours sincerely,{\r}{\n} - Your DKTK Bridgehead - {/switch} -{/deltemplate} \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/mailTemplates/MainMailTemplate.soy b/classes/production/samply.share.client.v2/main/resources/mailTemplates/MainMailTemplate.soy deleted file mode 100644 index cf047686..00000000 --- a/classes/production/samply.share.client.v2/main/resources/mailTemplates/MainMailTemplate.soy +++ /dev/null @@ -1,46 +0,0 @@ -{namespace samply.mailing} - -/** - * A personal greeting. - * @param? name The name of the person. - * @param? title The title of the person. - * @param? locale The locale of the mail - */ -{deltemplate greeting} - {switch $locale} - {case 'de', 'de_DE', 'de_CH'} - {if $name} - Sehr geehrte/r Herr/Frau {if $title}{$title} {/if}{$name} - {else} - Sehr geehrte Damen und Herren - {/if} - {default} - Dear{sp} - {if $name} - {if $title} - {$title} - {else} - Mr/Mrs - {/if} - {sp}{$name} - {else} - Sir or Madam - {/if} - {/switch}, -{/deltemplate} - -/** - * Mail template - * @param? name The name of the addressed person. - * @param? title The title of the addressed person. - * @param? locale The locale of the mail - */ -{template .mail} - - {delcall greeting allowemptydefault="false" data="all" /}{\n}{\n} - - {delcall maincontent allowemptydefault="false" data="all" /}{\n}{\n} - - {delcall footer allowemptydefault="true" data="all" /}{\n}{\n} - -{/template} \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/mailTemplates/NewInquiriesContent.soy b/classes/production/samply.share.client.v2/main/resources/mailTemplates/NewInquiriesContent.soy deleted file mode 100644 index c2394877..00000000 --- a/classes/production/samply.share.client.v2/main/resources/mailTemplates/NewInquiriesContent.soy +++ /dev/null @@ -1,19 +0,0 @@ -{delpackage NewInquiriesContent} -{namespace samply.mailing} - -/** - * Main content for a notification mail about new inquiries. - * @param? locale The locale of the mail - * @param results links to the results - */ -{deltemplate maincontent} - {switch $locale} - {case 'de', 'de_DE'} - {\n} - Auf Ihrem Teiler sind neue Suchanfragen eingegangen.{sp} Bitte prüfen Sie diese: - {default} - You have new inquiries with results on samply share. Please login and check them: - {/switch} - {\n}{\n} - {$results} -{/deltemplate} \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/quality-report-info.xlsx b/classes/production/samply.share.client.v2/main/resources/quality-report-info.xlsx deleted file mode 100644 index de160786..00000000 Binary files a/classes/production/samply.share.client.v2/main/resources/quality-report-info.xlsx and /dev/null differ diff --git a/classes/production/samply.share.client.v2/main/resources/quartz-jobs.xml b/classes/production/samply.share.client.v2/main/resources/quartz-jobs.xml deleted file mode 100644 index 15b3ac24..00000000 --- a/classes/production/samply.share.client.v2/main/resources/quartz-jobs.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - CollectInquiriesJob - DecentralSearchGroup - This Job collects inquiries from all brokers this instance of share-client is registered to, - stores them in the database and spawns ExecuteInquiriesJobs - - de.samply.share.client.job.CollectInquiriesJob - true - false - - - SHOW - true - - - - - - - - ExecuteInquiriesJob - DecentralSearchGroup - This Job collects inquiries from all brokers this instance of share-client is registered to, - stores them in the database and spawns ExecuteInquiriesJobs - - de.samply.share.client.job.ExecuteInquiriesJob - true - false - - - SHOW - true - - - - - - - - UploadToCentralMdsDbJobDktkFlag - CentralSearchGroup - This Job prepares and/or performs an upload to the central mds database, depending on the status. It performs an incremental upload of those patients that gave their explicit consent to be included in the DKTK. - de.samply.share.client.job.UploadToCentralMdsDbJob - true - false - - - SHOW - true - - - - status - US_NEW - - - - dktk_flagged - true - - - - - - - - UploadToCentralMdsDbJobNoDktkFlag - CentralSearchGroup - This Job prepares and/or performs an upload to the central mds database, depending on the status. It performs an upload of those patients, that have not explicitly given their consent to be included in DKTK, but can be uploaded due to another given consent. - de.samply.share.client.job.UploadToCentralMdsDbJob - true - false - - - SHOW - true - - - - status - US_NEW - - - - dktk_flagged - false - - - - - - - - CheckLocalComponentsJob - MaintenanceGroup - This job checks the other local components (id manager, local datamanagement) for their version and status - de.samply.share.client.job.CheckLocalComponentsJob - true - false - - - SHOW - true - - - - - - - - DbCleanupJob - MaintenanceGroup - Do some housekeeping in the database (e.g. mark inquiries as archived after a certain amount of time) - de.samply.share.client.job.DbCleanupJob - true - false - - - SHOW - true - - - - - - - - ReportToMonitoringJob - MaintenanceGroup - This job performs tests to determine values for an amount of patient data available or how long it takes to execute an inquiry - de.samply.share.client.job.ReportToMonitoringJob - true - false - - - SHOW - true - - - - - - - - SendNotificationsJob - DecentralSearchGroup - This job checks if there are inquiry results with a result size greater than zero about which - no user has been notified yet. It sends e-mails to the configured users (given that a mail relay is - configured) and marks that a notification has been sent - - de.samply.share.client.job.SendNotificationsJob - true - false - - - SHOW - true - - - - - - - - - - ExecuteInquiryJob - InquiryGroup - This Job posts an inquiry to the local datamanagement, stores the location and spawns a CheckInquiryStatusJob - de.samply.share.client.job.ExecuteInquiryJob - true - false - - - - - - CheckInquiryStatusJob - InquiryGroup - This Job checks the status of the given inquiry and spawns new jobs if necessary - de.samply.share.client.job.CheckInquiryStatusJob - true - false - - - - - - GenerateInquiryResultStatsJob - InquiryGroup - This Job generates statistics (by gender and by age) for an inquiry result - de.samply.share.client.job.GenerateInquiryResultStatsJob - true - false - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/resources/quartz.properties b/classes/production/samply.share.client.v2/main/resources/quartz.properties deleted file mode 100644 index 94d40e41..00000000 --- a/classes/production/samply.share.client.v2/main/resources/quartz.properties +++ /dev/null @@ -1,19 +0,0 @@ -#============================================================================ -# Configure Main Scheduler Properties -#============================================================================ -org.quartz.scheduler.instanceName=SamplyShareScheduler -org.quartz.scheduler.interruptJobsOnShutdownWithWait=true - -#============================================================================ -# Configure ThreadPool -#============================================================================ -org.quartz.threadPool.threadCount=10 - -#============================================================================ -# Configure JobStore -#============================================================================ -org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore - -org.quartz.plugin.jobInitializer.class=org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin -org.quartz.plugin.jobInitializer.fileNames=quartz-jobs.xml -org.quartz.plugin.jobInitializer.failOnFileNotFound=true \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/META-INF/MANIFEST.MF b/classes/production/samply.share.client.v2/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 2e85ae0b..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Title: Samply Share Client -Implementation-Version: 3.0.1-SNAPSHOT -Built-By: deniz -Specification-Title: Samply Share Client -Implementation-Vendor-Id: de.samply -Samply-Project-Context: dktk -Created-By: Apache Maven 3.3.9 -Build-Jdk: 1.8.0_162 -Specification-Version: 3.0.1-SNAPSHOT - diff --git a/classes/production/samply.share.client.v2/main/webapp/META-INF/context.xml b/classes/production/samply.share.client.v2/main/webapp/META-INF/context.xml deleted file mode 100644 index 235e3eae..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/bug.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/bug.xhtml deleted file mode 100644 index 9f71b728..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/bug.xhtml +++ /dev/null @@ -1,6 +0,0 @@ - - You got a RuntimeException! There's a BUG somewhere! - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/database.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/database.xhtml deleted file mode 100644 index cf9cf966..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/database.xhtml +++ /dev/null @@ -1,6 +0,0 @@ - - Oops! DB fail! - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/expired.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/expired.xhtml deleted file mode 100644 index 8518eb1c..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/errorpages/expired.xhtml +++ /dev/null @@ -1,9 +0,0 @@ - - Sorry... The session has expired! - -

Back to initial page.

- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/faces-config.xml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index 058712fb..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - de - de - - - de.samply.share.client.messages.messages - msg - - - org.omnifaces.resourcehandler.UnmappedResourceHandler - - - - org.omnifaces.exceptionhandler.FullAjaxExceptionHandlerFactory - - - - - - javax.faces.Message - javax.faces.Message - de.samply.common.web.jsf.renderer.BootstrapMessageRenderer - - - javax.faces.Messages - javax.faces.Messages - de.samply.common.web.jsf.renderer.BootstrapMessagesRenderer - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_centralMdsDb.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_centralMdsDb.xhtml deleted file mode 100644 index c12491b5..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_centralMdsDb.xhtml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - -
- #{msg.configuration_centralSearch} - - - - - - - - - - - - - - - - - - #{msg.configuration_manageCredentialsLink} - - - - - - - - - - -
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_interfaces.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_interfaces.xhtml deleted file mode 100644 index a41b7f45..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_interfaces.xhtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - -
- #{msg.configuration_interfaces} - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_mdr.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_mdr.xhtml deleted file mode 100644 index 37fe5779..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_mdr.xhtml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - -
- #{msg.configuration_mdr} - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_misc.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_misc.xhtml deleted file mode 100644 index d93a7d25..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_misc.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
- #{msg.configuration_misc} - - - - - - - -
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_monitoring.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_monitoring.xhtml deleted file mode 100644 index 05991ddb..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_monitoring.xhtml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - -
- #{msg.configuration_monitoring} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_proxy.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_proxy.xhtml deleted file mode 100644 index d7c38b20..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_proxy.xhtml +++ /dev/null @@ -1,52 +0,0 @@ - - - - -
- #{msg.configuration_networkSettings} - - - - - - - - - - - - -
- - diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_timings.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_timings.xhtml deleted file mode 100644 index f058b6d3..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_configuration_timings.xhtml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - -
- #{msg.configurationTimings} - - - -
- - - -
- #{msg.configuration_seconds} -
-
- - - - - -
- - - -
- #{msg.configuration_seconds} -
-
- - - - - - - - - - - - - -
- - - -
- #{msg.configuration_seconds} -
-
- - - - - - - - - - - - - -
- - - -
- #{msg.configuration_days} -
-
- - - -
- - diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_documents.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_documents.xhtml deleted file mode 100644 index 74cf2993..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_documents.xhtml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - -
- -

#{msg.si_documents} #{fn:length(inquiryBean.documents)} - -

- -
- - - - -
-
- -
-
-
- -
-
-
- -
-
- -
-
- - - - -
-
- -
-
-
- - - - - - - - - - -
-
-
- - - -
- - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_centralComponents.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_centralComponents.xhtml deleted file mode 100644 index a045c515..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_centralComponents.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_localComponents.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_localComponents.xhtml deleted file mode 100644 index 4d21196f..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_localComponents.xhtml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_welcome.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_welcome.xhtml deleted file mode 100644 index d41eb3bd..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_index_welcome.xhtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - -
-
-

Willkommen auf Ihrem DKTK Brückenkopf

-
-
-

Sie befinden sich auf der Einstiegsseite des Brückenkopfes am Standort #{applicationBean.infos.name}. - Der Brückenkopf dient dazu, die Daten eines Standorts in ein DKTK-kompatibles Format zu überführen und - für die anderen Komponenten nutzbar zu machen. Er ist zwar Software des DKTK, wird jedoch unter lokaler - – also der in #{applicationBean.infos.name} – Hoheit betrieben. Weitere Informationen zum Brückenkopfkonzept - finden Sie in den Konzepten der DKTK-Arbeitsgruppe CCP-IT, die Sie unter - https://ccp-it.dktk.dkfz.de/ - frei herunterladen können.

-

Diese Seite zeigt, aus welchen Softwarekomponenten Ihr Brückenkopf besteht. Mit einem Linksklick auf - einen Eintrag werden Sie zur entsprechenden Komponente weitergeleitet. - Außerdem können Sie Erreichbarkeit und Version jeder Komponente einsehen.

- -

Bei Fragen wenden Sie sich an Ihren lokalen Brückenkopf-Administrator: -

- #{applicationBean.operator.firstName} - #{applicationBean.operator.lastName} - -
- - - - - - -
- - -
-

-
-
- \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_answer.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_answer.xhtml deleted file mode 100644 index 81c348b1..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_answer.xhtml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - -
-
#{msg.inqs_answeredAt}:
-
#{wu:convertTimestamp(inquiryBean.latestInquiryAnswer.sentAt)}
-
-
-
#{msg.inqs_reply}:
-
#{inquiryBean.latestInquiryAnswer.content}
-
- - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_contact.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_contact.xhtml deleted file mode 100644 index 455f6ea8..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_contact.xhtml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -
-
Name:
-
#{inquiryBean.selectedInquiryContact.title} #{inquiryBean.selectedInquiryContact.firstName} - #{inquiryBean.selectedInquiryContact.lastName}
-
-
-
#{msg.si_phone}:
-
#{inquiryBean.selectedInquiryContact.phone}
-
-
-
Email:
-
- - - - -
-
-
-
#{msg.si_institution}:
-
#{inquiryBean.selectedInquiryContact.organizationName}
-
- - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_events.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_events.xhtml deleted file mode 100644 index c95989e4..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_events.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - -
  • - -
    • -     -     -
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_graphs.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_graphs.xhtml deleted file mode 100644 index 2eb69f8b..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_graphs.xhtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
-
- - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_info.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_info.xhtml deleted file mode 100644 index d07b52cf..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_info.xhtml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - -
-
- - -
-
- - -
-
-
- - - - - - -
-
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_results.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_results.xhtml deleted file mode 100644 index 5fb5e0b4..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_inquiry_results.xhtml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - #{msg.si_resultsHiddenDetails} - - - - - - - - - - -

- - - -

-

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

- -

-
-
- - - - - - -
-
-

- - - - - -

-
-
-
    - - -
    - -
    - - - -     -
      -
-
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_loginPanel.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_loginPanel.xhtml deleted file mode 100644 index af2620c2..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_loginPanel.xhtml +++ /dev/null @@ -1,43 +0,0 @@ - - - -
- - - - - -
- \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_events.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_events.xhtml deleted file mode 100644 index 1f987e2a..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_events.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -
    - - - -
  • - -
    • -     -     -
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_info.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_info.xhtml deleted file mode 100644 index 04c104bd..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/includes/c_upload_info.xhtml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - -
-
- -
-
- -
-
- - -
-
- -
-
- -
-
- - -
-
- -
-
- - - - - - -
-
- - -
-
- -
-
- - - - - - -
-
- - -
-
- -
-
- - - - - - -
-
- - -
-
- -
-
- -
-
- - -
-
- -
-
- -
-
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/errorpage.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/errorpage.xhtml deleted file mode 100644 index 06284e96..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/errorpage.xhtml +++ /dev/null @@ -1,26 +0,0 @@ - - Error - - - -
    -
  • Date/time: #{of:formatDate(now, 'yyyy-MM-dd HH:mm:ss')}
    • -
  • User agent: #{header['user-agent']}
    • -
  • User IP: #{empty header['x-forwarded-for'] ? request.remoteAddr : fn:split(header['x-forwarded-for'], ',')[0]}
    • -
  • Request URI: #{requestScope['javax.servlet.error.request_uri']}
    • -
  • Ajax request: #{facesContext.partialViewContext.ajaxRequest ? 'Yes' : 'No'}
    • -
  • Status code: #{requestScope['javax.servlet.error.status_code']}
    • -
  • Exception type: #{requestScope['javax.servlet.error.exception_type']}
    • -
  • Exception message: #{requestScope['javax.servlet.error.message']}
    • -
  • Stack trace: 
    #{of:printStackTrace(requestScope['javax.servlet.error.exception'])}
    • -
- - scrollTo(0, 0); - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/globalTemplate.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/globalTemplate.xhtml deleted file mode 100644 index d82b4aef..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/globalTemplate.xhtml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - <h:outputText value="#{applicationBean.getDisplayName()} - "/> - <ui:insert name="title"> - <h:outputText value="??? MISSING PAGE TITLE ???" /> - </ui:insert> - - - - - - - - - - - - - - - maxInitValues(#{session.lastAccessedTime}, #{session.maxInactiveInterval} - 30, '#{msg.session_timeout_one}', - '#{msg.session_timeout_two}', '#{msg.session_timeout_two_min}', '#{msg.session_timeout_one_under}'); - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
-
-

- -

- -
- - -
-
- - - - - diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/layout.xhtml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/layout.xhtml deleted file mode 100644 index c37f7cab..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/templates/layout.xhtml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - <ui:insert name="title">#{applicationBean.getDisplayName()} - Error</ui:insert> - - - - - - - - - - - - - -
- - -
Server (re)started at #{of:formatDateWithTimezone(startup, 'd MMM yyyy HH:mm', 'UTC')} UTC
- -
-

- #{page.current.title} -

- -
-
- - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/web.xml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 033c42fe..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - DKTK.Teiler - - index.xhtml - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - Faces Servlet - /javax.faces.resource/* - *.xhtml - - - - - jersey-servlet - com.sun.jersey.spi.container.servlet.ServletContainer - - com.sun.jersey.config.property.packages - de.samply.share.client.rest - - 1 - - - jersey-servlet - /rest/* - - - - woff - application/x-font-woff - - - woff2 - application/x-font-woff2 - - - map - application/json - - - jsp - application/xhtml - - - - - 30 - - - - - javax.faces.FACELETS_LIBRARIES - /WEB-INF/webutils.taglib.xml - - - - javax.faces.PROJECT_STAGE - Development - - - javax.faces.FACELETS_SKIP_COMMENTS - true - - - State saving method: 'client' or 'server' (=default). See JSF Specification 2.5.2 - javax.faces.STATE_SAVING_METHOD - client - - - javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE - true - - - javax.faces.FACELETS_REFRESH_PERIOD - -1 - - - - - quartz:config-file - quartz.properties - - - quartz:shutdown-on-unload - true - - - quartz:wait-on-shutdown - true - - - quartz:start-scheduler-on-load - true - - - - - - - - - noCache - org.omnifaces.filter.CacheControlFilter - - - noCache - Faces Servlet - - - - - org.quartz.ee.servlet.QuartzInitializerListener - - - - - postgreSQL Datasource - jdbc/postgres - javax.sql.DataSource - Container - - - - - javax.faces.application.ViewExpiredException - /index.xhtml - - - java.sql.SQLException - /WEB-INF/errorpages/database.xhtml - - - java.lang.Throwable - /WEB-INF/errorpages/bug.xhtml - - - java.lang.NullPointerException - /WEB-INF/errorpages/bug.xhtml - - - - Restrict direct access to the /resources folder. - - The /resources folder. - /resources/* - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/webutils.taglib.xml b/classes/production/samply.share.client.v2/main/webapp/WEB-INF/webutils.taglib.xml deleted file mode 100644 index a912510c..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/WEB-INF/webutils.taglib.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - http://share.samply.de/webutils - - - getDesignation - de.samply.share.client.util.WebUtils - java.lang.String getDesignation(java.lang.String, java.lang.String) - - - getValueDesignation - de.samply.share.client.util.WebUtils - java.lang.String getValueDesignation(java.lang.String, java.lang.Object, java.lang.String) - - - convertTime - de.samply.share.client.util.WebUtils - java.lang.String convertTime(java.sql.Timestamp) - - - getProjectName - de.samply.share.client.util.WebUtils - java.lang.String getProjectName() - - - getVersionString - de.samply.share.client.util.WebUtils - java.lang.String getVersionString() - - - getBuildDate - de.samply.share.client.util.WebUtils - java.lang.String getBuildDate() - - - - - - - - - - - - - - - - - - - - - - - getParentNodeIndex - de.samply.share.client.util.WebUtils - java.lang.String getParentNodeIndex(java.lang.String) - - - getGender - de.samply.share.client.util.WebUtils - java.lang.String getGender(de.samply.share.model.common.Container) - - - - - - - - getBrokerCount - de.samply.share.client.util.WebUtils - long getBrokerCount() - - - getInquiryCount - de.samply.share.client.util.WebUtils - long getInquiryCount(de.samply.share.client.model.EnumInquiryStatus) - - - formatInquiryLogEntry - de.samply.share.client.util.WebUtils - java.lang.String formatInquiryLogEntry(de.samply.share.client.model.db.tables.pojos.EventLog) - - - convertTimestamp - de.samply.share.client.util.WebUtils - java.lang.String convertTimestamp(java.sql.Timestamp) - - - replaceLocalhost - de.samply.share.client.util.WebUtils - java.lang.String replaceLocalhostInUri(java.lang.String) - - - dateToGermanFormatString - de.samply.share.client.util.WebUtils - java.lang.String dateToGermanFormatString(java.util.Date) - - - getUsernameById - de.samply.share.client.util.WebUtils - java.lang.String getUsernameById(int) - - - isCentralSearchPathSet - de.samply.share.client.util.WebUtils - boolean isCentralSearchPathSet() - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/broker_list.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/broker_list.xhtml deleted file mode 100644 index 4cac7be2..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/broker_list.xhtml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - #{msg.bl_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#{msg.bl_broker}#{msg.common_email}#{msg.bl_status}#{msg.bl_lastCheck}#{msg.common_delete}
- - - - - -
- - - - - - -
- 		- - - - - -
- - -
- -

#{msg.bl_joinNewBroker}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/configuration.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/configuration.xhtml deleted file mode 100644 index a62eecd9..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/configuration.xhtml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - #{msg.configuration_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - -
- - - -
- - - -
- - - -
- - - - -
-
- - -
-
- - - -
-
- - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/credentials_list.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/credentials_list.xhtml deleted file mode 100644 index 1dbe7642..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/credentials_list.xhtml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - #{msg.cl_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#{msg.cl_targetType}#{msg.cl_credentialType}#{msg.common_username}#{msg.common_password}#{msg.cl_workstation}#{msg.cl_domain}#{msg.common_delete}
#{msg[creds.target]}#{msg[creds.authScheme]}#{creds.username}**********#{creds.workstation}#{creds.domain} - - - -
- - -
- -

#{msg.cl_addCredentials}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/dashboard.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/dashboard.xhtml deleted file mode 100644 index 51f3260b..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/dashboard.xhtml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - #{msg.dashboard_title} - - - -
- - - - - - -
- - - - -
- - - - -
- - - - - - -
- - - - - - -
- - - - -
- - - -
- - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/event_log.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/event_log.xhtml deleted file mode 100644 index 0f63bea7..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/event_log.xhtml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - #{msg.el_title} - - - - - - - - - - - - - - - - - - - - - -
#{msg.el_timestamp}#{msg.el_message}
- - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/inquiry_handling.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/inquiry_handling.xhtml deleted file mode 100644 index b7bbff00..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/inquiry_handling.xhtml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - #{msg.ih_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#{msg.bl_broker}#{msg.bl_requestFullResults}#{msg.ih_autoReply}
- - - - - - - - -
- - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/job_list.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/job_list.xhtml deleted file mode 100644 index 8b3f02c6..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/job_list.xhtml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - #{msg.jl_title} - - - - - -

- -

- - - - - \ No newline at end of file diff --git a/classes/production/samply.share.client.v2/main/webapp/admin/qualityreport_list.xhtml b/classes/production/samply.share.client.v2/main/webapp/admin/qualityreport_list.xhtml deleted file mode 100644 index 341de7b1..00000000 --- a/classes/production/samply.share.client.v2/main/webapp/admin/qualityreport_list.xhtml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - #{msg.qr_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- #{msg.qr_startTime}: #{qualityReportController.chainStatistics.startTime} -
-
- #{msg.qr_consumedTime}: #{qualityReportController.chainStatistics.timeConsumed} -
-
- #{msg.qr_remainingTime}: #{qualityReportController.chainStatistics.estimatedTimeToBeCompleted} -
- - -
-
- #{qualityReportController.chainStatistics.percentage}% -
-
- -
-
    - -
  • #{message}
    • -     -
-
- -
- - - - #{msg.common_cancel} - - - -
- - - - - - - - - -