Skip to content

Commit

Permalink
Merge pull request #2275 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.85
  • Loading branch information
René Reitmann authored Jun 24, 2019
2 parents 5a49ef1 + 654b96d commit d3ea7f8
Show file tree
Hide file tree
Showing 1,031 changed files with 84,435 additions and 55,656 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
- sudo apt-get -y install python-pip python-dev --allow-unauthenticated
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 11.6.0
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 12.4.0
- npm install -g bower
- npm install -g grunt-cli
script:
Expand All @@ -53,7 +53,7 @@ jobs:
- export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
- sudo apt-get -y install python-pip python-dev --allow-unauthenticated
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 11.6.0
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 12.4.0
- npm install -g bower
- npm install -g grunt-cli
- wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
Expand Down
8 changes: 7 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,9 @@ module.exports = function(grunt) {
'md-highlight-text',
'valid-project-version',
'project-does-not-exist',
'md-select-on-focus'
'md-select-on-focus',
'fdz-unique-concept-id',
'fdz-compose-concept-id'
]
},
files: {
Expand Down Expand Up @@ -689,6 +691,7 @@ module.exports = function(grunt) {
},
sources: {
src: ['src/main/webapp/scripts/studymanagement/**/translations*.js',
'src/main/webapp/scripts/conceptmanagement/**/translations*.js',
'src/main/webapp/scripts/surveymanagement/**/translations*.js',
'src/main/webapp/scripts/instrumentmanagement/**/translations*.js',
'src/main/webapp/scripts/questionmanagement/**/translations*.js',
Expand Down Expand Up @@ -758,6 +761,9 @@ module.exports = function(grunt) {
if (filename.includes('surveymanagement')) {
return 'Survey';
}
if (filename.includes('conceptmanagement')) {
return 'Concept';
}
if (filename.includes('instrumentmanagement')) {
return 'Instrument';
}
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"angular-nvd3": "^1.0.9",
"js-xlsx": "^0.14.0",
"cheet.js": "^0.3.3",
"angular-material": "1.1.18",
"angular-material": "1.1.19",
"angular-block-ui": "^0.2.2",
"lodash": "^4.17.11",
"plotly.js": "1.47.4",
"plotly.js": "1.48.3",
"highlightjs": "^9.12.0",
"angular-highlightjs": "^0.7.1",
"js-beautify": "^1.10.0",
Expand Down
4 changes: 2 additions & 2 deletions deploy/manifest-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ applications:
disk_quota: 1024M
instances: 2
buildpacks:
- https://github.com/cloudfoundry/java-buildpack#v4.19
- https://github.com/cloudfoundry/java-buildpack
env:
SPRING_PROFILES_ACTIVE: dev
JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'
JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 11.+}}'
JAVA_OPTS: '-Xss256k -XX:+UseG1GC -XX:+UseStringDeduplication'
services:
- mongodb
- elastic
- email
- dara
- rabbitmq
- metrics-forwarder-dev
timeout: 180
health-check-type: http
health-check-http-endpoint: /management/info
Expand Down
4 changes: 2 additions & 2 deletions deploy/manifest-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ applications:
disk_quota: 1024M
instances: 2
buildpacks:
- https://github.com/cloudfoundry/java-buildpack#v4.19
- https://github.com/cloudfoundry/java-buildpack
env:
SPRING_PROFILES_ACTIVE: prod
JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'
JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 11.+}}'
JAVA_OPTS: '-Xss256k -XX:+UseG1GC -XX:+UseStringDeduplication'
services:
- mongodb
- elastic
- email
- dara
- rabbitmq
- metrics-forwarder-prod
timeout: 180
health-check-type: http
health-check-http-endpoint: /management/info
Expand Down
4 changes: 2 additions & 2 deletions deploy/manifest-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ applications:
disk_quota: 1024M
instances: 2
buildpacks:
- https://github.com/cloudfoundry/java-buildpack#v4.19
- https://github.com/cloudfoundry/java-buildpack
env:
SPRING_PROFILES_ACTIVE: test
JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'
JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 11.+}}'
JAVA_OPTS: '-Xss256k -XX:+UseG1GC -XX:+UseStringDeduplication'
services:
- mongodb
- elastic
- email
- dara
- rabbitmq
- metrics-forwarder-test
timeout: 180
health-check-type: http
health-check-http-endpoint: /management/info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Country
=======

.. java:package:: eu.dzhw.fdz.metadatamanagement.surveymanagement.domain
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @Data @AllArgsConstructor public class Country
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.. java:import:: lombok AllArgsConstructor
.. java:import:: lombok Data
Language
========

.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @Data @AllArgsConstructor public class Language implements Comparable<Language>
Wrapper for a language code and it's respective display name.

Fields
------
displayName
^^^^^^^^^^^

.. java:field:: private final String displayName
:outertype: Language

Display name.

languageCode
^^^^^^^^^^^^

.. java:field:: private final String languageCode
:outertype: Language

Language code.

Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ Common domain objects which can be used in all other subdomains of this applicat
AbstractRdcDomainObject
AbstractShadowableRdcDomainObject
Counter
Country
I18nString
ImmutableI18nString
Language
Period
Person
Resolution
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
.. java:import:: java.util List
.. java:import:: java.util Set
.. java:import:: javax.validation Valid
.. java:import:: javax.validation.constraints NotEmpty
.. java:import:: javax.validation.constraints NotNull
.. java:import:: javax.validation.constraints Pattern
.. java:import:: javax.validation.constraints Size
.. java:import:: org.javers.core.metamodel.annotation Entity
.. java:import:: org.springframework.beans BeanUtils
.. java:import:: org.springframework.data.annotation Id
.. java:import:: org.springframework.data.mongodb.core.mapping Document
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain AbstractRdcDomainObject
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain I18nString
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain Person
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain.validation I18nStringEntireNotEmpty
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain.validation I18nStringSize
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain.validation StringLengths
.. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain.validation ValidIsoLanguage
.. java:import:: eu.dzhw.fdz.metadatamanagement.conceptmanagement.domain.projections ConceptSubDocumentProjection
.. java:import:: io.searchbox.annotations JestId
.. java:import:: io.swagger.annotations ApiModel
.. java:import:: lombok AllArgsConstructor
.. java:import:: lombok Builder
.. java:import:: lombok Data
.. java:import:: lombok EqualsAndHashCode
.. java:import:: lombok NoArgsConstructor
.. java:import:: lombok ToString
Concept
=======

.. java:package:: eu.dzhw.fdz.metadatamanagement.conceptmanagement.domain
:noindex:

.. java:type:: @Entity @Document @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel public class Concept extends AbstractRdcDomainObject implements ConceptSubDocumentProjection
A concept is something which cannot be observed directly but there is a model which helps observing the concept. E.g.: The concept "Personality" can be observed with the help of the five-factor model (Big5).

Fields
------
authors
^^^^^^^

.. java:field:: @Valid @NotEmpty private List<Person> authors
:outertype: Concept

List of \ :java:ref:`Person`\ s which have defined this concept. Must not be empty.

citationHint
^^^^^^^^^^^^

.. java:field:: @NotEmpty @Size private String citationHint
:outertype: Concept

Hint on how to cite this concept. Must not be empty and must not contain more than 2048 characters.

description
^^^^^^^^^^^

.. java:field:: @NotNull @I18nStringSize @I18nStringEntireNotEmpty private I18nString description
:outertype: Concept

A description of the concept. It must be specified in German and English and it must not contain more than 2048 characters.

doi
^^^

.. java:field:: @Size private String doi
:outertype: Concept

The doi of the paper defining the concept. Must not contain more than 512 characters.

id
^^

.. java:field:: @Id @JestId @NotEmpty @Pattern @Size private String id
:outertype: Concept

The id of the concept which uniquely identifies the concept in this application. Must not be empty and must not contain more than 512 characters. Must start with "con-" and end with "$" and must not contain any whitespace.

license
^^^^^^^

.. java:field:: @Size private String license
:outertype: Concept

The license of this concept. Must not contain more than 1 MB characters.

originalLanguages
^^^^^^^^^^^^^^^^^

.. java:field:: @NotEmpty private Set<String> originalLanguages
:outertype: Concept

The original languages of the definition of the concept as ISO 639 code. Must not be empty.

tags
^^^^

.. java:field:: @Valid private Tags tags
:outertype: Concept

Keywords for the concept. Must not be empty.

title
^^^^^

.. java:field:: @NotNull @I18nStringSize @I18nStringEntireNotEmpty private I18nString title
:outertype: Concept

The title of the concept. It must be specified in German and English and it must not contain more than 512 characters.

Loading

0 comments on commit d3ea7f8

Please sign in to comment.