Commit de564c98 authored 4 years ago by piotr.kupczyk@id.ethz.ch

Merge branch 'master' of sissource.ethz.ch:sispub/openbis

parents 5377a4b5 9b83e6e2

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

datastore_server/build.gradle 4 additions, 1 deletion

datastore_server/build.gradle
datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStack.java 138 additions, 131 deletions

...sx/cisd/etlserver/registrator/api/impl/RollbackStack.java
datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java 9 additions, 30 deletions

...gistrator/api/v1/impl/DataSetRegistrationTransaction.java
datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStack.java 2 additions, 17 deletions

...cisd/etlserver/registrator/api/v1/impl/RollbackStack.java
datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java 8 additions, 29 deletions

...gistrator/api/v2/impl/DataSetRegistrationTransaction.java
datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AbstractRecoveryState.java 3 additions, 3 deletions

...etlserver/registrator/recovery/AbstractRecoveryState.java
datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStackTest.java 20 additions, 8 deletions

...isd/etlserver/registrator/api/impl/RollbackStackTest.java
datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTestWithRollbackStack.java 3 additions, 6 deletions

...egistrator/api/v1/impl/AbstractTestWithRollbackStack.java
datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java 10 additions, 13 deletions

...rator/api/v1/impl/DataSetRegistrationTransactionTest.java
dbmigration/source/java/ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java 1 addition, 0 deletions

.../ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java
js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js 31 additions, 20 deletions

...1/as/webapps/openbis-v3-api-test/html/test/test-search.js
openbis/.gitignore 2 additions, 1 deletion

openbis/.gitignore
openbis/build.gradle 4 additions, 1 deletion

openbis/build.gradle
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectsOperationExecutor.java 19 additions, 7 deletions

...common/search/AbstractSearchObjectsOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypesOperationExecutor.java 1 addition, 1 deletion

...executor/dataset/SearchDataSetTypesOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetsOperationExecutor.java 1 addition, 1 deletion

.../v3/executor/dataset/SearchDataSetsOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypesOperationExecutor.java 1 addition, 1 deletion

...or/experiment/SearchExperimentTypesOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentsOperationExecutor.java 1 addition, 1 deletion

...ecutor/experiment/SearchExperimentsOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypesOperationExecutor.java 1 addition, 1 deletion

...ecutor/material/SearchMaterialTypesOperationExecutor.java
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialsOperationExecutor.java 1 addition, 1 deletion

...3/executor/material/SearchMaterialsOperationExecutor.java

with 260 additions and 273 deletions

Please register or to comment