diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
index 8e8ccbab9185684d93980942d3bfeb0cd1a250c0..120d3678316287b6df2f49918dec3128525c3287 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
@@ -1,19 +1,19 @@
-define([ 'jquery', 'openbis', 'dto/space/create/SpaceCreation', 'dto/project/create/ProjectCreation', 'dto/experiment/create/ExperimentCreation', 'dto/sample/create/SampleCreation',
- 'dto/material/create/MaterialCreation', 'dto/attachment/create/AttachmentCreation', 'dto/space/update/SpaceUpdate', 'dto/project/update/ProjectUpdate',
- 'dto/experiment/update/ExperimentUpdate', 'dto/sample/update/SampleUpdate', 'dto/dataset/update/DataSetUpdate', 'dto/dataset/update/PhysicalDataUpdate', 'dto/material/update/MaterialUpdate',
- 'dto/space/delete/SpaceDeletionOptions', 'dto/project/delete/ProjectDeletionOptions', 'dto/experiment/delete/ExperimentDeletionOptions', 'dto/sample/delete/SampleDeletionOptions',
- 'dto/dataset/delete/DataSetDeletionOptions', 'dto/material/delete/MaterialDeletionOptions', 'dto/entitytype/id/EntityTypePermId', 'dto/space/id/SpacePermId', 'dto/project/id/ProjectPermId',
- 'dto/project/id/ProjectIdentifier', 'dto/experiment/id/ExperimentPermId', 'dto/experiment/id/ExperimentIdentifier', 'dto/sample/id/SamplePermId', 'dto/dataset/id/DataSetPermId',
- 'dto/dataset/id/FileFormatTypePermId', 'dto/material/id/MaterialPermId', 'dto/tag/id/TagCode', 'dto/space/search/SpaceSearchCriteria', 'dto/project/search/ProjectSearchCriteria',
- 'dto/experiment/search/ExperimentSearchCriteria', 'dto/sample/search/SampleSearchCriteria', 'dto/dataset/search/DataSetSearchCriteria', 'dto/material/search/MaterialSearchCriteria',
- 'dto/space/fetchoptions/SpaceFetchOptions', 'dto/project/fetchoptions/ProjectFetchOptions', 'dto/experiment/fetchoptions/ExperimentFetchOptions', 'dto/sample/fetchoptions/SampleFetchOptions',
- 'dto/dataset/fetchoptions/DataSetFetchOptions', 'dto/material/fetchoptions/MaterialFetchOptions', 'dto/deletion/fetchoptions/DeletionFetchOptions', 'dto/deletion/search/DeletionSearchOptions'
+define([ 'jquery', 'openbis', 'as/dto/space/create/SpaceCreation', 'as/dto/project/create/ProjectCreation', 'as/dto/experiment/create/ExperimentCreation', 'as/dto/sample/create/SampleCreation',
+ 'as/dto/material/create/MaterialCreation', 'as/dto/attachment/create/AttachmentCreation', 'as/dto/space/update/SpaceUpdate', 'as/dto/project/update/ProjectUpdate',
+ 'as/dto/experiment/update/ExperimentUpdate', 'as/dto/sample/update/SampleUpdate', 'as/dto/dataset/update/DataSetUpdate', 'as/dto/dataset/update/PhysicalDataUpdate', 'as/dto/material/update/MaterialUpdate',
+ 'as/dto/space/delete/SpaceDeletionOptions', 'as/dto/project/delete/ProjectDeletionOptions', 'as/dto/experiment/delete/ExperimentDeletionOptions', 'as/dto/sample/delete/SampleDeletionOptions',
+ 'as/dto/dataset/delete/DataSetDeletionOptions', 'as/dto/material/delete/MaterialDeletionOptions', 'as/dto/entitytype/id/EntityTypePermId', 'as/dto/space/id/SpacePermId', 'as/dto/project/id/ProjectPermId',
+ 'as/dto/project/id/ProjectIdentifier', 'as/dto/experiment/id/ExperimentPermId', 'as/dto/experiment/id/ExperimentIdentifier', 'as/dto/sample/id/SamplePermId', 'as/dto/dataset/id/DataSetPermId',
+ 'as/dto/dataset/id/FileFormatTypePermId', 'as/dto/material/id/MaterialPermId', 'as/dto/tag/id/TagCode', 'as/dto/space/search/SpaceSearchCriteria', 'as/dto/project/search/ProjectSearchCriteria',
+ 'as/dto/experiment/search/ExperimentSearchCriteria', 'as/dto/sample/search/SampleSearchCriteria', 'as/dto/dataset/search/DataSetSearchCriteria', 'as/dto/material/search/MaterialSearchCriteria',
+ 'as/dto/space/fetchoptions/SpaceFetchOptions', 'as/dto/project/fetchoptions/ProjectFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/sample/fetchoptions/SampleFetchOptions',
+ 'as/dto/dataset/fetchoptions/DataSetFetchOptions', 'as/dto/material/fetchoptions/MaterialFetchOptions', 'as/dto/deletion/fetchoptions/DeletionFetchOptions', 'as/dto/deletion/search/DeletionSearchCriteria'
], function($, openbis, SpaceCreation,
ProjectCreation, ExperimentCreation, SampleCreation, MaterialCreation, AttachmentCreation, SpaceUpdate, ProjectUpdate, ExperimentUpdate, SampleUpdate, DataSetUpdate, PhysicalDataUpdate,
MaterialUpdate, SpaceDeletionOptions, ProjectDeletionOptions, ExperimentDeletionOptions, SampleDeletionOptions, DataSetDeletionOptions, MaterialDeletionOptions, EntityTypePermId, SpacePermId,
ProjectPermId, ProjectIdentifier, ExperimentPermId, ExperimentIdentifier, SamplePermId, DataSetPermId, FileFormatTypePermId, MaterialPermId, TagCode, SpaceSearchCriteria,
ProjectSearchCriteria, ExperimentSearchCriteria, SampleSearchCriteria, DataSetSearchCriteria, MaterialSearchCriteria, SpaceFetchOptions, ProjectFetchOptions, ExperimentFetchOptions,
- SampleFetchOptions, DataSetFetchOptions, MaterialFetchOptions, DeletionFetchOptions, DeletionSearchOptions) {
+ SampleFetchOptions, DataSetFetchOptions, MaterialFetchOptions, DeletionFetchOptions, DeletionSearchCriteria) {
/*
* These tests should be run against openBIS instance with screening sprint
@@ -75,7 +75,7 @@ define([ 'jquery', 'openbis', 'dto/space/create/SpaceCreation', 'dto/project/cre
this.DataSetFetchOptions = DataSetFetchOptions;
this.MaterialFetchOptions = MaterialFetchOptions;
this.DeletionFetchOptions = DeletionFetchOptions;
- this.DeletionSearchOptions = DeletionSearchOptions;
+ this.DeletionSearchCriteria = DeletionSearchCriteria;
this.generateId = function(base) {
var date = new Date();
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto.js
index 2c1d7e92ab5f5b61b3e4bb0213cff9ca64dc1b33..a1d1d66dc9743d3ff42a73242ccf96eee6cee4da 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto.js
@@ -9,14 +9,14 @@ define([ 'test/common' ], function(common) {
var c = new common(assert);
c.assertEqual(criteria.getFieldName(), expectedName, "Field name");
c.assertEqual(criteria.getFieldType(), expextedType, "Field type");
- c.assertEqual(criteria.getFieldValue()["@type"], "dto.common.search." + expectedValueType, "Field value type");
+ c.assertEqual(criteria.getFieldValue()["@type"], "as.dto.common.search." + expectedValueType, "Field value type");
c.assertEqual(criteria.getFieldValue().getValue(), expectedValue, "Field value");
}
var checkStringFieldSearchCriteria = function(assert, criteriaClassName, name, type) {
var done = assert.async();
- require([ 'dto/common/search/' + criteriaClassName ], function(Criteria) {
+ require([ 'as/dto/common/search/' + criteriaClassName ], function(Criteria) {
var criteria = new Criteria(name, type);
criteria.thatEquals("ABC");
assertAttributes(assert, criteria, name, type, "StringEqualToValue", "ABC");
@@ -57,7 +57,7 @@ define([ 'test/common' ], function(common) {
var checkNumberFieldSearchCriteria = function(assert, criteriaClassName, name, type) {
var done = assert.async();
- require([ 'dto/common/search/' + criteriaClassName ], function(Criteria) {
+ require([ 'as/dto/common/search/' + criteriaClassName ], function(Criteria) {
var criteria = new Criteria(name, type);
criteria.thatEquals(42);
assertAttributes(assert, criteria, name, type, "NumberEqualToValue", 42);
@@ -94,7 +94,7 @@ define([ 'test/common' ], function(common) {
var checkDateFieldSearchCriteria = function(assert, criteriaClassName, name, type) {
var done = assert.async();
- require([ 'dto/common/search/' + criteriaClassName ], function(Criteria) {
+ require([ 'as/dto/common/search/' + criteriaClassName ], function(Criteria) {
var criteria = new Criteria(name, type);
checkDateFieldSearchCriteriaMethod(assert, criteria, "thatEquals", "EqualToValue", "equal", name, type);
checkDateFieldSearchCriteriaMethod(assert, criteria, "thatIsLaterThanOrEqualTo", "LaterThanOrEqualToValue", "later than or equal", name, type);
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
index 7a6ebe26ba689fab9a73c038d2c9fb4bb8d275d7..2e02fd49e8e10d2bcdd1c5e4b0ff74a78fae9a42 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
@@ -43,27 +43,27 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
//
var circularDependencies = {
"SampleChildrenSearchCriteria" : {
- containerClass : "dto.sample.search.SampleSearchCriteria",
+ containerClass : "as.dto.sample.search.SampleSearchCriteria",
method : "withChildren"
},
"SampleContainerSearchCriteria" : {
- containerClass : "dto.sample.search.SampleSearchCriteria",
+ containerClass : "as.dto.sample.search.SampleSearchCriteria",
method : "withContainer"
},
"SampleParentsSearchCriteria" : {
- containerClass : "dto.sample.search.SampleSearchCriteria",
+ containerClass : "as.dto.sample.search.SampleSearchCriteria",
method : "withParents"
},
"DataSetChildrenSearchCriteria" : {
- containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ containerClass : "as.dto.dataset.search.DataSetSearchCriteria",
method : "withChildren"
},
"DataSetContainerSearchCriteria" : {
- containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ containerClass : "as.dto.dataset.search.DataSetSearchCriteria",
method : "withContainer"
},
"DataSetParentsSearchCriteria" : {
- containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ containerClass : "as.dto.dataset.search.DataSetSearchCriteria",
method : "withParents"
},
}
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
index 33ca24c67858c5c2a85b560aef04cb8de4877e7e..c9a96435510f450eaa54c5fb3d93ef11f9c97f70 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
@@ -38,36 +38,43 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'test/naturalsort' ],
return fSearch(facade).then(function(results) {
var objects = results.getObjects();
+ c.assertTrue(objects.length > 1, "Got at least 2 objects");
+
c.ok("Sorting by " + fieldName);
var fieldGetterName = "get" + fieldName.substr(0, 1).toUpperCase() + fieldName.substr(1);
- objects.sort(function(o1, o2) {
+ var comparatorAsc = function(o1, o2) {
var v1 = o1[fieldGetterName](fieldParameters);
var v2 = o2[fieldGetterName](fieldParameters);
return naturalsort(v1, v2);
- });
+ };
+
+ var comparatorDesc = function(o1, o2) {
+ return comparatorAsc(o2, o1);
+ };
- var codes = objects.map(function(object) {
+ objects.sort(comparatorAsc);
+ var codesAsc = objects.map(function(object) {
return object.code;
});
- c.assertTrue(codes.length > 1, "Got at least 2 objects");
-
- var secondFromStart = codes[1];
- var secondFromEnd = codes[codes.length - 2];
+ objects.sort(comparatorDesc);
+ var codesDesc = objects.map(function(object) {
+ return object.code;
+ });
fetchOptions.from(1).count(1);
fetchOptions.sortBy()[fieldName](fieldParameters);
return fSearch(facade).then(function(results) {
c.ok("Got results ASC");
- c.assertObjectsWithValues(results.getObjects(), "code", [ secondFromStart ]);
+ c.assertObjectsWithValues(results.getObjects(), "code", [ codesAsc[1] ]);
fetchOptions.sortBy()[fieldName](fieldParameters).desc();
return fSearch(facade).then(function(results) {
c.ok("Got results DESC");
- c.assertObjectsWithValues(results.getObjects(), "code", [ secondFromEnd ]);
+ c.assertObjectsWithValues(results.getObjects(), "code", [ codesDesc[1] ]);
c.finish();
});
});
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
index 9cf689e8ba3c326d6b643790e57cce7b0b0b2b87..1002184a59bf7a4f95e58d2eba3294f072e08770 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
@@ -657,7 +657,7 @@ public class DtoGenerator
print("/*");
print(" * Class automatically generated with %s", this.getClass().getSimpleName());
print(" */");
- print("@JsonObject(\"dto.%s.%s\")", jsonPackage, className);
+ print("@JsonObject(\"as.dto.%s.%s\")", jsonPackage, className);
String extendsStr = "";
if (extendsClass != null)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/Attachment.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/Attachment.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/Attachment.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/Attachment.js
index adf1d9cdb91ebc83f80d381d296e4a3bb2fb0c84..e17b870c439dc8c66b907920d1049a6885a65c7d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/Attachment.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/Attachment.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Attachment = function() {
};
stjs.extend(Attachment, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.attachment.Attachment';
+ prototype['@type'] = 'as.dto.attachment.Attachment';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.fileName = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/create/AttachmentCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/create/AttachmentCreation.js
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/create/AttachmentCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/create/AttachmentCreation.js
index 1074f82ccf40a2a2d6a0985ab723d0a3cce714e5..0562ae158eff08c0e4294edb3286203dbbc43574 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/create/AttachmentCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/create/AttachmentCreation.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var AttachmentCreation = function() {
};
stjs.extend(AttachmentCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.attachment.create.AttachmentCreation';
+ prototype['@type'] = 'as.dto.attachment.create.AttachmentCreation';
constructor.serialVersionUID = 1;
prototype.fileName = null;
prototype.title = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentFetchOptions.js
similarity index 75%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentFetchOptions.js
index 63d2ee78eac0113d15fe631718032561274c9fd2..580cf66d8bf6424a610fb74fb3fe30f3701d3da0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentFetchOptions.js
@@ -2,12 +2,12 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/fetchoptions/PersonFetchOptions", "dto/common/fetchoptions/EmptyFetchOptions",
- "dto/attachment/fetchoptions/AttachmentSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/common/fetchoptions/EmptyFetchOptions",
+ "as/dto/attachment/fetchoptions/AttachmentSortOptions" ], function(require, stjs, FetchOptions) {
var AttachmentFetchOptions = function() {
};
stjs.extend(AttachmentFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.attachment.fetchoptions.AttachmentFetchOptions';
+ prototype['@type'] = 'as.dto.attachment.fetchoptions.AttachmentFetchOptions';
constructor.serialVersionUID = 1;
prototype.registrator = null;
prototype.previousVersion = null;
@@ -15,7 +15,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
prototype.sort = null;
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -40,7 +40,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.withContent = function() {
if (this.content == null) {
- var EmptyFetchOptions = require("dto/common/fetchoptions/EmptyFetchOptions");
+ var EmptyFetchOptions = require("as/dto/common/fetchoptions/EmptyFetchOptions");
this.content = new EmptyFetchOptions();
}
return this.content;
@@ -53,7 +53,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var AttachmentSortOptions = require("dto/attachment/fetchoptions/AttachmentSortOptions");
+ var AttachmentSortOptions = require("as/dto/attachment/fetchoptions/AttachmentSortOptions");
this.sort = new AttachmentSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentSortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentSortOptions.js
index cd09e84f0ef77c99c14b03ae3b1319382cea7d55..66d6faae9a9ea37326661eed0915787c50ff94cb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/fetchoptions/AttachmentSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/fetchoptions/AttachmentSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var AttachmentSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(AttachmentSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.attachment.fetchoptions.AttachmentSortOptions';
+ prototype['@type'] = 'as.dto.attachment.fetchoptions.AttachmentSortOptions';
constructor.serialVersionUID = 1;
}, {});
return AttachmentSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/AttachmentFileName.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/AttachmentFileName.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
index 553a1bdf9a83b3079bc2b88d2ad71dfa59b782a3..f78254597b5f0862df82dc9b98a2f84c19b0f5a8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/AttachmentFileName.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "util/Exceptions", "dto/attachment/id/IAttachmentId" ], function(stjs, exceptions, IAttachmentId) {
+define([ "stjs", "util/Exceptions", "as/dto/attachment/id/IAttachmentId" ], function(stjs, exceptions, IAttachmentId) {
/**
* @param fileName
* Attachment file name, e.g. "my_file.txt".
@@ -12,7 +12,7 @@ define([ "stjs", "util/Exceptions", "dto/attachment/id/IAttachmentId" ], functio
this.setFileName(fileName);
};
stjs.extend(AttachmentFileName, null, [ IAttachmentId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.id.attachment.AttachmentFileName';
+ prototype['@type'] = 'as.dto.id.attachment.AttachmentFileName';
constructor.serialVersionUID = 1;
prototype.fileName = null;
prototype.getFileName = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/IAttachmentId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/IAttachmentId.js
similarity index 74%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/IAttachmentId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/IAttachmentId.js
index f4ba8c1fc68097fad8f1a2dab30fb2a473686297..cd774390b3254f23965fe8cbf2523c00476d6569 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/id/IAttachmentId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/IAttachmentId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IAttachmentId = function() {
};
stjs.extend(IAttachmentId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/update/AttachmentListUpdateValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/update/AttachmentListUpdateValue.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/update/AttachmentListUpdateValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/update/AttachmentListUpdateValue.js
index fc064fbde233ad182db61c1757f9598a06473477..8c4a558f0d02ac515038c46b0c0a13c8a1865b73 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/attachment/update/AttachmentListUpdateValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/update/AttachmentListUpdateValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/ListUpdateValue" ], function(stjs, ListUpdateValue) {
+define([ "stjs", "as/dto/common/update/ListUpdateValue" ], function(stjs, ListUpdateValue) {
var AttachmentListUpdateValue = function() {
ListUpdateValue.call(this);
};
stjs.extend(AttachmentListUpdateValue, ListUpdateValue, [ ListUpdateValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.attachment.update.AttachmentListUpdateValue';
+ prototype['@type'] = 'as.dto.attachment.update.AttachmentListUpdateValue';
constructor.serialVersionUID = 1;
}, {
actions : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/Enum.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/Enum.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/CacheMode.js
similarity index 78%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/CacheMode.js
index 67219fddb0f4fbc32c031ae68abafe38b469b676..5f639e40fde62f7eaa4ec69bd653bec37cf719bb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/CacheMode.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var CacheMode = function() {
Enum.call(this, [ "NO_CACHE", "CACHE", "RELOAD_AND_CACHE" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EmptyFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EmptyFetchOptions.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EmptyFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EmptyFetchOptions.js
index 566441ad880210eb5f1d14ec2bae4919b008bcc8..7c7b13db4dfa22ad482cce61255c18e94b4c1ab5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EmptyFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EmptyFetchOptions.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/fetchoptions/FetchOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions" ], function(stjs, FetchOptions) {
var EmptyFetchOptions = function() {
FetchOptions.call(this);
};
stjs.extend(EmptyFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.EmptyFetchOptions';
+ prototype['@type'] = 'as.dto.common.fetchoptions.EmptyFetchOptions';
constructor.serialVersionUID = 1;
prototype.sortBy = function() {
return null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntitySortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntitySortOptions.js
similarity index 84%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntitySortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntitySortOptions.js
index 394606741b5645e8db9bca06493af6eb7a66d27c..5f5c900dc89e973497da92f02525a7a2dca9da07 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntitySortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntitySortOptions.js
@@ -1,4 +1,4 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var EntitySortOptions = function() {
SortOptions.call(this);
};
@@ -10,7 +10,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(re
};
stjs.extend(EntitySortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.EntitySortOptions';
+ prototype['@type'] = 'as.dto.common.fetchoptions.EntitySortOptions';
constructor.serialVersionUID = 1;
prototype.code = function() {
return this.getOrCreateSorting(fields.CODE);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js
index 047e8fdb440352644c48d831644d37ec6f0e1de1..ed75f927afe7d82cfe3deb1411e0e8a1218b0024 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/EntityWithPropertiesSortOptions.js
@@ -1,4 +1,4 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
var EntityWithPropertiesSortOptions = function() {
EntitySortOptions.call(this);
};
@@ -8,7 +8,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/EntitySortOptions" ], funct
};
stjs.extend(EntityWithPropertiesSortOptions, EntitySortOptions, [ EntitySortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.EntityWithPropertiesSortOptions';
+ prototype['@type'] = 'as.dto.common.fetchoptions.EntityWithPropertiesSortOptions';
constructor.serialVersionUID = 1;
prototype.property = function(propertyName) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/FetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/FetchOptions.js
similarity index 82%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/FetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/FetchOptions.js
index a0f704e6063f77e0387539eb4e11d1d1d100206d..ddeec2c50eec710c404fdf2f396e809cb3f6c74d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/FetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/FetchOptions.js
@@ -1,11 +1,11 @@
-define([ "stjs", "dto/common/fetchoptions/CacheMode" ], function(stjs, CacheMode) {
+define([ "stjs", "as/dto/common/fetchoptions/CacheMode" ], function(stjs, CacheMode) {
var FetchOptions = function() {
this._count = null;
this._from = null;
this._cacheMode = CacheMode.NO_CACHE;
};
stjs.extend(FetchOptions, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.FetchOptions';
+ prototype['@type'] = 'as.dto.common.fetchoptions.FetchOptions';
constructor.serialVersionUID = 1;
prototype.count = function(count) {
this._count = count;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOptions.js
similarity index 76%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOptions.js
index 8e0ee21d685d5a536508b4983f95f497173deb1d..d9dc882cef503ae2f1a601a223fc8bca35e6a283 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOptions.js
@@ -1,10 +1,10 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOrder", "dto/common/fetchoptions/Sorting" ], function(require, stjs, SortOrder, Sorting) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOrder", "as/dto/common/fetchoptions/Sorting" ], function(require, stjs, SortOrder, Sorting) {
var SortOptions = function() {
this.sortings = [];
};
stjs.extend(SortOptions, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.SortOptions';
+ prototype['@type'] = 'as.dto.common.fetchoptions.SortOptions';
constructor.serialVersionUID = 1;
prototype.getOrCreateSorting = function(field) {
var order = this.getSorting(field);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOrder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOrder.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOrder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOrder.js
index c9832de676a0a83f4ee5a28ada4d15f80bdb31a9..b7d2531747c50c54b7e7d58d2c454c6fcf16d0e8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/SortOrder.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/SortOrder.js
@@ -4,7 +4,7 @@ define([ "require", "stjs" ], function(require, stjs) {
};
stjs.extend(SortOrder, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.SortOrder';
+ prototype['@type'] = 'as.dto.common.fetchoptions.SortOrder';
constructor.serialVersionUID = 1;
prototype.asc = function() {
this._asc = true;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/Sorting.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/Sorting.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/Sorting.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/Sorting.js
index fef14e8b0a6a0f6f058cb884dcfc39d59e441fe8..534db78593281c3681b2b8fbc8b1c64132f661c9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/Sorting.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/fetchoptions/Sorting.js
@@ -5,7 +5,7 @@ define([ "require", "stjs" ], function(require, stjs) {
};
stjs.extend(Sorting, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.fetchoptions.Sorting';
+ prototype['@type'] = 'as.dto.common.fetchoptions.Sorting';
constructor.serialVersionUID = 1;
prototype.getField = function() {
return this.field;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/CreationId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/CreationId.js
similarity index 83%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/CreationId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/CreationId.js
index beb4f76c406fa982637e22e24bf2a7aeb28bce2a..57c7f63cf9320aa1c223502a7d0eecd5b2d42e7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/CreationId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/CreationId.js
@@ -1,13 +1,13 @@
/**
* @author Jakub Straszewski
*/
-define([ "stjs", "dto/sample/id/ISampleId", "dto/dataset/id/IDataSetId", "dto/experiment/id/IExperimentId", "dto/project/id/IProjectId", "dto/space/id/ISpaceId", "dto/material/id/IMaterialId" ],
+define([ "stjs", "as/dto/sample/id/ISampleId", "as/dto/dataset/id/IDataSetId", "as/dto/experiment/id/IExperimentId", "as/dto/project/id/IProjectId", "as/dto/space/id/ISpaceId", "as/dto/material/id/IMaterialId" ],
function(stjs, ISampleId, IDataSetId, IExperimentId, IProjectId, ISpaceId, IMaterialId) {
var CreationId = function(creationId) {
this.creationId = creationId;
};
stjs.extend(CreationId, null, [ ISampleId, IDataSetId, IExperimentId, IProjectId, ISpaceId, IMaterialId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.id.CreationId';
+ prototype['@type'] = 'as.dto.common.id.CreationId';
constructor.serialVersionUID = 1;
prototype.creationId = null;
prototype.getCreationId = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/IObjectId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/IObjectId.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/IObjectId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/IObjectId.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectIdentifier.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectIdentifier.js
similarity index 89%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectIdentifier.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectIdentifier.js
index 386a259685622c20aaba4a00959ab333f91bf211..5b7694f54357a99274a639d5ce1f73af55f4dac1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectIdentifier.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectIdentifier.js
@@ -7,12 +7,12 @@
*
* @author pkupczyk
*/
-define([ "stjs", "util/Exceptions", "dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
+define([ "stjs", "util/Exceptions", "as/dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
var ObjectIdentifier = function(identifier) {
this.setIdentifier(identifier);
};
stjs.extend(ObjectIdentifier, null, [ IObjectId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.id.ObjectIdentifier';
+ prototype['@type'] = 'as.dto.common.id.ObjectIdentifier';
constructor.serialVersionUID = 1;
prototype.identifier = null;
prototype.getIdentifier = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectPermId.js
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectPermId.js
index 9034e9966538be093c015e9ac984db225e6be77f..0de597d5dabd1dd27e7a8543e509f008282cbd7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectPermId.js
@@ -7,12 +7,12 @@
*
* @author pkupczyk
*/
-define([ "stjs", "util/Exceptions", "dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
+define([ "stjs", "util/Exceptions", "as/dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
var ObjectPermId = function(permId) {
this.setPermId(permId);
};
stjs.extend(ObjectPermId, null, [ IObjectId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.id.ObjectPermId';
+ prototype['@type'] = 'as.dto.common.id.ObjectPermId';
constructor.serialVersionUID = 1;
prototype.permId = null;
prototype.getPermId = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectTechId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectTechId.js
similarity index 87%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectTechId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectTechId.js
index 9979e6590e6fab10a01e0450e218a19620f67cc7..d4cffad2f4bc1e358e5fa3f848a65afb85fbd2d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/id/ObjectTechId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/id/ObjectTechId.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "util/Exceptions", "dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
+define([ "stjs", "util/Exceptions", "as/dto/common/id/IObjectId" ], function(stjs, exceptions, IObjectId) {
var ObjectTechId = function(techId) {
this.setTechId(techId);
};
stjs.extend(ObjectTechId, null, [ IObjectId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.id.ObjectTechId';
+ prototype['@type'] = 'as.dto.common.id.ObjectTechId';
constructor.serialVersionUID = 1;
prototype.techId = null;
prototype.getTechId = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IAttachmentsHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IAttachmentsHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ICodeHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ICodeHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ICreationIdHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ICreationIdHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IModificationDateHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IModificationDateHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IModifierHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IModifierHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IParentChildrenHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IParentChildrenHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IPermIdHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IPermIdHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IPropertiesHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IPropertiesHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IRegistrationDateHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IRegistrationDateHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IRegistratorHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/IRegistratorHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ISpaceHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ISpaceHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ITagsHolder.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/interfaces/ITagsHolder.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/operations/IOperation.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/operations/IOperation.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/operations/IOperationResult.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/operations/IOperationResult.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractCompositeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
similarity index 84%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractCompositeSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
index 1bdb8df23a157831b635610d4bfcdbf890029ee9..02d2df10501adf68fb351973d47c6d5a9fb6346d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractCompositeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
@@ -1,13 +1,13 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractSearchCriteria", "dto/common/search/SearchOperator" ], function(stjs, AbstractSearchCriteria, SearchOperator) {
+define([ "stjs", "as/dto/common/search/AbstractSearchCriteria", "as/dto/common/search/SearchOperator" ], function(stjs, AbstractSearchCriteria, SearchOperator) {
var AbstractCompositeSearchCriteria = function() {
AbstractSearchCriteria.call(this);
this.criteria = [];
};
stjs.extend(AbstractCompositeSearchCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractCompositeSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AbstractCompositeSearchCriteria';
constructor.serialVersionUID = 1;
prototype.operator = SearchOperator.AND;
prototype.getCriteria = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateObjectValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateObjectValue.js
similarity index 63%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateObjectValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateObjectValue.js
index e9eefbd402279a307196c02320756ea562bf747a..fe2fbee5cd42cb8fcd1be3801f113deb97caee27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateObjectValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateObjectValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractValue", "dto/common/search/IDate" ], function(stjs, AbstractValue, IDate) {
+define([ "stjs", "as/dto/common/search/AbstractValue", "as/dto/common/search/IDate" ], function(stjs, AbstractValue, IDate) {
var AbstractDateObjectValue = function(value) {
AbstractValue.call(this, value);
};
stjs.extend(AbstractDateObjectValue, AbstractValue, [ AbstractValue, IDate ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractDateObjectValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractDateObjectValue';
constructor.serialVersionUID = 1;
prototype.getFormattedValue = function() {
return null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateValue.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateValue.js
index 01e69227b251968d724f954186cacf67ef2a8e14..729176100a55311a520db9e3f1c6deff12aa755a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractDateValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractDateValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractValue", "dto/common/search/IDate" ], function(stjs, AbstractValue, IDate) {
+define([ "stjs", "as/dto/common/search/AbstractValue", "as/dto/common/search/IDate" ], function(stjs, AbstractValue, IDate) {
var AbstractDateValue = function(value) {
AbstractValue.call(this, value);
};
stjs.extend(AbstractDateValue, AbstractValue, [ AbstractValue, IDate ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractDateValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractDateValue';
constructor.serialVersionUID = 1;
}, {});
return AbstractDateValue;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractEntitySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
similarity index 53%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractEntitySearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
index ae0114c728700a034813582eb42f17e30d42d09b..aaf12115e271adadfa1efee87b00d61e5da7eee7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractEntitySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
@@ -2,16 +2,16 @@
* @author pkupczyk
*/
define(
- [ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/SearchOperator", "dto/common/search/CodeSearchCriteria",
- "dto/entitytype/search/EntityTypeSearchCriteria", "dto/common/search/PermIdSearchCriteria", "dto/common/search/RegistrationDateSearchCriteria",
- "dto/common/search/ModificationDateSearchCriteria", "dto/common/search/NumberPropertySearchCriteria", "dto/tag/search/TagSearchCriteria",
- "dto/common/search/StringPropertySearchCriteria", "dto/common/search/DatePropertySearchCriteria", "dto/common/search/AnyPropertySearchCriteria",
- "dto/common/search/AnyFieldSearchCriteria", "dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria, SearchOperator) {
+ [ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/common/search/CodeSearchCriteria",
+ "as/dto/entitytype/search/EntityTypeSearchCriteria", "as/dto/common/search/PermIdSearchCriteria", "as/dto/common/search/RegistrationDateSearchCriteria",
+ "as/dto/common/search/ModificationDateSearchCriteria", "as/dto/common/search/NumberPropertySearchCriteria", "as/dto/tag/search/TagSearchCriteria",
+ "as/dto/common/search/StringPropertySearchCriteria", "as/dto/common/search/DatePropertySearchCriteria", "as/dto/common/search/AnyPropertySearchCriteria",
+ "as/dto/common/search/AnyFieldSearchCriteria", "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria, SearchOperator) {
var AbstractEntitySearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(AbstractEntitySearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.search.AbstractEntitySearchCriteria';
+ prototype['@type'] = 'as.dto.search.AbstractEntitySearchCriteria';
constructor.serialVersionUID = 1;
prototype.operator = SearchOperator.AND;
prototype.withOperator = function(anOperator) {
@@ -22,51 +22,51 @@ define(
return this.operator;
};
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.withType = function() {
- var EntityTypeSearchCriteria = require("dto/entitytype/search/EntityTypeSearchCriteria");
+ var EntityTypeSearchCriteria = require("as/dto/entitytype/search/EntityTypeSearchCriteria");
return this.addCriteria(new EntityTypeSearchCriteria());
};
prototype.withPermId = function() {
- var PermIdSearchCriteria = require("dto/common/search/PermIdSearchCriteria");
+ var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
prototype.withRegistrationDate = function() {
- var RegistrationDateSearchCriteria = require("dto/common/search/RegistrationDateSearchCriteria");
+ var RegistrationDateSearchCriteria = require("as/dto/common/search/RegistrationDateSearchCriteria");
return this.addCriteria(new RegistrationDateSearchCriteria());
};
prototype.withModificationDate = function() {
- var ModificationDateSearchCriteria = require("dto/common/search/ModificationDateSearchCriteria");
+ var ModificationDateSearchCriteria = require("as/dto/common/search/ModificationDateSearchCriteria");
return this.addCriteria(new ModificationDateSearchCriteria());
};
prototype.withNumberProperty = function(propertyName) {
- var NumberPropertySearchCriteria = require("dto/common/search/NumberPropertySearchCriteria");
+ var NumberPropertySearchCriteria = require("as/dto/common/search/NumberPropertySearchCriteria");
return this.addCriteria(new NumberPropertySearchCriteria(propertyName));
};
prototype.withTag = function() {
- var TagSearchCriteria = require("dto/tag/search/TagSearchCriteria");
+ var TagSearchCriteria = require("as/dto/tag/search/TagSearchCriteria");
return this.addCriteria(new TagSearchCriteria());
};
prototype.withProperty = function(propertyName) {
- var StringPropertySearchCriteria = require("dto/common/search/StringPropertySearchCriteria");
+ var StringPropertySearchCriteria = require("as/dto/common/search/StringPropertySearchCriteria");
return this.addCriteria(new StringPropertySearchCriteria(propertyName));
};
prototype.withDateProperty = function(propertyName) {
- var DatePropertySearchCriteria = require("dto/common/search/DatePropertySearchCriteria");
+ var DatePropertySearchCriteria = require("as/dto/common/search/DatePropertySearchCriteria");
return this.addCriteria(new DatePropertySearchCriteria(propertyName));
};
prototype.withAnyProperty = function() {
- var AnyPropertySearchCriteria = require("dto/common/search/AnyPropertySearchCriteria");
+ var AnyPropertySearchCriteria = require("as/dto/common/search/AnyPropertySearchCriteria");
return this.addCriteria(new AnyPropertySearchCriteria());
};
prototype.withAnyField = function() {
- var AnyFieldSearchCriteria = require("dto/common/search/AnyFieldSearchCriteria");
+ var AnyFieldSearchCriteria = require("as/dto/common/search/AnyFieldSearchCriteria");
return this.addCriteria(new AnyFieldSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setOperator(this.operator);
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractFieldSearchCriteria.js
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractFieldSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractFieldSearchCriteria.js
index 653e68c08f37e82c3c629ece326e7bd1330d0be8..27faf44f455aebe832a13faa5ba36423cdaf98a8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractFieldSearchCriteria.js
@@ -1,11 +1,11 @@
-define([ "stjs", "dto/common/search/AbstractSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, AbstractSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/AbstractSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, AbstractSearchCriteria, SearchFieldType) {
var AbstractFieldSearchCriteria = function(fieldName, fieldType) {
AbstractSearchCriteria.call(this);
this.fieldName = fieldName;
this.fieldType = fieldType;
};
stjs.extend(AbstractFieldSearchCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractFieldSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AbstractFieldSearchCriteria';
constructor.serialVersionUID = 1;
prototype.fieldName = null;
prototype.fieldType = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractNumberValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractNumberValue.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractNumberValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractNumberValue.js
index 1ce86732096721a1bcce0e78794ecbf985338325..bd92f62dd31dec673b7c73bb82264dc95a3b4edc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractNumberValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractNumberValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractValue" ], function(stjs, AbstractValue) {
+define([ "stjs", "as/dto/common/search/AbstractValue" ], function(stjs, AbstractValue) {
var AbstractNumberValue = function(number) {
AbstractValue.call(this, number);
};
stjs.extend(AbstractNumberValue, AbstractValue, [ AbstractValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractNumberValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractNumberValue';
constructor.serialVersionUID = 1;
}, {});
return AbstractNumberValue;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractObjectSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractObjectSearchCriteria.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractObjectSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractObjectSearchCriteria.js
index 7e5d1d346ae9d660d5eed7a9990864151f5cdf64..f6a578d567f19e624ef31cf428b8ad5089fe74f7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractObjectSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractObjectSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractCompositeSearchCriteria", "dto/common/search/IdSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria, IdSearchCriteria) {
+define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria", "as/dto/common/search/IdSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria, IdSearchCriteria) {
var AbstractObjectSearchCriteria = function() {
AbstractCompositeSearchCriteria.call(this);
};
stjs.extend(AbstractObjectSearchCriteria, AbstractCompositeSearchCriteria, [ AbstractCompositeSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractObjectSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AbstractObjectSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withId = function() {
return this.addCriteria(new IdSearchCriteria());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractSearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractSearchCriteria.js
index d4fbfaaef0d881d1b682fecec4980afe1c93285e..7150830e82d7ebc833d80cc9b08958bdda5ac27f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractSearchCriteria.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
+define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
var AbstractSearchCriteria = function() {
};
stjs.extend(AbstractSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AbstractSearchCriteria';
constructor.serialVersionUID = 1;
prototype.hashCode = function() {
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractStringValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractStringValue.js
similarity index 62%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractStringValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractStringValue.js
index 341e9cdf058618eff4b76511733dfc91e66158be..2da0b8312e2a6057f58b68f69af291de54cf367f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractStringValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractStringValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractValue" ], function(stjs, AbstractValue) {
+define([ "stjs", "as/dto/common/search/AbstractValue" ], function(stjs, AbstractValue) {
var AbstractStringValue = function(value) {
AbstractValue.call(this, value);
};
stjs.extend(AbstractStringValue, AbstractValue, [ AbstractValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractStringValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractStringValue';
constructor.serialVersionUID = 1;
}, {});
return AbstractStringValue;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractTimeZoneValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractTimeZoneValue.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractTimeZoneValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractTimeZoneValue.js
index 91dda8663f94420511d7a81ae71827fa8ca8d31d..ee35a1355f7b8e0b64eebfb63995e350d06cf3fb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractTimeZoneValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractTimeZoneValue.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var AbstractTimeZoneValue = function() {
};
stjs.extend(AbstractTimeZoneValue, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractTimeZoneValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractTimeZoneValue';
}, {});
return AbstractTimeZoneValue;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractValue.js
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractValue.js
index accac10557c19b710353320758402030d87255ce..94f37eb7f2a7039efa6675e62ac9ab42d3a2fe96 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AbstractValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractValue.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
this.value = value;
};
stjs.extend(AbstractValue, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AbstractValue';
+ prototype['@type'] = 'as.dto.common.search.AbstractValue';
constructor.serialVersionUID = 1;
prototype.value = null;
prototype.getValue = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyFieldSearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyFieldSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyFieldSearchCriteria.js
index 4bf8583b94e18ca582197ca5f36b11b3d5fc11eb..c6c19e89ea21fae5ff9984d0c41447f5929d858b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyFieldSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/StringFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/StringFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
var AnyFieldSearchCriteria = function() {
StringFieldSearchCriteria.call(this, "any", SearchFieldType.ANY_FIELD);
};
stjs.extend(AnyFieldSearchCriteria, StringFieldSearchCriteria, [ StringFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AnyFieldSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AnyFieldSearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyPropertySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyPropertySearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyPropertySearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyPropertySearchCriteria.js
index 04cb7f6d0e5ee5272f6f54f81b366cdc36e8292d..511117f47a7ac8bf6147560125b9f8116ef3f4ee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyPropertySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyPropertySearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/StringFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/StringFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
var AnyPropertySearchCriteria = function() {
StringFieldSearchCriteria.call(this, "any", SearchFieldType.ANY_PROPERTY);
};
stjs.extend(AnyPropertySearchCriteria, StringFieldSearchCriteria, [ StringFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AnyPropertySearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.AnyPropertySearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyStringValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyStringValue.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyStringValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyStringValue.js
index 62088e17ce4f9ecebe2204badd8c95148eeaa73a..9b5ed154a9dd1d2f349b34f939c9084fe8994013 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/AnyStringValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AnyStringValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
var AnyStringValue = function() {
AbstractStringValue.call(this, null);
};
stjs.extend(AnyStringValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.AnyStringValue';
+ prototype['@type'] = 'as.dto.common.search.AnyStringValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "any value";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/CodeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/CodeSearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/CodeSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/CodeSearchCriteria.js
index be906ed4f82c30e07c2290c7bfb7d8272667ddad..6d9a5ed564c5a06fffa399fb62cc879f41fe234c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/CodeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/CodeSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/StringFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/StringFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
var CodeSearchCriteria = function() {
StringFieldSearchCriteria.call(this, "code", SearchFieldType.ATTRIBUTE);
};
stjs.extend(CodeSearchCriteria, StringFieldSearchCriteria, [ StringFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.CodeSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.CodeSearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEarlierThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEarlierThanOrEqualToValue.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEarlierThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEarlierThanOrEqualToValue.js
index f05573c02da729de98df78849eef0b1f7345be8f..bf07c154d18dccd5412e029975a82c809e704be0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEarlierThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEarlierThanOrEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
var DateEarlierThanOrEqualToValue = function(value) {
AbstractDateValue.call(this, value);
};
stjs.extend(DateEarlierThanOrEqualToValue, AbstractDateValue, [ AbstractDateValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateEarlierThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateEarlierThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "earlier than or equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEqualToValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEqualToValue.js
index 23132f346e52700450b4c12c216796e2451ca3bb..826c6a50d6d961312478af6b7d4d3a2997ebbfb5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
var DateEqualToValue = function(value) {
AbstractDateValue.call(this, value);
};
stjs.extend(DateEqualToValue, AbstractDateValue, [ AbstractDateValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
similarity index 59%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateFieldSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
index 208975c72a1a5175531a240b419a6272f6c22407..dbd9bd5c479dea190c694363f1a76be26af8b1ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
@@ -1,7 +1,7 @@
-define([ "require", "stjs", "util/Exceptions", "dto/common/search/AbstractFieldSearchCriteria", "dto/common/search/ServerTimeZone", "dto/common/search/ShortDateFormat",
- "dto/common/search/NormalDateFormat", "dto/common/search/LongDateFormat", "dto/common/search/DateEqualToValue", "dto/common/search/DateObjectEqualToValue",
- "dto/common/search/DateLaterThanOrEqualToValue", "dto/common/search/DateObjectLaterThanOrEqualToValue", "dto/common/search/DateEarlierThanOrEqualToValue",
- "dto/common/search/DateObjectEarlierThanOrEqualToValue", "dto/common/search/TimeZone", "dto/common/search/AbstractDateValue", "util/DateFormat" ], function(require, stjs, exceptions,
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractFieldSearchCriteria", "as/dto/common/search/ServerTimeZone", "as/dto/common/search/ShortDateFormat",
+ "as/dto/common/search/NormalDateFormat", "as/dto/common/search/LongDateFormat", "as/dto/common/search/DateEqualToValue", "as/dto/common/search/DateObjectEqualToValue",
+ "as/dto/common/search/DateLaterThanOrEqualToValue", "as/dto/common/search/DateObjectLaterThanOrEqualToValue", "as/dto/common/search/DateEarlierThanOrEqualToValue",
+ "as/dto/common/search/DateObjectEarlierThanOrEqualToValue", "as/dto/common/search/TimeZone", "as/dto/common/search/AbstractDateValue", "util/DateFormat" ], function(require, stjs, exceptions,
AbstractFieldSearchCriteria, ServerTimeZone) {
var DateFieldSearchCriteria = function(fieldName, fieldType) {
AbstractFieldSearchCriteria.call(this, fieldName, fieldType);
@@ -9,11 +9,11 @@ define([ "require", "stjs", "util/Exceptions", "dto/common/search/AbstractFieldS
};
stjs.extend(DateFieldSearchCriteria, AbstractFieldSearchCriteria, [ AbstractFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.search.DateFieldSearchCriteria';
+ prototype['@type'] = 'as.dto.search.DateFieldSearchCriteria';
constructor.serialVersionUID = 1;
- var ShortDateFormat = require("dto/common/search/ShortDateFormat");
- var NormalDateFormat = require("dto/common/search/NormalDateFormat");
- var LongDateFormat = require("dto/common/search/LongDateFormat");
+ var ShortDateFormat = require("as/dto/common/search/ShortDateFormat");
+ var NormalDateFormat = require("as/dto/common/search/NormalDateFormat");
+ var LongDateFormat = require("as/dto/common/search/LongDateFormat");
constructor.DATE_FORMATS = [ new ShortDateFormat(), new NormalDateFormat(), new LongDateFormat() ];
var value = function(DateValueClass, DateObjectValueClass, date) {
if (date instanceof Date) {
@@ -22,18 +22,18 @@ define([ "require", "stjs", "util/Exceptions", "dto/common/search/AbstractFieldS
return new DateValueClass(date);
}
prototype.thatEquals = function(date) {
- var DateEqualToValue = require("dto/common/search/DateEqualToValue");
- var DateObjectEqualToValue = require("dto/common/search/DateObjectEqualToValue");
+ var DateEqualToValue = require("as/dto/common/search/DateEqualToValue");
+ var DateObjectEqualToValue = require("as/dto/common/search/DateObjectEqualToValue");
this.setFieldValue(value(DateEqualToValue, DateObjectEqualToValue, date));
};
prototype.thatIsLaterThanOrEqualTo = function(date) {
- var DateLaterThanOrEqualToValue = require("dto/common/search/DateLaterThanOrEqualToValue");
- var DateObjectLaterThanOrEqualToValue = require("dto/common/search/DateObjectLaterThanOrEqualToValue");
+ var DateLaterThanOrEqualToValue = require("as/dto/common/search/DateLaterThanOrEqualToValue");
+ var DateObjectLaterThanOrEqualToValue = require("as/dto/common/search/DateObjectLaterThanOrEqualToValue");
this.setFieldValue(value(DateLaterThanOrEqualToValue, DateObjectLaterThanOrEqualToValue, date));
};
prototype.thatIsEarlierThanOrEqualTo = function(date) {
- var DateEarlierThanOrEqualToValue = require("dto/common/search/DateEarlierThanOrEqualToValue");
- var DateObjectEarlierThanOrEqualToValue = require("dto/common/search/DateObjectEarlierThanOrEqualToValue");
+ var DateEarlierThanOrEqualToValue = require("as/dto/common/search/DateEarlierThanOrEqualToValue");
+ var DateObjectEarlierThanOrEqualToValue = require("as/dto/common/search/DateObjectEarlierThanOrEqualToValue");
this.setFieldValue(value(DateEarlierThanOrEqualToValue, DateObjectEarlierThanOrEqualToValue, date));
};
prototype.withServerTimeZone = function() {
@@ -41,7 +41,7 @@ define([ "require", "stjs", "util/Exceptions", "dto/common/search/AbstractFieldS
return this;
};
prototype.withTimeZone = function(hourOffset) {
- var TimeZone = require("dto/common/search/TimeZone");
+ var TimeZone = require("as/dto/common/search/TimeZone");
this.timeZone = new TimeZone(hourOffset);
return this;
};
@@ -56,7 +56,7 @@ define([ "require", "stjs", "util/Exceptions", "dto/common/search/AbstractFieldS
AbstractFieldSearchCriteria.prototype.setFieldValue.call(this, value);
};
constructor.checkValueFormat = function(value) {
- var AbstractDateValue = require("dto/common/search/AbstractDateValue");
+ var AbstractDateValue = require("as/dto/common/search/AbstractDateValue");
if (stjs.isInstanceOf(value.constructor, AbstractDateValue)) {
var formats = DateFieldSearchCriteria.DATE_FORMATS;
for ( var i in formats) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateLaterThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateLaterThanOrEqualToValue.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateLaterThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateLaterThanOrEqualToValue.js
index eb57c52de915d911abf436f91f6028d61a8d2e76..f571575d51ef88402698a89c47cee60768683a96 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateLaterThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateLaterThanOrEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateValue" ], function(stjs, AbstractDateValue) {
var DateLaterThanOrEqualToValue = function(value) {
AbstractDateValue.call(this, value);
};
stjs.extend(DateLaterThanOrEqualToValue, AbstractDateValue, [ AbstractDateValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateLaterThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateLaterThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "later than or equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEarlierThanOrEqualToValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEarlierThanOrEqualToValue.js
index ec632c283682e03724029c37ab2f717419afecf9..ca037c20db1ac2b86a8c6042ddf1bd69ac954a09 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEarlierThanOrEqualToValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
var DateObjectEarlierThanOrEqualToValue = function(value) {
AbstractDateObjectValue.call(this, value);
};
stjs.extend(DateObjectEarlierThanOrEqualToValue, AbstractDateObjectValue, [ AbstractDateObjectValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateObjectEarlierThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateObjectEarlierThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "earlier than or equal to '" + this.getFormattedValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEqualToValue.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEqualToValue.js
index 95789730d6d80eefd3b2c71c28173585d574f849..2fa4b437b4a14177541af4e01096186501bdef66 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectEqualToValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
var DateObjectEqualToValue = function(value) {
AbstractDateObjectValue.call(this, value);
};
stjs.extend(DateObjectEqualToValue, AbstractDateObjectValue, [ AbstractDateObjectValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateObjectEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateObjectEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "equal to '" + this.getFormattedValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectLaterThanOrEqualToValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectLaterThanOrEqualToValue.js
index cc71285441b9ccea02db65a5eddf53c61a9f9e55..9524515778047b4d446748a7bb94181ede7600e9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateObjectLaterThanOrEqualToValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
+define([ "stjs", "as/dto/common/search/AbstractDateObjectValue" ], function(stjs, AbstractDateObjectValue) {
var DateObjectLaterThanOrEqualToValue = function(value) {
AbstractDateObjectValue.call(this, value);
};
stjs.extend(DateObjectLaterThanOrEqualToValue, AbstractDateObjectValue, [ AbstractDateObjectValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DateObjectLaterThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.DateObjectLaterThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "later than or equal to '" + this.getFormattedValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DatePropertySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DatePropertySearchCriteria.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DatePropertySearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DatePropertySearchCriteria.js
index 33c50bb87bd72bd97eb83253429be24ce8899a00..05af695a7ea6923176a97ba5db09e53e034af4ac 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/DatePropertySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DatePropertySearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/DateFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/DateFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
var DatePropertySearchCriteria = function(fieldName) {
DateFieldSearchCriteria.call(this, fieldName, SearchFieldType.PROPERTY);
};
stjs.extend(DatePropertySearchCriteria, DateFieldSearchCriteria, [ DateFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.DatePropertySearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.DatePropertySearchCriteria';
constructor.serialVersionUID = 1;
}, {
DATE_FORMATS : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IDate.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IDate.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IDateFormat.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IDateFormat.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ISearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ISearchCriteria.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ISearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ISearchCriteria.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ITimeZone.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ITimeZone.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ITimeZone.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ITimeZone.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IdSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IdSearchCriteria.js
similarity index 82%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IdSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IdSearchCriteria.js
index e428117af571ba0625ab12a1ef1c57b50b4093b3..8bae60dd533117217ed1ca11d5dd3317211c19a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IdSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/IdSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractSearchCriteria" ], function(stjs, AbstractSearchCriteria) {
+define([ "stjs", "as/dto/common/search/AbstractSearchCriteria" ], function(stjs, AbstractSearchCriteria) {
var IdSearchCriteria = function() {
AbstractSearchCriteria.call(this);
};
stjs.extend(IdSearchCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.IdSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.IdSearchCriteria';
constructor.serialVersionUID = 1;
prototype.id = null;
prototype.thatEquals = function(id) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/LongDateFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/LongDateFormat.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/LongDateFormat.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/LongDateFormat.js
index d74d9ba2a79f5d5eb6bc69bfaf1f1801dafdf993..64893cc398632e79bece98803b37f849c24eed17 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/LongDateFormat.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/LongDateFormat.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
+define([ "stjs", "as/dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
var LongDateFormat = function() {
};
stjs.extend(LongDateFormat, null, [ IDateFormat ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.LongDateFormat';
+ prototype['@type'] = 'as.dto.common.search.LongDateFormat';
prototype.getFormat = function() {
return "YYYY-MM-DD HH:mm:ss";
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ModificationDateSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ModificationDateSearchCriteria.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ModificationDateSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ModificationDateSearchCriteria.js
index 8e1102d39222d5ee49710f6033493c66f6f822d6..b2a9bb8a31b684d74f5cc5319062f8e2647d63dc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ModificationDateSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ModificationDateSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/DateFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/DateFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
var ModificationDateSearchCriteria = function() {
DateFieldSearchCriteria.call(this, "modification_date", SearchFieldType.ATTRIBUTE);
};
stjs.extend(ModificationDateSearchCriteria, DateFieldSearchCriteria, [ DateFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.ModificationDateSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.ModificationDateSearchCriteria';
constructor.serialVersionUID = 1;
}, {
DATE_FORMATS : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NormalDateFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NormalDateFormat.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NormalDateFormat.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NormalDateFormat.js
index 6960b18c8be465071d69bacb4c86e3849addde2f..b6cc09bb84ecb37380972610e763b5643601be05 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NormalDateFormat.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NormalDateFormat.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
+define([ "stjs", "as/dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
var NormalDateFormat = function() {
};
stjs.extend(NormalDateFormat, null, [ IDateFormat ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NormalDateFormat';
+ prototype['@type'] = 'as.dto.common.search.NormalDateFormat';
prototype.getFormat = function() {
return "YYYY-MM-DD HH:mm";
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberEqualToValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberEqualToValue.js
index 21313a58aef29c7ca6766cec5a9f7c54a422a464..57778e71c93c6bd99a52206f976951fba8781981 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
+define([ "stjs", "as/dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
var NumberEqualToValue = function(number) {
AbstractNumberValue.call(this, number);
};
stjs.extend(NumberEqualToValue, AbstractNumberValue, [ AbstractNumberValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.NumberEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberFieldSearchCriteria.js
similarity index 54%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberFieldSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberFieldSearchCriteria.js
index f42aa3fd5f588640eb7c386083f68e86b9f01313..88fd61f3ad407e9525cef6b03f29f9dcc0f2f903 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberFieldSearchCriteria.js
@@ -1,30 +1,30 @@
-define([ "require", "stjs", "dto/common/search/AbstractFieldSearchCriteria", "dto/common/search/NumberEqualToValue", "dto/common/search/NumberLessThanValue",
- "dto/common/search/NumberLessThanOrEqualToValue", "dto/common/search/NumberGreaterThanValue", "dto/common/search/NumberGreaterThanOrEqualToValue" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/search/AbstractFieldSearchCriteria", "as/dto/common/search/NumberEqualToValue", "as/dto/common/search/NumberLessThanValue",
+ "as/dto/common/search/NumberLessThanOrEqualToValue", "as/dto/common/search/NumberGreaterThanValue", "as/dto/common/search/NumberGreaterThanOrEqualToValue" ], function(require, stjs,
AbstractFieldSearchCriteria) {
var NumberFieldSearchCriteria = function(fieldName, fieldType) {
AbstractFieldSearchCriteria.call(this, fieldName, fieldType);
};
stjs.extend(NumberFieldSearchCriteria, AbstractFieldSearchCriteria, [ AbstractFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberFieldSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.NumberFieldSearchCriteria';
constructor.serialVersionUID = 1;
prototype.thatEquals = function(number) {
- var NumberEqualToValue = require("dto/common/search/NumberEqualToValue");
+ var NumberEqualToValue = require("as/dto/common/search/NumberEqualToValue");
this.setFieldValue(new NumberEqualToValue(number));
};
prototype.thatIsLessThan = function(number) {
- var NumberLessThanValue = require("dto/common/search/NumberLessThanValue");
+ var NumberLessThanValue = require("as/dto/common/search/NumberLessThanValue");
this.setFieldValue(new NumberLessThanValue(number));
};
prototype.thatIsLessThanOrEqualTo = function(number) {
- var NumberLessThanOrEqualToValue = require("dto/common/search/NumberLessThanOrEqualToValue");
+ var NumberLessThanOrEqualToValue = require("as/dto/common/search/NumberLessThanOrEqualToValue");
this.setFieldValue(new NumberLessThanOrEqualToValue(number));
};
prototype.thatIsGreaterThan = function(number) {
- var NumberGreaterThanValue = require("dto/common/search/NumberGreaterThanValue");
+ var NumberGreaterThanValue = require("as/dto/common/search/NumberGreaterThanValue");
this.setFieldValue(new NumberGreaterThanValue(number));
};
prototype.thatIsGreaterThanOrEqualTo = function(number) {
- var NumberGreaterThanOrEqualToValue = require("dto/common/search/NumberGreaterThanOrEqualToValue");
+ var NumberGreaterThanOrEqualToValue = require("as/dto/common/search/NumberGreaterThanOrEqualToValue");
this.setFieldValue(new NumberGreaterThanOrEqualToValue(number));
};
}, {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanOrEqualToValue.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanOrEqualToValue.js
index d8f131d225339d6ee05072c9cf1d8e3cfe0efb22..7bec8192c576b31d6a72c04c8b1a988e469cafee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanOrEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
+define([ "stjs", "as/dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
var NumberGreaterOrEqualThanValue = function(number) {
AbstractNumberValue.call(this, number);
};
stjs.extend(NumberGreaterOrEqualThanValue, AbstractNumberValue, [ AbstractNumberValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberGreaterThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.NumberGreaterThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "greater or equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanValue.js
index 69520efa6c1531a784e9baa8e3d58d6548fdc25d..ad806f6c6b9aefa05eb0e73a6907997f7497684d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberGreaterThanValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberGreaterThanValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
+define([ "stjs", "as/dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
var NumberGreaterThanValue = function(number) {
AbstractNumberValue.call(this, number);
};
stjs.extend(NumberGreaterThanValue, AbstractNumberValue, [ AbstractNumberValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberGreaterThanValue';
+ prototype['@type'] = 'as.dto.common.search.NumberGreaterThanValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "greater than '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanOrEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanOrEqualToValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanOrEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanOrEqualToValue.js
index b8fd04ba49b19c342b0ef644dd118a61782d0d0a..850af284680fa93f95945fb2f2b7c180e56e0a51 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanOrEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanOrEqualToValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
+define([ "stjs", "as/dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
var NumberLessOrEqualThanValue = function(number) {
AbstractNumberValue.call(this, number);
};
stjs.extend(NumberLessOrEqualThanValue, AbstractNumberValue, [ AbstractNumberValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberLessThanOrEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.NumberLessThanOrEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "less or equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanValue.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanValue.js
index 1731f07f35b7579a334e308bc2197b24ef748242..0e4b200378d5e7abc7d23b9a9b4b4c6677f39b6f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberLessThanValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberLessThanValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
+define([ "stjs", "as/dto/common/search/AbstractNumberValue" ], function(stjs, AbstractNumberValue) {
var NumberLessThanValue = function(number) {
AbstractNumberValue.call(this, number);
};
stjs.extend(NumberLessThanValue, AbstractNumberValue, [ AbstractNumberValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberLessThanValue';
+ prototype['@type'] = 'as.dto.common.search.NumberLessThanValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "less than '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberPropertySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberPropertySearchCriteria.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberPropertySearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberPropertySearchCriteria.js
index e29cd0cbfcb4c0d3a1e976c898cca18bcf6e98df..0810f847ebd21c5e6971c32db43be270ecd3023f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/NumberPropertySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/NumberPropertySearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/NumberFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, NumberFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/NumberFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, NumberFieldSearchCriteria, SearchFieldType) {
var NumberPropertySearchCriteria = function(fieldName) {
NumberFieldSearchCriteria.call(this, fieldName, SearchFieldType.PROPERTY);
};
stjs.extend(NumberPropertySearchCriteria, NumberFieldSearchCriteria, [ NumberFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.NumberPropertySearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.NumberPropertySearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/PermIdSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/PermIdSearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/PermIdSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/PermIdSearchCriteria.js
index d24ada3d61e8564cf462380f7df1c28f79e25252..f5289936c2b2b19c97f62e7b414cbf9d76c1607c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/PermIdSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/PermIdSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/StringFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/StringFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
var PermIdSearchCriteria = function() {
StringFieldSearchCriteria.call(this, "perm id", SearchFieldType.ATTRIBUTE);
};
stjs.extend(PermIdSearchCriteria, StringFieldSearchCriteria, [ StringFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.PermIdSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.PermIdSearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/RegistrationDateSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/RegistrationDateSearchCriteria.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/RegistrationDateSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/RegistrationDateSearchCriteria.js
index 81a411e4b95b3fbed4a3616c7c3bb92fe14eb315..22f1e5288aadeb9e83b875af6df1c0f3dbfc6e91 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/RegistrationDateSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/RegistrationDateSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/DateFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/DateFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, DateFieldSearchCriteria, SearchFieldType) {
var RegistrationDateSearchCriteria = function() {
DateFieldSearchCriteria.call(this, "registration_date", SearchFieldType.ATTRIBUTE);
};
stjs.extend(RegistrationDateSearchCriteria, DateFieldSearchCriteria, [ DateFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.RegistrationDateSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.RegistrationDateSearchCriteria';
constructor.serialVersionUID = 1;
}, {
DATE_FORMATS : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchCriteriaToStringBuilder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
similarity index 88%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchCriteriaToStringBuilder.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
index 8cc8c425fee79e7709377f5e58284b1e0f535f3b..8e5c82ceb17f431516bf37a05b633b62e5a80e16 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchCriteriaToStringBuilder.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) {
+define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) {
var SearchCriteriaToStringBuilder = function() {
};
stjs.extend(SearchCriteriaToStringBuilder, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.SearchCriteriaToStringBuilder';
+ prototype['@type'] = 'as.dto.common.search.SearchCriteriaToStringBuilder';
prototype.name = null;
prototype.operator = null;
prototype.criteria = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchFieldType.js
similarity index 80%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchFieldType.js
index 3d9e74016cec37bed51ba2d782ba21bc9c40e4cd..2dae3c6554af7623e15a4e125e74f3a32155772b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchFieldType.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var SearchFieldType = function() {
Enum.call(this, [ "PROPERTY", "ATTRIBUTE", "ANY_PROPERTY", "ANY_FIELD" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchOperator.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchOperator.js
index dc375db653739c9a6b7ca1583f868c8491b68c7b..bcbcb60cedb60e418d0488760f8a849a8e78b1ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchOperator.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var SearchOperator = function() {
Enum.call(this, [ "AND", "OR" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchResult.js
similarity index 89%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchResult.js
index ba2b9ec272e926fc2bfcd66795adf17a2eb0f2bc..64feea32d31e57836002d604ba47132f39815d27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchResult.js
@@ -7,7 +7,7 @@ define([ "stjs" ], function(stjs) {
this.totalCount = 0;
};
stjs.extend(SearchResult, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.SearchResult';
+ prototype['@type'] = 'as.dto.common.search.SearchResult';
constructor.serialVersionUID = 1;
prototype.getObjects = function() {
return this.objects;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ServerTimeZone.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ServerTimeZone.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ServerTimeZone.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ServerTimeZone.js
index 7a9cb44f135ef8d59473462c07f7196006d9192b..a6c5fea09cf8e7d51131cce037386ab4f9402090 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ServerTimeZone.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ServerTimeZone.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ITimeZone" ], function(stjs, ITimeZone) {
+define([ "stjs", "as/dto/common/search/ITimeZone" ], function(stjs, ITimeZone) {
var ServerTimeZone = function() {
};
stjs.extend(ServerTimeZone, null, [ ITimeZone ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.ServerTimeZone';
+ prototype['@type'] = 'as.dto.common.search.ServerTimeZone';
}, {});
return ServerTimeZone;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ShortDateFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ShortDateFormat.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ShortDateFormat.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ShortDateFormat.js
index e031e08692f9b5b90a85695cab9a43d124ade24e..2390a4dd2b5ae39d51351c3f2a43dcd864089809 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/ShortDateFormat.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/ShortDateFormat.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
+define([ "stjs", "as/dto/common/search/IDateFormat" ], function(stjs, IDateFormat) {
var ShortDateFormat = function() {
};
stjs.extend(ShortDateFormat, null, [ IDateFormat ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.ShortDateFormat';
+ prototype['@type'] = 'as.dto.common.search.ShortDateFormat';
prototype.getFormat = function() {
return "YYYY-MM-DD";
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringContainsValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringContainsValue.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringContainsValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringContainsValue.js
index 159c07e5c7546a7e37672103ff68e8ad94a69650..d81b7eed2087f7f15ea050cb9dd023cf0e87f0a6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringContainsValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringContainsValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
var StringContainsValue = function(value) {
AbstractStringValue.call(this, value);
};
stjs.extend(StringContainsValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringContainsValue';
+ prototype['@type'] = 'as.dto.common.search.StringContainsValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "contains '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEndsWithValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEndsWithValue.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEndsWithValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEndsWithValue.js
index b6fc2b42230a9d813252ae573670ff4604af64ae..fdc3f641db045d10ebd1278ae5d54c558323da68 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEndsWithValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEndsWithValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
var StringEndsWithValue = function(value) {
AbstractStringValue.call(this, value);
};
stjs.extend(StringEndsWithValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringEndsWithValue';
+ prototype['@type'] = 'as.dto.common.search.StringEndsWithValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "ends with '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEqualToValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEqualToValue.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEqualToValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEqualToValue.js
index b37337ddeba790527a023ed1b96051d204a39d3c..afa753f12d1ea0372b4fede073503ea77fd648dd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringEqualToValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringEqualToValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
var StringEqualToValue = function(value) {
AbstractStringValue.call(this, value);
};
stjs.extend(StringEqualToValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringEqualToValue';
+ prototype['@type'] = 'as.dto.common.search.StringEqualToValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "equal to '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringFieldSearchCriteria.js
similarity index 52%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringFieldSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringFieldSearchCriteria.js
index 7de9b9073cd2b8c25675c4b3ed4fce7d596ce6de..fd9962f454cb889af5a0db69eb7613c513107615 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringFieldSearchCriteria.js
@@ -1,27 +1,27 @@
-define([ "require", "stjs", "dto/common/search/AbstractFieldSearchCriteria", "dto/common/search/StringEqualToValue", "dto/common/search/StringStartsWithValue",
- "dto/common/search/StringEndsWithValue", "dto/common/search/StringContainsValue", "dto/common/search/AnyStringValue" ], function(require, stjs, AbstractFieldSearchCriteria) {
+define([ "require", "stjs", "as/dto/common/search/AbstractFieldSearchCriteria", "as/dto/common/search/StringEqualToValue", "as/dto/common/search/StringStartsWithValue",
+ "as/dto/common/search/StringEndsWithValue", "as/dto/common/search/StringContainsValue", "as/dto/common/search/AnyStringValue" ], function(require, stjs, AbstractFieldSearchCriteria) {
var StringFieldSearchCriteria = function(fieldName, fieldType) {
AbstractFieldSearchCriteria.call(this, fieldName, fieldType);
- var AnyStringValue = require("dto/common/search/AnyStringValue");
+ var AnyStringValue = require("as/dto/common/search/AnyStringValue");
this.setFieldValue(new AnyStringValue());
};
stjs.extend(StringFieldSearchCriteria, AbstractFieldSearchCriteria, [ AbstractFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringFieldSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.StringFieldSearchCriteria';
constructor.serialVersionUID = 1;
prototype.thatEquals = function(string) {
- var StringEqualToValue = require("dto/common/search/StringEqualToValue");
+ var StringEqualToValue = require("as/dto/common/search/StringEqualToValue");
this.setFieldValue(new StringEqualToValue(string));
};
prototype.thatStartsWith = function(prefix) {
- var StringStartsWithValue = require("dto/common/search/StringStartsWithValue");
+ var StringStartsWithValue = require("as/dto/common/search/StringStartsWithValue");
this.setFieldValue(new StringStartsWithValue(prefix));
};
prototype.thatEndsWith = function(suffix) {
- var StringEndsWithValue = require("dto/common/search/StringEndsWithValue");
+ var StringEndsWithValue = require("as/dto/common/search/StringEndsWithValue");
this.setFieldValue(new StringEndsWithValue(suffix));
};
prototype.thatContains = function(string) {
- var StringContainsValue = require("dto/common/search/StringContainsValue");
+ var StringContainsValue = require("as/dto/common/search/StringContainsValue");
this.setFieldValue(new StringContainsValue(string));
};
}, {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringPropertySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringPropertySearchCriteria.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringPropertySearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringPropertySearchCriteria.js
index 8f8f73faf8c81ffb7c6b5488f39a4e3af6d54c33..1f435200fb20a5eb6ca392d4f0b7c7801ddb6dc0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringPropertySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringPropertySearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/StringFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/StringFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, StringFieldSearchCriteria, SearchFieldType) {
var StringPropertySearchCriteria = function(fieldName) {
StringFieldSearchCriteria.call(this, fieldName, SearchFieldType.PROPERTY);
};
stjs.extend(StringPropertySearchCriteria, StringFieldSearchCriteria, [ StringFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringPropertySearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.StringPropertySearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringStartsWithValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringStartsWithValue.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringStartsWithValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringStartsWithValue.js
index 7894c91a9673a2f399ad6bdb74ba3f74d1eed39e..659a6d85b3c235f5dc413fb48e8df6d9eb48852a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/StringStartsWithValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/StringStartsWithValue.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
var StringStartsWithValue = function(value) {
AbstractStringValue.call(this, value);
};
stjs.extend(StringStartsWithValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.StringStartsWithValue';
+ prototype['@type'] = 'as.dto.common.search.StringStartsWithValue';
constructor.serialVersionUID = 1;
prototype.toString = function() {
return "starts with '" + this.getValue() + "'";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TechIdSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TechIdSearchCriteria.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TechIdSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TechIdSearchCriteria.js
index b27dd33f237232dec778b75e0bd52f16ae92e752..3a6b41946fe0041bef04fb6a3991dee73a913115 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TechIdSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TechIdSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/NumberFieldSearchCriteria", "dto/common/search/SearchFieldType" ], function(stjs, NumberFieldSearchCriteria, SearchFieldType) {
+define([ "stjs", "as/dto/common/search/NumberFieldSearchCriteria", "as/dto/common/search/SearchFieldType" ], function(stjs, NumberFieldSearchCriteria, SearchFieldType) {
var TechIdSearchCriteria = function() {
NumberFieldSearchCriteria.call(this, "id", SearchFieldType.ATTRIBUTE);
};
stjs.extend(TechIdSearchCriteria, NumberFieldSearchCriteria, [ NumberFieldSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.TechIdSearchCriteria';
+ prototype['@type'] = 'as.dto.common.search.TechIdSearchCriteria';
constructor.serialVersionUID = 1;
}, {
fieldType : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TimeZone.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TimeZone.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TimeZone.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TimeZone.js
index ba61fc1a2803fb1ce1d892c8a9770ac82abc43f2..bafc1c6bf8b5cb6b18a17eb61801875b8a9a59f5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/TimeZone.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/TimeZone.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ITimeZone" ], function(stjs, ITimeZone) {
+define([ "stjs", "as/dto/common/search/ITimeZone" ], function(stjs, ITimeZone) {
var TimeZone = function(hourOffset) {
this.hourOffset = hourOffset;
};
stjs.extend(TimeZone, null, [ ITimeZone ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.search.TimeZone';
+ prototype['@type'] = 'as.dto.common.search.TimeZone';
prototype.hourOffset = 0;
prototype.getHourOffset = function() {
return this.hourOffset;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/FieldUpdateValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/FieldUpdateValue.js
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/FieldUpdateValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/FieldUpdateValue.js
index ba8cf1891e9e0120b861c237bdcd2e98b9a374be..d8dbb131524132195bf81af4a0a4bbb80edb1253 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/FieldUpdateValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/FieldUpdateValue.js
@@ -7,7 +7,7 @@ define([ "stjs" ], function(stjs) {
var FieldUpdateValue = function() {
};
stjs.extend(FieldUpdateValue, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.FieldUpdateValue';
+ prototype['@type'] = 'as.dto.common.update.FieldUpdateValue';
constructor.serialVersionUID = 1;
prototype.isModified = false;
prototype.value = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/IdListUpdateValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/IdListUpdateValue.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/IdListUpdateValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/IdListUpdateValue.js
index 52ae3a30f10787f036257ca3fe98c1792d5bfb96..e9f38abeda9d1557250fb77226e44d55b5d2821c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/IdListUpdateValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/IdListUpdateValue.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/ListUpdateValue" ], function(stjs, ListUpdateValue) {
+define([ "stjs", "as/dto/common/update/ListUpdateValue" ], function(stjs, ListUpdateValue) {
var IdListUpdateValue = function() {
ListUpdateValue.call(this);
};
stjs.extend(IdListUpdateValue, ListUpdateValue, [ ListUpdateValue ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.IdListUpdateValue';
+ prototype['@type'] = 'as.dto.common.update.IdListUpdateValue';
constructor.serialVersionUID = 1;
}, {
actions : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateAction.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateAction.js
similarity index 87%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateAction.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateAction.js
index dedd458e1b11a8280f7fe95f75bf84fa9cd1be4e..cf52b520e64a47db895c2faa35748aa630651399 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateAction.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateAction.js
@@ -2,7 +2,7 @@ define([ "stjs" ], function(stjs) {
ListUpdateAction = function() {
};
stjs.extend(ListUpdateAction, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.ListUpdateAction';
+ prototype['@type'] = 'as.dto.common.update.ListUpdateAction';
constructor.serialVersionUID = 1;
prototype.items = null;
prototype.getItems = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionAdd.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionAdd.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionAdd.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionAdd.js
index 7c7d62403b36d1d1698f60938b30d688fa8ce51e..4eb2bc21d80c34e7e96b30b3d912fa5db34b62fe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionAdd.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionAdd.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
+define([ "stjs", "as/dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
ListUpdateActionAdd = function() {
ListUpdateAction.call(this);
};
stjs.extend(ListUpdateActionAdd, ListUpdateAction, [ ListUpdateAction ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.ListUpdateActionAdd';
+ prototype['@type'] = 'as.dto.common.update.ListUpdateActionAdd';
constructor.serialVersionUID = 1;
}, {
items : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionRemove.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionRemove.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionRemove.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionRemove.js
index 8cd81612e0758f9117bd5f63ac9a300805629375..3ae25bbdb9b91e84d8d397afb5008590111b7260 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionRemove.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionRemove.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
+define([ "stjs", "as/dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
ListUpdateActionRemove = function() {
ListUpdateAction.call(this);
};
stjs.extend(ListUpdateActionRemove, ListUpdateAction, [ ListUpdateAction ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.ListUpdateActionRemove';
+ prototype['@type'] = 'as.dto.common.update.ListUpdateActionRemove';
constructor.serialVersionUID = 1;
}, {
items : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionSet.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionSet.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionSet.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionSet.js
index 6f68e33706e3f75db882ccb0975e8c66a50ec376..56973eccf1b75584b5651deb0c1b69317eaff2c2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateActionSet.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateActionSet.js
@@ -1,9 +1,9 @@
-define([ "stjs", "dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
+define([ "stjs", "as/dto/common/update/ListUpdateAction" ], function(stjs, ListUpdateAction) {
ListUpdateActionSet = function() {
ListUpdateAction.call(this);
};
stjs.extend(ListUpdateActionSet, ListUpdateAction, [ ListUpdateAction ], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.ListUpdateActionSet';
+ prototype['@type'] = 'as.dto.common.update.ListUpdateActionSet';
constructor.serialVersionUID = 1;
}, {
items : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateValue.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateValue.js
similarity index 83%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateValue.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateValue.js
index 47907c134507723a0baf7505eda6aadc27a505ae..1e9399fec4f0607270246bfdaaba2b91c70e791c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/update/ListUpdateValue.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/update/ListUpdateValue.js
@@ -1,10 +1,10 @@
-define([ "stjs", "dto/common/update/ListUpdateActionRemove", "dto/common/update/ListUpdateActionAdd", "dto/common/update/ListUpdateActionSet" ], function(stjs, ListUpdateActionRemove,
+define([ "stjs", "as/dto/common/update/ListUpdateActionRemove", "as/dto/common/update/ListUpdateActionAdd", "as/dto/common/update/ListUpdateActionSet" ], function(stjs, ListUpdateActionRemove,
ListUpdateActionAdd, ListUpdateActionSet) {
var ListUpdateValue = function() {
this.actions = [];
};
stjs.extend(ListUpdateValue, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.common.update.ListUpdateValue';
+ prototype['@type'] = 'as.dto.common.update.ListUpdateValue';
constructor.serialVersionUID = 1;
prototype.setActions = function(actions) {
this.actions = actions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/ArchivingStatus.js
similarity index 82%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/ArchivingStatus.js
index 21531e57f713f9c469076f16783db8168697cd53..92fc7585b8f555ebf3e6c20f75cccefbc1661c58 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/ArchivingStatus.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var ArchivingStatus = function() {
Enum.call(this, [ "AVAILABLE", "LOCKED", "ARCHIVED", "UNARCHIVE_PENDING", "ARCHIVE_PENDING", "BACKUP_PENDING" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/Complete.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/Complete.js
index 2c19f5ee6ceacbe0781e89d430578b94126777c5..860ce08179357928c0eeabb59985be3acd9f1da7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/Complete.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var Complete = function() {
Enum.call(this, [ "YES", "NO", "UNKNOWN" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSet.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSet.js
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSet.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSet.js
index 3e83a0e86e8bad6d1c3b2086abb4c1c072ca4c61..f3e1bd3af42e292e903ab012586efcca645aa11a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSet.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSet.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var DataSet = function() {
};
stjs.extend(DataSet, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.DataSet';
+ prototype['@type'] = 'as.dto.dataset.DataSet';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
@@ -32,6 +32,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.sample = null;
prototype.properties = null;
prototype.materialProperties = null;
+ prototype.dataProducer = null;
+ prototype.dataProductionDate = null;
+
prototype.getFetchOptions = function() {
return this.fetchOptions;
};
@@ -248,6 +251,18 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.setMaterialProperties = function(materialProperties) {
this.materialProperties = materialProperties;
};
+ prototype.getDataProducer = function() {
+ return this.dataProducer;
+ };
+ prototype.setDataProducer = function(dataProducer) {
+ this.dataProducer = dataProducer;
+ };
+ prototype.getDataProductionDate = function() {
+ return this.dataProductionDate;
+ };
+ prototype.setDataProductionDate = function(dataProductionDate) {
+ this.dataProductionDate = dataProductionDate;
+ };
}, {
fetchOptions : "DataSetFetchOptions",
permId : "DataSetPermId",
@@ -293,7 +308,8 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
materialProperties : {
name : "Map",
arguments : [ null, "Material" ]
- }
+ },
+ dataProductionDate : "Date"
});
return DataSet;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetKind.js
similarity index 78%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetKind.js
index 1818551542db2c2083eb284396cd88b28dfa2ba5..9f8466617b99d9d448b7e55772996f4614388cb3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetKind.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var DataSetKind = function() {
Enum.call(this, [ "PHYSICAL", "CONTAINER", "LINK" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetType.js
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetType.js
index 9c643a794f8161deaf5adb2c2c290245c3cc4d4f..2f42985b3e84a3437936ee8ee97980515364eb9a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/DataSetType.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
var DataSetType = function() {
};
stjs.extend(DataSetType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.DataSetType';
+ prototype['@type'] = 'as.dto.dataset.DataSetType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/FileFormatType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/FileFormatType.js
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/FileFormatType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/FileFormatType.js
index 8370c1263c671adabea24a33d6bbf56142073e86..a782d0545865c0392402a44aa66d083c05abfc40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/FileFormatType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/FileFormatType.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var FileFormatType = function() {
};
stjs.extend(FileFormatType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.FileFormatType';
+ prototype['@type'] = 'as.dto.dataset.FileFormatType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LinkedData.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LinkedData.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LinkedData.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LinkedData.js
index 0df855f66ff4cf6768c1550d7ea5fa271320461e..00e35f441c96f7d30382d6716dd6cdfcf5ba5476 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LinkedData.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LinkedData.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var LinkedData = function() {
};
stjs.extend(LinkedData, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.LinkedData';
+ prototype['@type'] = 'as.dto.dataset.LinkedData';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.externalCode = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LocatorType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LocatorType.js
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LocatorType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LocatorType.js
index 71668e309eddb32d228da06fa006de80cbfb98dc..1959d628a83127d323346c76bc591b73334e29c6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/LocatorType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/LocatorType.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var LocatorType = function() {
};
stjs.extend(LocatorType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.LocatorType';
+ prototype['@type'] = 'as.dto.dataset.LocatorType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/PhysicalData.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/PhysicalData.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/PhysicalData.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/PhysicalData.js
index db7fbb3bd51abe1a4af6cb3abcb5543cac8d302e..d6c43cfdfd74cd7c262ca0820875e77dda2eb83c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/PhysicalData.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/PhysicalData.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var PhysicalData = function() {
};
stjs.extend(PhysicalData, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.PhysicalData';
+ prototype['@type'] = 'as.dto.dataset.PhysicalData';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.shareId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/StorageFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/StorageFormat.js
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/StorageFormat.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/StorageFormat.js
index 3597c83020a8faa561694eee19986deaa5b3c65a..6c3aa0c3db033d28176f70dc2999df8fe6e4146b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/StorageFormat.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/StorageFormat.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var StorageFormat = function() {
};
stjs.extend(StorageFormat, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.StorageFormat';
+ prototype['@type'] = 'as.dto.dataset.StorageFormat';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/delete/DataSetDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/delete/DataSetDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/delete/DataSetDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/delete/DataSetDeletionOptions.js
index 7e41a793eeaad6d749d25dc34118e3d3e634f178..24e5924c97815c5ba10fea2ab57badb5004eec5e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/delete/DataSetDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/delete/DataSetDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var DataSetDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(DataSetDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.delete.DataSetDeletionOptions';
+ prototype['@type'] = 'as.dto.dataset.delete.DataSetDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return DataSetDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetFetchOptions.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetFetchOptions.js
index 51db58ccd9ae171ef1313774f4a536f236ceb499..e503a97bbf68c6ee6f62946885534d40d27ec939 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetFetchOptions.js
@@ -2,15 +2,15 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fetchoptions/TagFetchOptions", "dto/dataset/fetchoptions/DataSetTypeFetchOptions",
- "dto/person/fetchoptions/PersonFetchOptions", "dto/experiment/fetchoptions/ExperimentFetchOptions", "dto/sample/fetchoptions/SampleFetchOptions",
- "dto/property/fetchoptions/PropertyFetchOptions", "dto/dataset/fetchoptions/PhysicalDataFetchOptions", "dto/dataset/fetchoptions/LinkedDataFetchOptions",
- "dto/history/fetchoptions/HistoryEntryFetchOptions", "dto/material/fetchoptions/MaterialFetchOptions", "dto/datastore/fetchoptions/DataStoreFetchOptions",
- "dto/dataset/fetchoptions/DataSetSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/tag/fetchoptions/TagFetchOptions", "as/dto/dataset/fetchoptions/DataSetTypeFetchOptions",
+ "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/experiment/fetchoptions/ExperimentFetchOptions", "as/dto/sample/fetchoptions/SampleFetchOptions",
+ "as/dto/property/fetchoptions/PropertyFetchOptions", "as/dto/dataset/fetchoptions/PhysicalDataFetchOptions", "as/dto/dataset/fetchoptions/LinkedDataFetchOptions",
+ "as/dto/history/fetchoptions/HistoryEntryFetchOptions", "as/dto/material/fetchoptions/MaterialFetchOptions", "as/dto/datastore/fetchoptions/DataStoreFetchOptions",
+ "as/dto/dataset/fetchoptions/DataSetSortOptions" ], function(require, stjs, FetchOptions) {
var DataSetFetchOptions = function() {
};
stjs.extend(DataSetFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.DataSetFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.DataSetFetchOptions';
constructor.serialVersionUID = 1;
prototype.parents = null;
prototype.children = null;
@@ -79,7 +79,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withPhysicalData = function() {
if (this.physicalData == null) {
- var PhysicalDataFetchOptions = require("dto/dataset/fetchoptions/PhysicalDataFetchOptions");
+ var PhysicalDataFetchOptions = require("as/dto/dataset/fetchoptions/PhysicalDataFetchOptions");
this.physicalData = new PhysicalDataFetchOptions();
}
return this.physicalData;
@@ -92,7 +92,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withLinkedData = function() {
if (this.linkedData == null) {
- var LinkedDataFetchOptions = require("dto/dataset/fetchoptions/LinkedDataFetchOptions");
+ var LinkedDataFetchOptions = require("as/dto/dataset/fetchoptions/LinkedDataFetchOptions");
this.linkedData = new LinkedDataFetchOptions();
}
return this.linkedData;
@@ -105,7 +105,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withTags = function() {
if (this.tags == null) {
- var TagFetchOptions = require("dto/tag/fetchoptions/TagFetchOptions");
+ var TagFetchOptions = require("as/dto/tag/fetchoptions/TagFetchOptions");
this.tags = new TagFetchOptions();
}
return this.tags;
@@ -118,7 +118,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withType = function() {
if (this.type == null) {
- var DataSetTypeFetchOptions = require("dto/dataset/fetchoptions/DataSetTypeFetchOptions");
+ var DataSetTypeFetchOptions = require("as/dto/dataset/fetchoptions/DataSetTypeFetchOptions");
this.type = new DataSetTypeFetchOptions();
}
return this.type;
@@ -131,7 +131,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withDataStore = function() {
if (this.dataStore == null) {
- var DataStoreFetchOptions = require("dto/datastore/fetchoptions/DataStoreFetchOptions");
+ var DataStoreFetchOptions = require("as/dto/datastore/fetchoptions/DataStoreFetchOptions");
this.dataStore = new DataStoreFetchOptions();
}
return this.dataStore;
@@ -144,7 +144,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withHistory = function() {
if (this.history == null) {
- var HistoryEntryFetchOptions = require("dto/history/fetchoptions/HistoryEntryFetchOptions");
+ var HistoryEntryFetchOptions = require("as/dto/history/fetchoptions/HistoryEntryFetchOptions");
this.history = new HistoryEntryFetchOptions();
}
return this.history;
@@ -157,7 +157,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withModifier = function() {
if (this.modifier == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.modifier = new PersonFetchOptions();
}
return this.modifier;
@@ -170,7 +170,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -183,7 +183,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withExperiment = function() {
if (this.experiment == null) {
- var ExperimentFetchOptions = require("dto/experiment/fetchoptions/ExperimentFetchOptions");
+ var ExperimentFetchOptions = require("as/dto/experiment/fetchoptions/ExperimentFetchOptions");
this.experiment = new ExperimentFetchOptions();
}
return this.experiment;
@@ -196,7 +196,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withSample = function() {
if (this.sample == null) {
- var SampleFetchOptions = require("dto/sample/fetchoptions/SampleFetchOptions");
+ var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
this.sample = new SampleFetchOptions();
}
return this.sample;
@@ -209,7 +209,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withProperties = function() {
if (this.properties == null) {
- var PropertyFetchOptions = require("dto/property/fetchoptions/PropertyFetchOptions");
+ var PropertyFetchOptions = require("as/dto/property/fetchoptions/PropertyFetchOptions");
this.properties = new PropertyFetchOptions();
}
return this.properties;
@@ -222,7 +222,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.withMaterialProperties = function() {
if (this.materialProperties == null) {
- var MaterialFetchOptions = require("dto/material/fetchoptions/MaterialFetchOptions");
+ var MaterialFetchOptions = require("as/dto/material/fetchoptions/MaterialFetchOptions");
this.materialProperties = new MaterialFetchOptions();
}
return this.materialProperties;
@@ -235,7 +235,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/tag/fet
};
prototype.sortBy = function() {
if (this.sort == null) {
- var DataSetSortOptions = require("dto/dataset/fetchoptions/DataSetSortOptions");
+ var DataSetSortOptions = require("as/dto/dataset/fetchoptions/DataSetSortOptions");
this.sort = new DataSetSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetSortOptions.js
index 2e1a4086423cdd6afb5fe2a4475a363c1817e7b6..a98c12b0fffe5337e34571e9f25bf63dfcb6354f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
var DataSetSortOptions = function() {
EntityWithPropertiesSortOptions.call(this);
};
stjs.extend(DataSetSortOptions, EntityWithPropertiesSortOptions, [ EntityWithPropertiesSortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.DataSetSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.DataSetSortOptions';
constructor.serialVersionUID = 1;
}, {});
return DataSetSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js
index c5f51669efa56ff79ab0467c02838d3be03cc4fa..d08593aeb9efda354672bc795cf04e2bc4cc01f3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset/fetchoptions/DataSetTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/dataset/fetchoptions/DataSetTypeSortOptions" ], function(stjs, FetchOptions) {
var DataSetTypeFetchOptions = function() {
};
stjs.extend(DataSetTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.DataSetTypeFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.DataSetTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var DataSetTypeSortOptions = require("dto/dataset/fetchoptions/DataSetTypeSortOptions");
+ var DataSetTypeSortOptions = require("as/dto/dataset/fetchoptions/DataSetTypeSortOptions");
this.sort = new DataSetTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeSortOptions.js
index b76256171d25f24f9762d5d26a7599c7508176da..c3e324b8e4cd8373b13d85fd93503a62fe9c9bd2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/DataSetTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var DataSetTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(DataSetTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.DataSetTypeSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.DataSetTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return DataSetTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js
index 8bcad1678447aa7c845eede5e874c5390b383939..92acdee044ff2008379fcaf1fa441130b9291dc9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset/fetchoptions/FileFormatTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/dataset/fetchoptions/FileFormatTypeSortOptions" ], function(stjs, FetchOptions) {
var FileFormatTypeFetchOptions = function() {
};
stjs.extend(FileFormatTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.FileFormatTypeFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.FileFormatTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var FileFormatTypeSortOptions = require("dto/dataset/fetchoptions/FileFormatTypeSortOptions");
+ var FileFormatTypeSortOptions = require("as/dto/dataset/fetchoptions/FileFormatTypeSortOptions");
this.sort = new FileFormatTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js
index c2fe698a76ab4b624568cadcb73ce9c4193393ff..6b1c8255f6ea821d759e5f6bd2de80527cedd24f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/FileFormatTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var FileFormatTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(FileFormatTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.FileFormatTypeSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.FileFormatTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return FileFormatTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataFetchOptions.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataFetchOptions.js
index c871953b4e9c129f1d636e9c2d85e6481cfc45dd..1ef77b80a2b3daf235222d52ecbd5207768c5a09 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataFetchOptions.js
@@ -2,18 +2,18 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/externaldms/fetchoptions/ExternalDmsFetchOptions", "dto/dataset/fetchoptions/LinkedDataSortOptions" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions", "as/dto/dataset/fetchoptions/LinkedDataSortOptions" ], function(require, stjs,
FetchOptions) {
var LinkedDataFetchOptions = function() {
};
stjs.extend(LinkedDataFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.LinkedDataFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.LinkedDataFetchOptions';
constructor.serialVersionUID = 1;
prototype.externalDms = null;
prototype.sort = null;
prototype.withExternalDms = function() {
if (this.externalDms == null) {
- var ExternalDmsFetchOptions = require("dto/externaldms/fetchoptions/ExternalDmsFetchOptions");
+ var ExternalDmsFetchOptions = require("as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions");
this.externalDms = new ExternalDmsFetchOptions();
}
return this.externalDms;
@@ -26,7 +26,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/externa
};
prototype.sortBy = function() {
if (this.sort == null) {
- var LinkedDataSortOptions = require("dto/dataset/fetchoptions/LinkedDataSortOptions");
+ var LinkedDataSortOptions = require("as/dto/dataset/fetchoptions/LinkedDataSortOptions");
this.sort = new LinkedDataSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataSortOptions.js
index 5cb4a1fcb7d19e9d5a01af024b38ac5a46d17b82..7de06933cd58c7228bee4366a475397983998d7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LinkedDataSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var LinkedDataSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(LinkedDataSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.LinkedDataSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.LinkedDataSortOptions';
constructor.serialVersionUID = 1;
}, {});
return LinkedDataSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js
index 46b4fedff56e5d7ba872485976d557249b1f2816..1327c90fdf40636094a89f97b6ff08e617e6946b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset/fetchoptions/LocatorTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/dataset/fetchoptions/LocatorTypeSortOptions" ], function(stjs, FetchOptions) {
var LocatorTypeFetchOptions = function() {
};
stjs.extend(LocatorTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.LocatorTypeFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.LocatorTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var LocatorTypeSortOptions = require("dto/dataset/fetchoptions/LocatorTypeSortOptions");
+ var LocatorTypeSortOptions = require("as/dto/dataset/fetchoptions/LocatorTypeSortOptions");
this.sort = new LocatorTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeSortOptions.js
index 766889cc85a0fbb57f6c6adad6508eb50447e220..50620474a1183f978cd09d7e7588336f6d686e97 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/LocatorTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var LocatorTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(LocatorTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.LocatorTypeSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.LocatorTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return LocatorTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js
similarity index 70%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js
index 426929eb1d72fdf61f20a24c67bd7696e4852a8e..7003908329ed33eb7ed53a62451e9bd7b296a25a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataFetchOptions.js
@@ -2,12 +2,12 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset/fetchoptions/StorageFormatFetchOptions", "dto/dataset/fetchoptions/FileFormatTypeFetchOptions",
- "dto/dataset/fetchoptions/LocatorTypeFetchOptions", "dto/dataset/fetchoptions/PhysicalDataSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/dataset/fetchoptions/StorageFormatFetchOptions", "as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions",
+ "as/dto/dataset/fetchoptions/LocatorTypeFetchOptions", "as/dto/dataset/fetchoptions/PhysicalDataSortOptions" ], function(require, stjs, FetchOptions) {
var PhysicalDataFetchOptions = function() {
};
stjs.extend(PhysicalDataFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.PhysicalDataFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.PhysicalDataFetchOptions';
constructor.serialVersionUID = 1;
prototype.storageFormat = null;
prototype.fileFormatType = null;
@@ -15,7 +15,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset
prototype.sort = null;
prototype.withStorageFormat = function() {
if (this.storageFormat == null) {
- var StorageFormatFetchOptions = require("dto/dataset/fetchoptions/StorageFormatFetchOptions");
+ var StorageFormatFetchOptions = require("as/dto/dataset/fetchoptions/StorageFormatFetchOptions");
this.storageFormat = new StorageFormatFetchOptions();
}
return this.storageFormat;
@@ -28,7 +28,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset
};
prototype.withFileFormatType = function() {
if (this.fileFormatType == null) {
- var FileFormatTypeFetchOptions = require("dto/dataset/fetchoptions/FileFormatTypeFetchOptions");
+ var FileFormatTypeFetchOptions = require("as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions");
this.fileFormatType = new FileFormatTypeFetchOptions();
}
return this.fileFormatType;
@@ -41,7 +41,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset
};
prototype.withLocatorType = function() {
if (this.locatorType == null) {
- var LocatorTypeFetchOptions = require("dto/dataset/fetchoptions/LocatorTypeFetchOptions");
+ var LocatorTypeFetchOptions = require("as/dto/dataset/fetchoptions/LocatorTypeFetchOptions");
this.locatorType = new LocatorTypeFetchOptions();
}
return this.locatorType;
@@ -54,7 +54,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset
};
prototype.sortBy = function() {
if (this.sort == null) {
- var PhysicalDataSortOptions = require("dto/dataset/fetchoptions/PhysicalDataSortOptions");
+ var PhysicalDataSortOptions = require("as/dto/dataset/fetchoptions/PhysicalDataSortOptions");
this.sort = new PhysicalDataSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataSortOptions.js
index e28ec81a2891941582b2212f519447dd72880be8..724162f719ccf30c29075ea97aac313de4c55616 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/PhysicalDataSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var PhysicalDataSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(PhysicalDataSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.PhysicalDataSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.PhysicalDataSortOptions';
constructor.serialVersionUID = 1;
}, {});
return PhysicalDataSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatFetchOptions.js
index 59b4154ff3b9f228c2e54e455ffbf85afe1185f6..c6e54b0f55c012af02e977d1cfd789b04f0d15ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/dataset/fetchoptions/StorageFormatSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/dataset/fetchoptions/StorageFormatSortOptions" ], function(stjs, FetchOptions) {
var StorageFormatFetchOptions = function() {
};
stjs.extend(StorageFormatFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.StorageFormatFetchOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.StorageFormatFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var StorageFormatSortOptions = require("dto/dataset/fetchoptions/StorageFormatSortOptions");
+ var StorageFormatSortOptions = require("as/dto/dataset/fetchoptions/StorageFormatSortOptions");
this.sort = new StorageFormatSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatSortOptions.js
index 1416718e24504a8382a0afe831aa4b31dacde664..c74d758761c68fe4985774afe6c8a849d0e38bbc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/fetchoptions/StorageFormatSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var StorageFormatSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(StorageFormatSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.fetchoptions.StorageFormatSortOptions';
+ prototype['@type'] = 'as.dto.dataset.fetchoptions.StorageFormatSortOptions';
constructor.serialVersionUID = 1;
}, {});
return StorageFormatSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/history/DataSetRelationType.js
similarity index 82%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/history/DataSetRelationType.js
index 37a3d18854b6438fc07d64afc006ab15c56ffef8..7077caffd76f9499fc85e7e5bf3b2aebc3b31e04 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/history/DataSetRelationType.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var DataSetRelationType = function() {
Enum.call(this, [ "EXPERIMENT", "SAMPLE", "PARENT", "CHILD", "CONTAINER", "COMPONENT" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/BdsDirectoryStorageFormatPermId.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/BdsDirectoryStorageFormatPermId.js
index e9080fc43367cd0b919ff8ab8f7eba77e63e493d..121256687f8db6c6e1f2a372cb20243b0b89f269 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/BdsDirectoryStorageFormatPermId.js
@@ -3,12 +3,12 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/dataset/id/StorageFormatPermId" ], function(stjs, StorageFormatPermId) {
+define([ "stjs", "as/dto/dataset/id/StorageFormatPermId" ], function(stjs, StorageFormatPermId) {
var BdsDirectoryStorageFormatPermId = function() {
StorageFormatPermId.call(this, "BDS_DIRECTORY");
};
stjs.extend(BdsDirectoryStorageFormatPermId, StorageFormatPermId, [ StorageFormatPermId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.BdsDirectoryStorageFormatPermId';
+ prototype['@type'] = 'as.dto.dataset.id.BdsDirectoryStorageFormatPermId';
constructor.serialVersionUID = 1;
}, {});
return BdsDirectoryStorageFormatPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/DataSetPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/DataSetPermId.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/DataSetPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/DataSetPermId.js
index 2f0e25ba449ad7cd095b201d5c62a6d4a9835143..774c3b20dde6ad30cb351f2a85da34f13c793de3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/DataSetPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/DataSetPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IDataSetId" ], function(stjs, ObjectPermId, IDataSetId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/dataset/id/IDataSetId" ], function(stjs, ObjectPermId, IDataSetId) {
/**
* @param permId
* Data set perm id, e.g. "201108050937246-1031".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IDataSetId" ], fu
ObjectPermId.call(this, permId);
};
stjs.extend(DataSetPermId, ObjectPermId, [ ObjectPermId, IDataSetId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.DataSetPermId';
+ prototype['@type'] = 'as.dto.dataset.id.DataSetPermId';
constructor.serialVersionUID = 1;
}, {});
return DataSetPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/FileFormatTypePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/FileFormatTypePermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/FileFormatTypePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/FileFormatTypePermId.js
index 94fdf712602a029904c5ffb3673283c4ff1911de..2dc7acaad8bfa38524ce95a60596111399156831 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/FileFormatTypePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/FileFormatTypePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IFileFormatTypeId" ], function(stjs, ObjectPermId, IFileFormatTypeId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/dataset/id/IFileFormatTypeId" ], function(stjs, ObjectPermId, IFileFormatTypeId) {
/**
* @param permId
* File format type perm id, e.g. "PROPRIETARY".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IFileFormatTypeId
ObjectPermId.call(this, permId);
};
stjs.extend(FileFormatTypePermId, ObjectPermId, [ ObjectPermId, IFileFormatTypeId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.FileFormatTypePermId';
+ prototype['@type'] = 'as.dto.dataset.id.FileFormatTypePermId';
constructor.serialVersionUID = 1;
}, {});
return FileFormatTypePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IDataSetId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IDataSetId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IDataSetId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IDataSetId.js
index d1f942ff7185f44b00528f646a7deebc6b4c3ada..92c0f55a6aa4c24dd00e90365666fbc14dae0a80 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IDataSetId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IDataSetId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IDataSetId = function() {
};
stjs.extend(IDataSetId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IFileFormatTypeId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IFileFormatTypeId.js
similarity index 76%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IFileFormatTypeId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IFileFormatTypeId.js
index b492c6edaef43112d2ba17db9d96152a433c32cc..fd38c129e00022d50a6613bd33f1966ca2fb04a2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IFileFormatTypeId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IFileFormatTypeId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IFileFormatTypeId = function() {
};
stjs.extend(IFileFormatTypeId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ILocatorTypeId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ILocatorTypeId.js
similarity index 75%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ILocatorTypeId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ILocatorTypeId.js
index 3444f7ebbb7835e00e76bf32abaf3d0fa773c68e..03579a57009f7cdf330be73c5eff32a151f17f44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ILocatorTypeId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ILocatorTypeId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var ILocatorTypeId = function() {
};
stjs.extend(ILocatorTypeId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IStorageFormatId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IStorageFormatId.js
similarity index 75%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IStorageFormatId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IStorageFormatId.js
index b3885931ecf7ecb63c4db49042e37ddd7e9b750c..0c70d83cac7b852b2e1099080969e7e577bcccfd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/IStorageFormatId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/IStorageFormatId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IStorageFormatId = function() {
};
stjs.extend(IStorageFormatId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/LocatorTypePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/LocatorTypePermId.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/LocatorTypePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/LocatorTypePermId.js
index 183fda7150f1d0f76d365a873982fa6a86ae44a7..6b8949fbf122aa54c55211af3fb3949901a17461 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/LocatorTypePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/LocatorTypePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/ILocatorTypeId" ], function(stjs, ObjectPermId, ILocatorTypeId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/dataset/id/ILocatorTypeId" ], function(stjs, ObjectPermId, ILocatorTypeId) {
/**
* @param permId
* Locator type perm id, e.g. "RELATIVE_LOCATION".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/ILocatorTypeId" ]
ObjectPermId.call(this, permId);
};
stjs.extend(LocatorTypePermId, ObjectPermId, [ ObjectPermId, ILocatorTypeId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.LocatorTypePermId';
+ prototype['@type'] = 'as.dto.dataset.id.LocatorTypePermId';
constructor.serialVersionUID = 1;
}, {});
return LocatorTypePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ProprietaryStorageFormatPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ProprietaryStorageFormatPermId.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ProprietaryStorageFormatPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ProprietaryStorageFormatPermId.js
index c724e8ac716b2c983ccab692fdf289d9e26c7d44..274b1a41260e255e7d1ec67463aafe424beddca2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/ProprietaryStorageFormatPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/ProprietaryStorageFormatPermId.js
@@ -3,12 +3,12 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/dataset/id/StorageFormatPermId" ], function(stjs, StorageFormatPermId) {
+define([ "stjs", "as/dto/dataset/id/StorageFormatPermId" ], function(stjs, StorageFormatPermId) {
var ProprietaryStorageFormatPermId = function() {
StorageFormatPermId.call(this, "PROPRIETARY");
};
stjs.extend(ProprietaryStorageFormatPermId, StorageFormatPermId, [ StorageFormatPermId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.ProprietaryStorageFormatPermId';
+ prototype['@type'] = 'as.dto.dataset.id.ProprietaryStorageFormatPermId';
constructor.serialVersionUID = 1;
}, {});
return ProprietaryStorageFormatPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/RelativeLocationLocatorTypePermId.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/RelativeLocationLocatorTypePermId.js
index 50df2e2002df9996acb80cc7cf988620eccc06f6..1ac298fb76c3ce9d50afc525f24e5d1e537b9058 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/RelativeLocationLocatorTypePermId.js
@@ -3,12 +3,12 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/dataset/id/LocatorTypePermId" ], function(stjs, LocatorTypePermId) {
+define([ "stjs", "as/dto/dataset/id/LocatorTypePermId" ], function(stjs, LocatorTypePermId) {
var RelativeLocationLocatorTypePermId = function() {
LocatorTypePermId.call(this, "RELATIVE_LOCATION");
};
stjs.extend(RelativeLocationLocatorTypePermId, LocatorTypePermId, [ LocatorTypePermId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.RelativeLocationLocatorTypePermId';
+ prototype['@type'] = 'as.dto.dataset.id.RelativeLocationLocatorTypePermId';
constructor.serialVersionUID = 1;
}, {});
return RelativeLocationLocatorTypePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/StorageFormatPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/StorageFormatPermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/StorageFormatPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/StorageFormatPermId.js
index cfeb15ab80b1b84979c169e528e57cd352ebaae6..ccbb716dec45d3772c31fd80ee5ef067bdaa3e13 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/id/StorageFormatPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/id/StorageFormatPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IStorageFormatId" ], function(stjs, ObjectPermId, IStorageFormatId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/dataset/id/IStorageFormatId" ], function(stjs, ObjectPermId, IStorageFormatId) {
/**
* @param permId
* Storage format perm id, e.g. "PROPRIETARY".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/dataset/id/IStorageFormatId"
ObjectPermId.call(this, permId);
};
stjs.extend(StorageFormatPermId, ObjectPermId, [ ObjectPermId, IStorageFormatId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.id.StorageFormatPermId';
+ prototype['@type'] = 'as.dto.dataset.id.StorageFormatPermId';
constructor.serialVersionUID = 1;
}, {});
return StorageFormatPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
similarity index 78%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
index 425756a7b591b4cccaa1caa4d8f2dd6ddf87495d..b2361796ce865434a9d99222654370f0db8f10af 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
@@ -1,15 +1,15 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "dto/common/search/SearchOperator", "dto/dataset/search/DataSetSearchRelation", ,
- "dto/experiment/search/ExperimentSearchCriteria", "dto/experiment/search/NoExperimentSearchCriteria", "dto/sample/search/SampleSearchCriteria", "dto/sample/search/NoSampleSearchCriteria" ],
+define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/dataset/search/DataSetSearchRelation", ,
+ "as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria", "as/dto/sample/search/SampleSearchCriteria", "as/dto/sample/search/NoSampleSearchCriteria" ],
function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, DataSetSearchRelation) {
var DataSetSearchCriteria = function(relation) {
AbstractEntitySearchCriteria.call(this);
this.relation = relation ? relation : DataSetSearchRelation.DATASET;
};
stjs.extend(DataSetSearchCriteria, AbstractEntitySearchCriteria, [ AbstractEntitySearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.search.DataSetSearchCriteria';
+ prototype['@type'] = 'as.dto.dataset.search.DataSetSearchCriteria';
constructor.serialVersionUID = 1;
prototype.relation = null;
prototype.withParents = function() {
@@ -22,19 +22,19 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
return this.addCriteria(new DataSetContainerSearchCriteria());
};
prototype.withExperiment = function() {
- var ExperimentSearchCriteria = require("dto/experiment/search/ExperimentSearchCriteria");
+ var ExperimentSearchCriteria = require("as/dto/experiment/search/ExperimentSearchCriteria");
return this.addCriteria(new ExperimentSearchCriteria());
};
prototype.withoutExperiment = function() {
- var NoExperimentSearchCriteria = require("dto/experiment/search/NoExperimentSearchCriteria");
+ var NoExperimentSearchCriteria = require("as/dto/experiment/search/NoExperimentSearchCriteria");
return this.addCriteria(new NoExperimentSearchCriteria());
};
prototype.withSample = function() {
- var SampleSearchCriteria = require("dto/sample/search/SampleSearchCriteria");
+ var SampleSearchCriteria = require("as/dto/sample/search/SampleSearchCriteria");
return this.addCriteria(new SampleSearchCriteria());
};
prototype.withoutSample = function() {
- var NoSampleSearchCriteria = require("dto/sample/search/NoSampleSearchCriteria");
+ var NoSampleSearchCriteria = require("as/dto/sample/search/NoSampleSearchCriteria");
return this.addCriteria(new NoSampleSearchCriteria());
};
prototype.withOrOperator = function() {
@@ -70,7 +70,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
DataSetSearchCriteria.call(this, DataSetSearchRelation.PARENTS);
};
stjs.extend(DataSetParentsSearchCriteria, DataSetSearchCriteria, [ DataSetSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.search.DataSetParentsSearchCriteria';
+ prototype['@type'] = 'as.dto.dataset.search.DataSetParentsSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
@@ -91,7 +91,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
DataSetSearchCriteria.call(this, DataSetSearchRelation.CHILDREN);
};
stjs.extend(DataSetChildrenSearchCriteria, DataSetSearchCriteria, [ DataSetSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.search.DataSetChildrenSearchCriteria';
+ prototype['@type'] = 'as.dto.dataset.search.DataSetChildrenSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
@@ -112,7 +112,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
DataSetSearchCriteria.call(this, DataSetSearchRelation.CONTAINER);
};
stjs.extend(DataSetContainerSearchCriteria, DataSetSearchCriteria, [ DataSetSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.search.DataSetContainerSearchCriteria';
+ prototype['@type'] = 'as.dto.dataset.search.DataSetContainerSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchRelation.js
similarity index 81%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchRelation.js
index 828b3c375c0ee91a13d52c9846be98c0f44364a5..f3c8af9242a7224a5ce9dbc4cd2c534e022c6d27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchRelation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var DataSetSearchRelation = function() {
Enum.call(this, [ "DATASET", "PARENTS", "CHILDREN", "CONTAINER" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/DataSetUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/DataSetUpdate.js
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/DataSetUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/DataSetUpdate.js
index fefdbf21ba5e5ea35576317cc4680c63edf6d20e..2434868a189c3f8fc3a1aed5a6ea72eda466fb36 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/DataSetUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/DataSetUpdate.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue) {
+define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/IdListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue) {
var DataSetUpdate = function() {
this.experimentId = new FieldUpdateValue();
this.sampleId = new FieldUpdateValue();
@@ -15,7 +15,7 @@ define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdList
this.childIds = new IdListUpdateValue();
};
stjs.extend(DataSetUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.update.DataSetUpdate';
+ prototype['@type'] = 'as.dto.dataset.update.DataSetUpdate';
constructor.serialVersionUID = 1;
prototype.dataSetId = null;
prototype.experimentId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/LinkedDataUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/LinkedDataUpdate.js
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/LinkedDataUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/LinkedDataUpdate.js
index 649019788648f38b30bf4a1cc2af157e4665b497..ec95e312fdf44a1dd1347d62adcb5a8e1e5fb176 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/LinkedDataUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/LinkedDataUpdate.js
@@ -1,13 +1,13 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
+define([ "stjs", "as/dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
var LinkedDataUpdate = function() {
this.externalCode = new FieldUpdateValue();
this.externalDmsId = new FieldUpdateValue();
};
stjs.extend(LinkedDataUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.update.LinkedDataUpdate';
+ prototype['@type'] = 'as.dto.dataset.update.LinkedDataUpdate';
constructor.serialVersionUID = 1;
prototype.externalCode = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/PhysicalDataUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/PhysicalDataUpdate.js
similarity index 79%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/PhysicalDataUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/PhysicalDataUpdate.js
index f37d7f4538a5e090b7a3c91616c9640b64306e96..b40613de165df18b32119e628be9cb6700574b34 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/update/PhysicalDataUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/update/PhysicalDataUpdate.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
+define([ "stjs", "as/dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
var PhysicalDataUpdate = function() {
this.fileFormatTypeId = new FieldUpdateValue();
};
stjs.extend(PhysicalDataUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.dataset.update.PhysicalDataUpdate';
+ prototype['@type'] = 'as.dto.dataset.update.PhysicalDataUpdate';
constructor.serialVersionUID = 1;
prototype.fileFormatTypeId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/DataStore.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/DataStore.js
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/DataStore.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/DataStore.js
index 5dec028d686b2932da11387a752a9f9505da89d1..de58548a93e3c90f806b91c78d6460969980350a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/DataStore.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/DataStore.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var DataStore = function() {
};
stjs.extend(DataStore, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.datastore.DataStore';
+ prototype['@type'] = 'as.dto.datastore.DataStore';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreFetchOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreFetchOptions.js
index 989032dd98b44a2ce21d1b05c6f5af26d1f2b47d..9f0dd5a158ddc61c1a264fac45a2e3db0f593467 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/datastore/fetchoptions/DataStoreSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/datastore/fetchoptions/DataStoreSortOptions" ], function(require, stjs, FetchOptions) {
var DataStoreFetchOptions = function() {
};
stjs.extend(DataStoreFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.datastore.fetchoptions.DataStoreFetchOptions';
+ prototype['@type'] = 'as.dto.datastore.fetchoptions.DataStoreFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var DataStoreSortOptions = require("dto/datastore/fetchoptions/DataStoreSortOptions");
+ var DataStoreSortOptions = require("as/dto/datastore/fetchoptions/DataStoreSortOptions");
this.sort = new DataStoreSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
index 64e011ea550b846c8216fa0fe9784ba2550185b4..95627aee0531fcf9af250b8c25a6c632688916f8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/fetchoptions/DataStoreSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var DataStoreSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(DataStoreSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.person.fetchoptions.DataStoreSortOptions';
+ prototype['@type'] = 'as.dto.person.fetchoptions.DataStoreSortOptions';
constructor.serialVersionUID = 1;
}, {});
return DataStoreSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/DataStorePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/DataStorePermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/DataStorePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/DataStorePermId.js
index 53deb58f39b2025926a85fdb27dd1a49a52cc6b4..63c62aac1f9fa7e90764ca89bde3b6645b855401 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/DataStorePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/DataStorePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/datastore/id/IDataStoreId" ], function(stjs, ObjectPermId, IDataStoreId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/datastore/id/IDataStoreId" ], function(stjs, ObjectPermId, IDataStoreId) {
/**
* @param permId
@@ -13,7 +13,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/datastore/id/IDataStoreId" ]
ObjectPermId.call(this, permId);
};
stjs.extend(DataStorePermId, ObjectPermId, [ ObjectPermId, IDataStoreId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.datastore.id.DataStorePermId';
+ prototype['@type'] = 'as.dto.datastore.id.DataStorePermId';
constructor.serialVersionUID = 1;
}, {});
return DataStorePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/IDataStoreId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/IDataStoreId.js
similarity index 74%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/IDataStoreId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/IDataStoreId.js
index e5c52aa86edb10bc7bdc1b40931f6393d1aaa202..abe9898ec6b49de4107718fe949dc76e8357a343 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/datastore/id/IDataStoreId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/id/IDataStoreId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IDataStoreId = function() {
};
stjs.extend(IDataStoreId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/AbstractObjectDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/AbstractObjectDeletionOptions.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/AbstractObjectDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/AbstractObjectDeletionOptions.js
index f2af5c37707addaa2f339ffcbc886c8509a1cc1a..a312a3d37bdd1c71890f1c28a5e203f4ac613c5b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/AbstractObjectDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/AbstractObjectDeletionOptions.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var AbstractObjectDeletionOptions = function() {
};
stjs.extend(AbstractObjectDeletionOptions, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.AbstractObjectDeletionOptions';
+ prototype['@type'] = 'as.dto.deletion.AbstractObjectDeletionOptions';
constructor.serialVersionUID = 1;
prototype.reason = null;
prototype.getReason = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/DeletedObject.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/DeletedObject.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/DeletedObject.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/DeletedObject.js
index 10ec84db6bc7fce6e010f720bdd78cd9fde891ad..1196e649ce0f0e0ee2f008c91cc1e40fa9bf32bb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/DeletedObject.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/DeletedObject.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var DeletedObject = function() {
};
stjs.extend(DeletedObject, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.DeletedObject';
+ prototype['@type'] = 'as.dto.deletion.DeletedObject';
prototype.id = null;
prototype.getId = function() {
return this.id;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/Deletion.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/Deletion.js
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/Deletion.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/Deletion.js
index f178f3670f8057914cc49544c89993cd0132eca4..5001e13ee1797c105c89271fcbc5441b75485685 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/Deletion.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/Deletion.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
this.deletedObjects = [];
};
stjs.extend(Deletion, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.Deletion';
+ prototype['@type'] = 'as.dto.deletion.Deletion';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.id = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js
index 92f1d2a5ec531f9afd288201613feb026ba924f2..1b93ddc107f81563914ee1915f0aa72a0bb36657 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletedObjectFetchOptions.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/fetchoptions/EmptyFetchOptions" ], function(stjs, EmptyFetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/EmptyFetchOptions" ], function(stjs, EmptyFetchOptions) {
var DeletedObjectFetchOptions = function() {
};
stjs.extend(DeletedObjectFetchOptions, EmptyFetchOptions, [ EmptyFetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.fetchoptions.DeletedObjectFetchOptions';
+ prototype['@type'] = 'as.dto.deletion.fetchoptions.DeletedObjectFetchOptions';
constructor.serialVersionUID = 1;
}, {});
return DeletedObjectFetchOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionFetchOptions.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionFetchOptions.js
index 1eb85740882063277782216e1d26b043404411da..f39c24fd1407a5c2100db5102632327aba4da64c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionFetchOptions.js
@@ -1,18 +1,18 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/deletion/fetchoptions/DeletedObjectFetchOptions", "dto/deletion/fetchoptions/DeletionSortOptions" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/deletion/fetchoptions/DeletedObjectFetchOptions", "as/dto/deletion/fetchoptions/DeletionSortOptions" ], function(require, stjs,
FetchOptions) {
var DeletionFetchOptions = function() {
};
stjs.extend(DeletionFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.fetchoptions.DeletionFetchOptions';
+ prototype['@type'] = 'as.dto.deletion.fetchoptions.DeletionFetchOptions';
constructor.serialVersionUID = 1;
prototype.deletedObjects = null;
prototype.sort = null;
prototype.withDeletedObjects = function() {
if (this.deletedObjects == null) {
- var DeletedObjectFetchOptions = require("dto/deletion/fetchoptions/DeletedObjectFetchOptions");
+ var DeletedObjectFetchOptions = require("as/dto/deletion/fetchoptions/DeletedObjectFetchOptions");
this.deletedObjects = new DeletedObjectFetchOptions();
}
return this.deletedObjects;
@@ -25,7 +25,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/deletio
};
prototype.sortBy = function() {
if (this.sort == null) {
- var DeletionSortOptions = require("dto/deletion/fetchoptions/DeletionSortOptions");
+ var DeletionSortOptions = require("as/dto/deletion/fetchoptions/DeletionSortOptions");
this.sort = new DeletionSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionSortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionSortOptions.js
index 961322c598023a0a0bc36b44a096660e2cf0d9e4..7af94c699c3cc7c53e6269f1d921961d1536af85 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/fetchoptions/DeletionSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/fetchoptions/DeletionSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var DeletionSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(DeletionSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.fetchoptions.DeletionSortOptions';
+ prototype['@type'] = 'as.dto.deletion.fetchoptions.DeletionSortOptions';
constructor.serialVersionUID = 1;
}, {});
return DeletionSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/DeletionTechId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/DeletionTechId.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/DeletionTechId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/DeletionTechId.js
index ea2dcbec79dc4d6a415ea5e9ee611337bb223431..05f46cc189a78e6568637f0d6ddf3ab50c035a00 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/DeletionTechId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/DeletionTechId.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectTechId", "dto/deletion/id/IDeletionId" ], function(stjs, ObjectTechId, IDeletionId) {
+define([ "stjs", "as/dto/common/id/ObjectTechId", "as/dto/deletion/id/IDeletionId" ], function(stjs, ObjectTechId, IDeletionId) {
var DeletionTechId = function(techId) {
ObjectTechId.call(this, techId);
};
stjs.extend(DeletionTechId, ObjectTechId, [ ObjectTechId, IDeletionId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.id.DeletionTechId';
+ prototype['@type'] = 'as.dto.deletion.id.DeletionTechId';
constructor.serialVersionUID = 1;
}, {});
return DeletionTechId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/IDeletionId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/IDeletionId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/IDeletionId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/IDeletionId.js
index 47b9279154d095c7d76a3b2223a9a2786adc231f..8fb212cb06120f03bf94c1d67578950f1b1e82f2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/id/IDeletionId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/id/IDeletionId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IDeletionId = function() {
};
stjs.extend(IDeletionId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a4c8421eba8f3a09d93ddb5c11cbb9c17c03de5
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js
@@ -0,0 +1,21 @@
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
+ var DeletionSearchCriteria = function() {
+ AbstractObjectSearchCriteria.call(this);
+ };
+ stjs.extend(DeletionSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.deletion.search.DeletionSearchCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.createBuilder = function() {
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
+ var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
+ builder.setName("DELETION");
+ return builder;
+ };
+ }, {
+ criteria : {
+ name : "Collection",
+ arguments : [ "ISearchCriteria" ]
+ }
+ });
+ return DeletionSearchCriteria;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/EntityTypePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/EntityTypePermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/EntityTypePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/EntityTypePermId.js
index 4a3eabe134cb08b02aebd5067096b250f1cb5c30..89e7e0b704b7fa23cad75cf745340a9a05c9f12e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/EntityTypePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/EntityTypePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/entitytype/id/IEntityTypeId" ], function(stjs, ObjectPermId, IEntityTypeId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/entitytype/id/IEntityTypeId" ], function(stjs, ObjectPermId, IEntityTypeId) {
/**
* @param permId
* Entity type perm id, e.g. "MY_ENTITY_TYPE".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/entitytype/id/IEntityTypeId"
ObjectPermId.call(this, permId);
};
stjs.extend(EntityTypePermId, ObjectPermId, [ ObjectPermId, IEntityTypeId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.entitytype.id.EntityTypePermId';
+ prototype['@type'] = 'as.dto.entitytype.id.EntityTypePermId';
constructor.serialVersionUID = 1;
}, {});
return EntityTypePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/IEntityTypeId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/IEntityTypeId.js
similarity index 74%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/IEntityTypeId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/IEntityTypeId.js
index 2122037eeb39ea9af544ffba803efd3d0efbaf16..ca7ecd37e0031922cf8804b986e755253d495444 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/id/IEntityTypeId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/id/IEntityTypeId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IEntityTypeId = function() {
};
stjs.extend(IEntityTypeId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/search/EntityTypeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
similarity index 55%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/search/EntityTypeSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
index 4dde393f1e3b5b64f7626c93813b892abbe7c785..ea2692a48eaeba56914a94fe77bf1187cdfdfaed 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/entitytype/search/EntityTypeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
@@ -1,24 +1,24 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/CodeSearchCriteria", "dto/common/search/PermIdSearchCriteria",
- "dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/CodeSearchCriteria", "as/dto/common/search/PermIdSearchCriteria",
+ "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
var EntityTypeSearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(EntityTypeSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.entitytype.search.EntityTypeSearchCriteria';
+ prototype['@type'] = 'as.dto.entitytype.search.EntityTypeSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.withPermId = function() {
- var PermIdSearchCriteria = require("dto/common/search/PermIdSearchCriteria");
+ var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setName("TYPE");
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/Experiment.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/Experiment.js
similarity index 99%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/Experiment.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/Experiment.js
index 36c18bf4f105f313214968727b03fd612e9504ba..c048d805bd683bd511d26024bc64439a7c898667 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/Experiment.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/Experiment.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Experiment = function() {
};
stjs.extend(Experiment, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.Experiment';
+ prototype['@type'] = 'as.dto.experiment.Experiment';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/ExperimentType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/ExperimentType.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/ExperimentType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/ExperimentType.js
index 706f7fb5fb898fe8bbef9aeb3ea582c57154c27f..eded58496d8a43fd9a379216ee8ba055e23994d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/ExperimentType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/ExperimentType.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
var ExperimentType = function() {
};
stjs.extend(ExperimentType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.ExperimentType';
+ prototype['@type'] = 'as.dto.experiment.ExperimentType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperation.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperation.js
index deb731afe66f370644bf12c2d07d13d2ff1f5910..432626079c18c49161b055eb6984a1cd599d2f7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var CreateExperimentsOperation = function() {
};
stjs.extend(CreateExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.create.CreateExperimentsOperation';
+ prototype['@type'] = 'as.dto.experiment.create.CreateExperimentsOperation';
prototype.newExperiments = null;
}, {
newExperiments : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperationResult.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperationResult.js
index 41c69b4506fa2b4e8797689d24dc1737ee54352e..0313243cf303d07f5c06f6239339f15302be9776 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/CreateExperimentsOperationResult.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "as/dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var CreateExperimentsOperationResult = function() {
};
stjs.extend(CreateExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.create.CreateExperimentsOperationResult';
+ prototype['@type'] = 'as.dto.experiment.create.CreateExperimentsOperationResult';
prototype.newExperimentIds = null;
}, {
newExperimentIds : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/ExperimentCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/ExperimentCreation.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/ExperimentCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/ExperimentCreation.js
index e3310f58e76ca3528584a6acc3b7251dcff73c1d..6081b72d60b78a3cc1edad5e8336869ba73dc698 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/ExperimentCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/create/ExperimentCreation.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
this.properties = {};
};
stjs.extend(ExperimentCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.create.ExperimentCreation';
+ prototype['@type'] = 'as.dto.experiment.create.ExperimentCreation';
constructor.serialVersionUID = 1;
prototype.typeId = null;
prototype.projectId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/delete/ExperimentDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/delete/ExperimentDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/delete/ExperimentDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/delete/ExperimentDeletionOptions.js
index 055521602a192845b38dbd2c99c9fb22f730052b..cb4b136da52c3ff04a309a7295c18966294c357e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/delete/ExperimentDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/delete/ExperimentDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var ExperimentDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(ExperimentDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.delete.ExperimentDeletionOptions';
+ prototype['@type'] = 'as.dto.experiment.delete.ExperimentDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return ExperimentDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentFetchOptions.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentFetchOptions.js
index 3872fd101b235d85b759c53e4f185679dc06674c..68eef159c8a7d04f2bfb7581ecf99592178cbc7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentFetchOptions.js
@@ -2,14 +2,14 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experiment/fetchoptions/ExperimentTypeFetchOptions', 'dto/project/fetchoptions/ProjectFetchOptions',
- 'dto/property/fetchoptions/PropertyFetchOptions', 'dto/tag/fetchoptions/TagFetchOptions', 'dto/person/fetchoptions/PersonFetchOptions', 'dto/attachment/fetchoptions/AttachmentFetchOptions',
- 'dto/dataset/fetchoptions/DataSetFetchOptions', 'dto/sample/fetchoptions/SampleFetchOptions', 'dto/history/fetchoptions/HistoryEntryFetchOptions',
- 'dto/material/fetchoptions/MaterialFetchOptions', 'dto/experiment/fetchoptions/ExperimentSortOptions' ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions', 'as/dto/project/fetchoptions/ProjectFetchOptions',
+ 'as/dto/property/fetchoptions/PropertyFetchOptions', 'as/dto/tag/fetchoptions/TagFetchOptions', 'as/dto/person/fetchoptions/PersonFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions',
+ 'as/dto/dataset/fetchoptions/DataSetFetchOptions', 'as/dto/sample/fetchoptions/SampleFetchOptions', 'as/dto/history/fetchoptions/HistoryEntryFetchOptions',
+ 'as/dto/material/fetchoptions/MaterialFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentSortOptions' ], function(require, stjs, FetchOptions) {
var ExperimentFetchOptions = function() {
};
stjs.extend(ExperimentFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.fetchoptions.ExperimentFetchOptions';
+ prototype['@type'] = 'as.dto.experiment.fetchoptions.ExperimentFetchOptions';
constructor.serialVersionUID = 1;
prototype.type = null;
prototype.project = null;
@@ -25,7 +25,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
prototype.sort = null;
prototype.withType = function() {
if (this.type == null) {
- var ExperimentTypeFetchOptions = require("dto/experiment/fetchoptions/ExperimentTypeFetchOptions");
+ var ExperimentTypeFetchOptions = require("as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions");
this.type = new ExperimentTypeFetchOptions();
}
return this.type;
@@ -38,7 +38,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withProject = function() {
if (this.project == null) {
- var ProjectFetchOptions = require("dto/project/fetchoptions/ProjectFetchOptions");
+ var ProjectFetchOptions = require("as/dto/project/fetchoptions/ProjectFetchOptions");
this.project = new ProjectFetchOptions();
}
return this.project;
@@ -51,7 +51,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withDataSets = function() {
if (this.dataSets == null) {
- var DataSetFetchOptions = require("dto/dataset/fetchoptions/DataSetFetchOptions");
+ var DataSetFetchOptions = require("as/dto/dataset/fetchoptions/DataSetFetchOptions");
this.dataSets = new DataSetFetchOptions();
}
return this.dataSets;
@@ -64,7 +64,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withSamples = function() {
if (this.samples == null) {
- var SampleFetchOptions = require("dto/sample/fetchoptions/SampleFetchOptions");
+ var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
this.samples = new SampleFetchOptions();
}
return this.samples;
@@ -77,7 +77,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withHistory = function() {
if (this.history == null) {
- var HistoryEntryFetchOptions = require("dto/history/fetchoptions/HistoryEntryFetchOptions");
+ var HistoryEntryFetchOptions = require("as/dto/history/fetchoptions/HistoryEntryFetchOptions");
this.history = new HistoryEntryFetchOptions();
}
return this.history;
@@ -90,7 +90,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withProperties = function() {
if (this.properties == null) {
- var PropertyFetchOptions = require("dto/property/fetchoptions/PropertyFetchOptions");
+ var PropertyFetchOptions = require("as/dto/property/fetchoptions/PropertyFetchOptions");
this.properties = new PropertyFetchOptions();
}
return this.properties;
@@ -103,7 +103,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withMaterialProperties = function() {
if (this.materialProperties == null) {
- var MaterialFetchOptions = require("dto/material/fetchoptions/MaterialFetchOptions");
+ var MaterialFetchOptions = require("as/dto/material/fetchoptions/MaterialFetchOptions");
this.materialProperties = new MaterialFetchOptions();
}
return this.materialProperties;
@@ -116,7 +116,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withTags = function() {
if (this.tags == null) {
- var TagFetchOptions = require("dto/tag/fetchoptions/TagFetchOptions");
+ var TagFetchOptions = require("as/dto/tag/fetchoptions/TagFetchOptions");
this.tags = new TagFetchOptions();
}
return this.tags;
@@ -129,7 +129,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -142,7 +142,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withModifier = function() {
if (this.modifier == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.modifier = new PersonFetchOptions();
}
return this.modifier;
@@ -155,7 +155,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.withAttachments = function() {
if (this.attachments == null) {
- var AttachmentFetchOptions = require("dto/attachment/fetchoptions/AttachmentFetchOptions");
+ var AttachmentFetchOptions = require("as/dto/attachment/fetchoptions/AttachmentFetchOptions");
this.attachments = new AttachmentFetchOptions();
}
return this.attachments;
@@ -168,7 +168,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/experim
};
prototype.sortBy = function() {
if (this.sort == null) {
- var ExperimentSortOptions = require("dto/experiment/fetchoptions/ExperimentSortOptions");
+ var ExperimentSortOptions = require("as/dto/experiment/fetchoptions/ExperimentSortOptions");
this.sort = new ExperimentSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentSortOptions.js
index 81c9c8639e34c17a29aeb641f75abf397e50d9e3..a9eee7c1618a963960f76ef0617d4f5ac7d47833 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
var ExperimentSortOptions = function() {
EntityWithPropertiesSortOptions.call(this);
};
stjs.extend(ExperimentSortOptions, EntityWithPropertiesSortOptions, [ EntityWithPropertiesSortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.fetchoptions.ExperimentSortOptions';
+ prototype['@type'] = 'as.dto.experiment.fetchoptions.ExperimentSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ExperimentSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js
index 09b7b78f6fcce94a082a3aa58b5710616cad14a8..ad804baab589fa6987e0ac749207eada4c49c0a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/experiment/fetchoptions/ExperimentTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/experiment/fetchoptions/ExperimentTypeSortOptions" ], function(stjs, FetchOptions) {
var ExperimentTypeFetchOptions = function() {
};
stjs.extend(ExperimentTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.fetchoptions.ExperimentTypeFetchOptions';
+ prototype['@type'] = 'as.dto.experiment.fetchoptions.ExperimentTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var ExperimentTypeSortOptions = require("dto/experiment/fetchoptions/ExperimentTypeSortOptions");
+ var ExperimentTypeSortOptions = require("as/dto/experiment/fetchoptions/ExperimentTypeSortOptions");
this.sort = new ExperimentTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js
index af6f3d921503e0ef6b10f168076954f222bfc34c..42c929c673b3b42da7edc2e3176ace0bb631d6cd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/fetchoptions/ExperimentTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var ExperimentTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(ExperimentTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.fetchoptions.ExperimentTypeSortOptions';
+ prototype['@type'] = 'as.dto.experiment.fetchoptions.ExperimentTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ExperimentTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/history/ExperimentRelationType.js
similarity index 80%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/history/ExperimentRelationType.js
index aa3e153c693ed9050b0103bafbb323e395883b02..7db71996f7d468a1c560af8029145d08f4f1c133 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/history/ExperimentRelationType.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var ExperimentRelationType = function() {
Enum.call(this, [ "PROJECT", "SAMPLE", "DATA_SET" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentIdentifier.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentIdentifier.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentIdentifier.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentIdentifier.js
index b19c17ebd17d255975f8f230936053d9619a5cc7..9fcfcfb9ad53660a85e0449a7f5cb1a425bdc1fb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentIdentifier.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentIdentifier.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/experiment/id/IExperimentId" ], function(stjs, ObjectIdentifier, IExperimentId) {
+define([ "stjs", "as/dto/common/id/ObjectIdentifier", "as/dto/experiment/id/IExperimentId" ], function(stjs, ObjectIdentifier, IExperimentId) {
/**
* @param identifier
* Experiment identifier, e.g.
@@ -13,7 +13,7 @@ define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/experiment/id/IExperimen
ObjectIdentifier.call(this, identifier);
};
stjs.extend(ExperimentIdentifier, ObjectIdentifier, [ ObjectIdentifier, IExperimentId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.id.ExperimentIdentifier';
+ prototype['@type'] = 'as.dto.experiment.id.ExperimentIdentifier';
constructor.serialVersionUID = 1;
}, {});
return ExperimentIdentifier;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentPermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentPermId.js
index b6ae9e9e9a48c4dcaf4a93a45eccf7392ef865b7..b12b52c6e431267ef82064e06e5c8b5b2e75b274 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/ExperimentPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/ExperimentPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/experiment/id/IExperimentId" ], function(stjs, ObjectPermId, IExperimentId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/experiment/id/IExperimentId" ], function(stjs, ObjectPermId, IExperimentId) {
/**
* @param permId
* Experiment perm id, e.g. "201108050937246-1031".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/experiment/id/IExperimentId"
ObjectPermId.call(this, permId);
};
stjs.extend(ExperimentPermId, ObjectPermId, [ ObjectPermId, IExperimentId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.id.ExperimentPermId';
+ prototype['@type'] = 'as.dto.experiment.id.ExperimentPermId';
constructor.serialVersionUID = 1;
}, {});
return ExperimentPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/IExperimentId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/IExperimentId.js
similarity index 74%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/IExperimentId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/IExperimentId.js
index 1f9ae82d83028a146dddd68278e6d60b8a5a1be7..cb502e43987e7cb770629287a55d4743443cc0f0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/id/IExperimentId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/id/IExperimentId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IExperimentId = function() {
};
stjs.extend(IExperimentId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperation.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperation.js
index 952d2305ae953054c23608986e7f223d208438d8..d4dce670c6551bc212614ee744336a6b7facd54f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var ListExperimentsOperation = function() {
};
stjs.extend(ListExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.list.ListExperimentsOperation';
+ prototype['@type'] = 'as.dto.experiment.list.ListExperimentsOperation';
}, {});
return ListExperimentsOperation;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperationResult.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperationResult.js
index 754773930ca8713b12ce057a3c3bc181ea207883..457bb03e229d9678f49ece3254e3c50ba70077b2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/list/ListExperimentsOperationResult.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "as/dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var ListExperimentsOperationResult = function() {
};
stjs.extend(ListExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.list.ListExperimentsOperationResult';
+ prototype['@type'] = 'as.dto.experiment.list.ListExperimentsOperationResult';
}, {});
return ListExperimentsOperationResult;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/ExperimentSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
similarity index 74%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/ExperimentSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
index 984baa33055ead503fd7bab377bdc0dbb5e65151..1ecb1b0bac2b2d3cc96a5a9e0128e79f454c2649 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/ExperimentSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
@@ -1,16 +1,16 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "dto/common/search/SearchOperator", "dto/project/search/ProjectSearchCriteria" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/project/search/ProjectSearchCriteria" ], function(require, stjs,
AbstractEntitySearchCriteria, SearchOperator) {
var ExperimentSearchCriteria = function() {
AbstractEntitySearchCriteria.call(this);
};
stjs.extend(ExperimentSearchCriteria, AbstractEntitySearchCriteria, [ AbstractEntitySearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.search.ExperimentSearchCriteria';
+ prototype['@type'] = 'as.dto.experiment.search.ExperimentSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withProject = function() {
- var ProjectSearchCriteria = require("dto/project/search/ProjectSearchCriteria");
+ var ProjectSearchCriteria = require("as/dto/project/search/ProjectSearchCriteria");
return this.addCriteria(new ProjectSearchCriteria());
};
prototype.withOrOperator = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/NoExperimentSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/NoExperimentSearchCriteria.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/NoExperimentSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/NoExperimentSearchCriteria.js
index 042279dc1164e73db7c3b47402ebe3a013895b71..615028e85c204960cc16d4ae0cd69980ff210f85 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/NoExperimentSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/NoExperimentSearchCriteria.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
+define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
var NoExperimentSearchCriteria = function() {
};
stjs.extend(NoExperimentSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.search.NoExperimentSearchCriteria';
+ prototype['@type'] = 'as.dto.experiment.search.NoExperimentSearchCriteria';
constructor.serialVersionUID = 1;
}, {});
return NoExperimentSearchCriteria;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperation.js
similarity index 58%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperation.js
index bfb056eba3c68245a6c87a843e504e258a87165a..056c12efb5a665e2be6902ff0649db054deb1c7d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var SearchForExperimentsOperation = function() {
};
stjs.extend(SearchForExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.search.SearchExperimentsOperation';
+ prototype['@type'] = 'as.dto.experiment.search.SearchExperimentsOperation';
}, {});
return SearchForExperimentsOperation;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperationResult.js
similarity index 58%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperationResult.js
index 89b5f3b41f85c7e406d0957e116443316d1f15e8..1aa033b3a76fa444a8c72fcd84073cfb69d004bd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/SearchExperimentsOperationResult.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "as/dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var SearchForExperimentsOperationResult = function() {
};
stjs.extend(SearchForExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.search.SearchExperimentsOperationResult';
+ prototype['@type'] = 'as.dto.experiment.search.SearchExperimentsOperationResult';
}, {});
return SearchForExperimentsOperationResult;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/ExperimentUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/ExperimentUpdate.js
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/ExperimentUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/ExperimentUpdate.js
index de7f2c1e165476efff173b821cee2af162ea55fd..9a27f0f9fd6b54c287ca81b7dd281da4f1618523 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/ExperimentUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/ExperimentUpdate.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdListUpdateValue", "dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue,
+define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/IdListUpdateValue", "as/dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue,
AttachmentListUpdateValue) {
var ExperimentUpdate = function() {
this.properties = {};
@@ -10,7 +10,7 @@ define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdList
this.attachments = new AttachmentListUpdateValue();
};
stjs.extend(ExperimentUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.update.ExperimentUpdate';
+ prototype['@type'] = 'as.dto.experiment.update.ExperimentUpdate';
constructor.serialVersionUID = 1;
prototype.experimentId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperation.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperation.js
index 823202d8a504f8cc3e6e0fbf5fbd365bda29631c..fe478230743370a434c1b3891484899af0190b58 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var UpdateExperimentsOperation = function() {
};
stjs.extend(UpdateExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.update.UpdateExperimentsOperation';
+ prototype['@type'] = 'as.dto.experiment.update.UpdateExperimentsOperation';
}, {});
return UpdateExperimentsOperation;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperationResult.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperationResult.js
index 7db9668dc2cf115e840648b4a2e37a98ec4cc0a6..ff424adbb0a5cade05bcf4a304220d2cec94909f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/update/UpdateExperimentsOperationResult.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "as/dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var UpdateExperimentsOperationResult = function() {
};
stjs.extend(UpdateExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
- prototype['@type'] = 'dto.experiment.update.UpdateExperimentsOperationResult';
+ prototype['@type'] = 'as.dto.experiment.update.UpdateExperimentsOperationResult';
}, {});
return UpdateExperimentsOperationResult;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/ExternalDms.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/ExternalDms.js
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/ExternalDms.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/ExternalDms.js
index 176dd3ac0cc3e6aaf1bf6203bd0321b44f86c48e..5a1846fd04ac3db30acef793ac2712ee13ecaf01 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/ExternalDms.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/ExternalDms.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var ExternalDms = function() {
};
stjs.extend(ExternalDms, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.externaldms.ExternalDms';
+ prototype['@type'] = 'as.dto.externaldms.ExternalDms';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js
similarity index 63%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js
index 0d3803af8098e54cb87e3292d585d07d8c2c2c6d..efdcd125326a8f949fade994cd6ba8ed6d188558 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/externaldms/fetchoptions/ExternalDmsSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/externaldms/fetchoptions/ExternalDmsSortOptions" ], function(require, stjs, FetchOptions) {
var ExternalDmsFetchOptions = function() {
};
stjs.extend(ExternalDmsFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.externaldms.fetchoptions.ExternalDmsFetchOptions';
+ prototype['@type'] = 'as.dto.externaldms.fetchoptions.ExternalDmsFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var ExternalDmsSortOptions = require("dto/externaldms/fetchoptions/ExternalDmsSortOptions");
+ var ExternalDmsSortOptions = require("as/dto/externaldms/fetchoptions/ExternalDmsSortOptions");
this.sort = new ExternalDmsSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js
index e1b6df795fbd99a252132e777318dfd4585f9ab6..a9325fe22b702baea13298528d7dd3ff2d3f8526 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/fetchoptions/ExternalDmsSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var ExternalDmsSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(ExternalDmsSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.externaldms.fetchoptions.ExternalDmsSortOptions';
+ prototype['@type'] = 'as.dto.externaldms.fetchoptions.ExternalDmsSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ExternalDmsSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/ExternalDmsPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/ExternalDmsPermId.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/ExternalDmsPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/ExternalDmsPermId.js
index 60ff47dacea808de84ba0ab9cb533eda3b09e22b..a45097359d9087b681c610ef509999ec0dab0d63 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/ExternalDmsPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/ExternalDmsPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/externaldms/id/IExternalDmsId" ], function(stjs, ObjectPermId, IExternalDmsId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/externaldms/id/IExternalDmsId" ], function(stjs, ObjectPermId, IExternalDmsId) {
/**
* @param permId
@@ -13,7 +13,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/externaldms/id/IExternalDmsI
ObjectPermId.call(this, permId);
};
stjs.extend(ExternalDmsPermId, ObjectPermId, [ ObjectPermId, IExternalDmsId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.externaldms.id.ExternalDmsPermId';
+ prototype['@type'] = 'as.dto.externaldms.id.ExternalDmsPermId';
constructor.serialVersionUID = 1;
}, {});
return ExternalDmsPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/IExternalDmsId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/IExternalDmsId.js
similarity index 76%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/IExternalDmsId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/IExternalDmsId.js
index 40b0ae8e9e54b08575ddb81e09aaa087c063c31d..c8089703e6b15312c07c5a9eae73dea308c75b43 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/externaldms/id/IExternalDmsId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/externaldms/id/IExternalDmsId.js
@@ -4,7 +4,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IExternalDmsId = function() {
};
stjs.extend(IExternalDmsId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/HistoryEntry.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/HistoryEntry.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/HistoryEntry.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/HistoryEntry.js
index ce96eab4b0572e988ba9c2ad884c7498e3a823ba..8e308de16ffa436e62dee29735c1fe7d78f84140 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/HistoryEntry.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/HistoryEntry.js
@@ -2,7 +2,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var HistoryEntry = function() {
};
stjs.extend(HistoryEntry, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.history.HistoryEntry';
+ prototype['@type'] = 'as.dto.history.HistoryEntry';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.validFrom = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/IRelationType.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/IRelationType.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/PropertyHistoryEntry.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/PropertyHistoryEntry.js
similarity index 79%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/PropertyHistoryEntry.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/PropertyHistoryEntry.js
index 15b6f1384b0f0f80e8c75a91a1db67cd530403df..f3b600110a438ed62d6374675da536a080c0acd9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/PropertyHistoryEntry.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/PropertyHistoryEntry.js
@@ -1,9 +1,9 @@
-define([ "stjs", "util/Exceptions", "dto/history/HistoryEntry" ], function(stjs, exceptions, HistoryEntry) {
+define([ "stjs", "util/Exceptions", "as/dto/history/HistoryEntry" ], function(stjs, exceptions, HistoryEntry) {
var PropertyHistoryEntry = function() {
HistoryEntry.call(this);
};
stjs.extend(PropertyHistoryEntry, HistoryEntry, [ HistoryEntry ], function(constructor, prototype) {
- prototype['@type'] = 'dto.history.PropertyHistoryEntry';
+ prototype['@type'] = 'as.dto.history.PropertyHistoryEntry';
constructor.serialVersionUID = 1;
prototype.propertyName = null;
prototype.propertyValue = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/RelationHistoryEntry.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/RelationHistoryEntry.js
similarity index 81%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/RelationHistoryEntry.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/RelationHistoryEntry.js
index cf9404981ac20d2d211dfec7804530088d74b1c8..2c40900a670494644660c0e75ed2c46928488f64 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/RelationHistoryEntry.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/RelationHistoryEntry.js
@@ -1,9 +1,9 @@
-define([ "stjs", "util/Exceptions", "dto/history/HistoryEntry" ], function(stjs, exceptions, HistoryEntry) {
+define([ "stjs", "util/Exceptions", "as/dto/history/HistoryEntry" ], function(stjs, exceptions, HistoryEntry) {
var RelationHistoryEntry = function() {
HistoryEntry.call(this);
};
stjs.extend(RelationHistoryEntry, HistoryEntry, [ HistoryEntry ], function(constructor, prototype) {
- prototype['@type'] = 'dto.history.RelationHistoryEntry';
+ prototype['@type'] = 'as.dto.history.RelationHistoryEntry';
constructor.serialVersionUID = 1;
prototype.relationType = null;
prototype.relatedObjectId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntryFetchOptions.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntryFetchOptions.js
index ec15958dec6fd77cf2a471007c4ef7a1c8c03f8a..c8714f48f32dc9b4e88ae837c32fe5fecbfc3d0d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntryFetchOptions.js
@@ -2,18 +2,18 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/fetchoptions/PersonFetchOptions", "dto/history/fetchoptions/HistoryEntrySortOptions" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/history/fetchoptions/HistoryEntrySortOptions" ], function(require, stjs,
FetchOptions) {
var HistoryEntryFetchOptions = function() {
};
stjs.extend(HistoryEntryFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.history.fetchoptions.HistoryEntryFetchOptions';
+ prototype['@type'] = 'as.dto.history.fetchoptions.HistoryEntryFetchOptions';
constructor.serialVersionUID = 1;
prototype.author = null;
prototype.sort = null;
prototype.withAuthor = function() {
if (this.author == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.author = new PersonFetchOptions();
}
return this.author;
@@ -26,7 +26,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var HistoryEntrySortOptions = require("dto/history/fetchoptions/HistoryEntrySortOptions");
+ var HistoryEntrySortOptions = require("as/dto/history/fetchoptions/HistoryEntrySortOptions");
this.sort = new HistoryEntrySortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntrySortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntrySortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntrySortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntrySortOptions.js
index e44b69d18daca9ecedeb69c51856bcf6503f4a95..3144a97a3dfee1ddff674f8a96e55802fb661ed9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/fetchoptions/HistoryEntrySortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/history/fetchoptions/HistoryEntrySortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var HistoryEntrySortOptions = function() {
SortOptions.call(this);
};
stjs.extend(HistoryEntrySortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.history.fetchoptions.HistoryEntrySortOptions';
+ prototype['@type'] = 'as.dto.history.fetchoptions.HistoryEntrySortOptions';
constructor.serialVersionUID = 1;
}, {});
return HistoryEntrySortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/Material.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/Material.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/Material.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/Material.js
index 2b28f01661de1a5cb1552112f27d6d67ec455082..1f68493396a3ed52f712d5ba320c4769e53ccda4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/Material.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/Material.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Material = function() {
};
stjs.extend(Material, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.Material';
+ prototype['@type'] = 'as.dto.material.Material';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/MaterialType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/MaterialType.js
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/MaterialType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/MaterialType.js
index 6aba059945b4957fdf20ae0235a9f4f9fcabe3c2..ad99082a0c5bddb7b6b658fbdcd8427a8803451e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/MaterialType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/MaterialType.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var MaterialType = function() {
};
stjs.extend(MaterialType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.MaterialType';
+ prototype['@type'] = 'as.dto.material.MaterialType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/create/MaterialCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/create/MaterialCreation.js
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/create/MaterialCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/create/MaterialCreation.js
index cd7839a7abae4ac232846b0164f1329eb805601c..e51bd4b2588416f0c8b7f7d22b187d0c6a8c2c47 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/create/MaterialCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/create/MaterialCreation.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
this.properties = {};
};
stjs.extend(MaterialCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.create.MaterialCreation';
+ prototype['@type'] = 'as.dto.material.create.MaterialCreation';
constructor.serialVersionUID = 1;
prototype.code = null;
prototype.typeId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/delete/MaterialDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/delete/MaterialDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/delete/MaterialDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/delete/MaterialDeletionOptions.js
index f719b1e4636b8d54c82c4dec1d05f48e6afbba22..dd777534a43f444e199f40963162e98ad11325b3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/delete/MaterialDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/delete/MaterialDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var MaterialDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(MaterialDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.delete.MaterialDeletionOptions';
+ prototype['@type'] = 'as.dto.material.delete.MaterialDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return MaterialDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialFetchOptions.js
similarity index 76%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialFetchOptions.js
index cb2c15bfc0a74fd4c91318eec88cffd8de12dde8..f320b6912ddf1eb64be1dedcae87955072904058 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialFetchOptions.js
@@ -2,13 +2,13 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/material/fetchoptions/MaterialTypeFetchOptions", "dto/history/fetchoptions/HistoryEntryFetchOptions",
- "dto/person/fetchoptions/PersonFetchOptions", "dto/property/fetchoptions/PropertyFetchOptions", "dto/tag/fetchoptions/TagFetchOptions", "dto/material/fetchoptions/MaterialSortOptions" ],
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/material/fetchoptions/MaterialTypeFetchOptions", "as/dto/history/fetchoptions/HistoryEntryFetchOptions",
+ "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/property/fetchoptions/PropertyFetchOptions", "as/dto/tag/fetchoptions/TagFetchOptions", "as/dto/material/fetchoptions/MaterialSortOptions" ],
function(require, stjs, FetchOptions) {
var MaterialFetchOptions = function() {
};
stjs.extend(MaterialFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.fetchoptions.MaterialFetchOptions';
+ prototype['@type'] = 'as.dto.material.fetchoptions.MaterialFetchOptions';
constructor.serialVersionUID = 1;
prototype.type = null;
prototype.history = null;
@@ -19,7 +19,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
prototype.sort = null;
prototype.withType = function() {
if (this.type == null) {
- var MaterialTypeFetchOptions = require("dto/material/fetchoptions/MaterialTypeFetchOptions");
+ var MaterialTypeFetchOptions = require("as/dto/material/fetchoptions/MaterialTypeFetchOptions");
this.type = new MaterialTypeFetchOptions();
}
return this.type;
@@ -32,7 +32,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
};
prototype.withHistory = function() {
if (this.history == null) {
- var HistoryEntryFetchOptions = require("dto/history/fetchoptions/HistoryEntryFetchOptions");
+ var HistoryEntryFetchOptions = require("as/dto/history/fetchoptions/HistoryEntryFetchOptions");
this.history = new HistoryEntryFetchOptions();
}
return this.history;
@@ -45,7 +45,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -58,7 +58,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
};
prototype.withProperties = function() {
if (this.properties == null) {
- var PropertyFetchOptions = require("dto/property/fetchoptions/PropertyFetchOptions");
+ var PropertyFetchOptions = require("as/dto/property/fetchoptions/PropertyFetchOptions");
this.properties = new PropertyFetchOptions();
}
return this.properties;
@@ -83,7 +83,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
};
prototype.withTags = function() {
if (this.tags == null) {
- var TagFetchOptions = require("dto/tag/fetchoptions/TagFetchOptions");
+ var TagFetchOptions = require("as/dto/tag/fetchoptions/TagFetchOptions");
this.tags = new TagFetchOptions();
}
return this.tags;
@@ -96,7 +96,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/materia
};
prototype.sortBy = function() {
if (this.sort == null) {
- var MaterialSortOptions = require("dto/material/fetchoptions/MaterialSortOptions");
+ var MaterialSortOptions = require("as/dto/material/fetchoptions/MaterialSortOptions");
this.sort = new MaterialSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialSortOptions.js
index 5984c408ecb9bd6e59f1a369043265e26ee7a229..0896351f823971ee87b45052be6dc827de939c78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
var MaterialSortOptions = function() {
EntityWithPropertiesSortOptions.call(this);
};
stjs.extend(MaterialSortOptions, EntityWithPropertiesSortOptions, [ EntityWithPropertiesSortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.fetchoptions.MaterialSortOptions';
+ prototype['@type'] = 'as.dto.material.fetchoptions.MaterialSortOptions';
constructor.serialVersionUID = 1;
}, {});
return MaterialSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeFetchOptions.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeFetchOptions.js
index dc195c20fbbe31110dcd6d571c9759a19b542b44..8ce0b76eeb07ab11bd18082ee73ec6770f1e60ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/material/fetchoptions/MaterialTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/material/fetchoptions/MaterialTypeSortOptions" ], function(stjs, FetchOptions) {
var MaterialTypeFetchOptions = function() {
};
stjs.extend(MaterialTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.fetchoptions.MaterialTypeFetchOptions';
+ prototype['@type'] = 'as.dto.material.fetchoptions.MaterialTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var MaterialTypeSortOptions = require("dto/material/fetchoptions/MaterialTypeSortOptions");
+ var MaterialTypeSortOptions = require("as/dto/material/fetchoptions/MaterialTypeSortOptions");
this.sort = new MaterialTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeSortOptions.js
index a9e2b5785ac4a6eb9173123c4ee17aabeccaa699..7cf59fa8b0e6c1304b9c6089a12b91152181789b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/fetchoptions/MaterialTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/fetchoptions/MaterialTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var MaterialTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(MaterialTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.fetchoptions.MaterialTypeSortOptions';
+ prototype['@type'] = 'as.dto.material.fetchoptions.MaterialTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return MaterialTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/IMaterialId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/IMaterialId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/IMaterialId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/IMaterialId.js
index 80bd55aa7a9bcc11c722c92ee0d2690073451fd0..499c83eeef8a83184e4acfb5dcbb60741441a701 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/IMaterialId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/IMaterialId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IMaterialId = function() {
};
stjs.extend(IMaterialId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/MaterialPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/MaterialPermId.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/MaterialPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/MaterialPermId.js
index 057bd360907d9547bb9ef11b78adc789ed6bb3ec..6a52df6dd340551e5d5d2c20c798b0b675c3544f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/id/MaterialPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/id/MaterialPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/material/id/IMaterialId" ], function(stjs, IMaterialId) {
+define([ "stjs", "as/dto/material/id/IMaterialId" ], function(stjs, IMaterialId) {
/**
* @param permId
* Material perm id, e.g. "MY_MATERIAL (MY_MATERIAL_TYPE)".
@@ -13,7 +13,7 @@ define([ "stjs", "dto/material/id/IMaterialId" ], function(stjs, IMaterialId) {
this.setTypeCode(typeCode);
};
stjs.extend(MaterialPermId, null, [ IMaterialId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.id.MaterialPermId';
+ prototype['@type'] = 'as.dto.material.id.MaterialPermId';
constructor.serialVersionUID = 1;
prototype.code = null;
prototype.typeCode = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/search/MaterialSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/search/MaterialSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
index 634d3a242e112fe13d278486198e72ef32bf3c04..8edef0f14200d64d386efe28a67eadf508e65aad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/search/MaterialSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/AbstractEntitySearchCriteria", "dto/common/search/SearchOperator" ], function(stjs, AbstractEntitySearchCriteria, SearchOperator) {
+define([ "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator" ], function(stjs, AbstractEntitySearchCriteria, SearchOperator) {
var MaterialSearchCriteria = function() {
AbstractEntitySearchCriteria.call(this);
};
stjs.extend(MaterialSearchCriteria, AbstractEntitySearchCriteria, [ AbstractEntitySearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.search.MaterialSearchCriteria';
+ prototype['@type'] = 'as.dto.material.search.MaterialSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withOrOperator = function() {
return this.withOperator(SearchOperator.OR);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/update/MaterialUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/update/MaterialUpdate.js
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/update/MaterialUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/update/MaterialUpdate.js
index 7deee53aad1a4dc48fbae71c09696549dc435e30..4043feca2fbf6b0a0db3246a164053e323a661a3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/material/update/MaterialUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/update/MaterialUpdate.js
@@ -1,13 +1,13 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/IdListUpdateValue" ], function(stjs, IdListUpdateValue) {
+define([ "stjs", "as/dto/common/update/IdListUpdateValue" ], function(stjs, IdListUpdateValue) {
var MaterialUpdate = function() {
this.properties = {};
this.tagIds = new IdListUpdateValue();
};
stjs.extend(MaterialUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.material.update.MaterialUpdate';
+ prototype['@type'] = 'as.dto.material.update.MaterialUpdate';
constructor.serialVersionUID = 1;
prototype.materialId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKind.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKind.js
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKind.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKind.js
index d6b81480b838b51b5bb557044e78b2fead121d84..d08001368ca255208a590b7990504e668dbea366 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKind.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKind.js
@@ -5,7 +5,7 @@
*
* @author Franz-Josef Elmer
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var ObjectKind = function() {
Enum.call(this, [ "AUTHORIZATION_GROUP", "SAMPLE", "EXPERIMENT", "MATERIAL", "DATA_SET", "SAMPLE_TYPE",
"EXPERIMENT_TYPE", "MATERIAL_TYPE", "DATASET_TYPE", "FILE_FORMAT_TYPE", "PROJECT",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKindModification.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKindModification.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKindModification.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKindModification.js
index 577cc1bfa9e9d7eed21262a4c7fa51c946b56cf8..142ba891fefea7ac1072f10a23d2d123e4633d05 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/ObjectKindModification.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/ObjectKindModification.js
@@ -2,7 +2,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var ObjectKindModification = function() {
};
stjs.extend(ObjectKindModification, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.objectkindmodification.ObjectKindModification';
+ prototype['@type'] = 'as.dto.objectkindmodification.ObjectKindModification';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.objectKind = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/OperationKind.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/OperationKind.js
similarity index 83%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/OperationKind.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/OperationKind.js
index 4a25814ffcc0a845ae5e743fba6c0cf10a761ff2..8100e9fa5a67fddb464e9da5c493de6b2105781a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/OperationKind.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/OperationKind.js
@@ -3,7 +3,7 @@
*
* @author Franz-Josef Elmer
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var OperationKind = function() {
Enum.call(this, [ "CREATE_OR_DELETE", "UPDATE" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js
index 89f03fd9f91e47ab41e199af3725b6715c6e16e7..f5342845076491ef9eb8e31f96273cdcd7514dd2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.js
@@ -1,13 +1,13 @@
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions" ], function(require, stjs, FetchOptions) {
var ObjectKindModificationFetchOptions = function() {
};
stjs.extend(ObjectKindModificationFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions';
+ prototype['@type'] = 'as.dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var ObjectKindModificationSortOptions = require("dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions");
+ var ObjectKindModificationSortOptions = require("as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions");
this.sort = new ObjectKindModificationSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js
index a3027c68dea9a115e979bcdb866db2ea773aa678..3f18b2848265a0af51ac6c76278ae8901d874f93 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var ObjectKindModificationSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(ObjectKindModificationSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.objectkindmodification.fetchoptions.ObjectKindModificationSortOptions';
+ prototype['@type'] = 'as.dto.objectkindmodification.fetchoptions.ObjectKindModificationSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ObjectKindModificationSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
similarity index 78%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
index c2937b69970a9a774763d31b1fce2dbd374ebf5f..078a84a00b1721723a22c5c1932122c774c687db 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
@@ -3,13 +3,13 @@
*
* @author Franz-Josef Elmer
*/
-define([ "stjs", "dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
+define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
var ObjectKindModificationSearchCriteria = function() {
this.objectKinds = [];
this.operationKinds = [];
};
stjs.extend(ObjectKindModificationSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
+ prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withObjectKinds = function(objectKinds) {
this.objectKinds = objectKinds;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/Person.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/Person.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/Person.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/Person.js
index 2e67ebbf5629abb5fe5f4c243a17b32dfedfbe3e..6b1bf5e0db5c411c731d8e3c0184b9ce2df4cc53 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/Person.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/Person.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Person = function() {
};
stjs.extend(Person, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.person.Person';
+ prototype['@type'] = 'as.dto.person.Person';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonFetchOptions.js
similarity index 75%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonFetchOptions.js
index eae87c6c939c908004b9f6cdf7caf535c3cd5b3f..e976267203ffe4eca6bc95a41001881bb6c54c13 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonFetchOptions.js
@@ -2,18 +2,18 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/space/fetchoptions/SpaceFetchOptions", "dto/person/fetchoptions/PersonSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/space/fetchoptions/SpaceFetchOptions", "as/dto/person/fetchoptions/PersonSortOptions" ], function(require, stjs, FetchOptions) {
var PersonFetchOptions = function() {
};
stjs.extend(PersonFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.person.fetchoptions.PersonFetchOptions';
+ prototype['@type'] = 'as.dto.person.fetchoptions.PersonFetchOptions';
constructor.serialVersionUID = 1;
prototype.space = null;
prototype.registrator = null;
prototype.sort = null;
prototype.withSpace = function() {
if (this.space == null) {
- var SpaceFetchOptions = require("dto/space/fetchoptions/SpaceFetchOptions");
+ var SpaceFetchOptions = require("as/dto/space/fetchoptions/SpaceFetchOptions");
this.space = new SpaceFetchOptions();
}
return this.space;
@@ -38,7 +38,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/space/f
};
prototype.sortBy = function() {
if (this.sort == null) {
- var PersonSortOptions = require("dto/person/fetchoptions/PersonSortOptions");
+ var PersonSortOptions = require("as/dto/person/fetchoptions/PersonSortOptions");
this.sort = new PersonSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonSortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonSortOptions.js
index 200929e7e469f2e950c8da387fcd670fc3309aa1..6ff69963e01522e75d0743e14a031df735e09589 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/fetchoptions/PersonSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/fetchoptions/PersonSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var PersonSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(PersonSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.person.fetchoptions.PersonSortOptions';
+ prototype['@type'] = 'as.dto.person.fetchoptions.PersonSortOptions';
constructor.serialVersionUID = 1;
}, {});
return PersonSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/IPersonId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/IPersonId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/IPersonId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/IPersonId.js
index 2f19729a90983c163623d82df4302790b735c694..9455cd747f40d188f2a9b3c3711569281b42af2d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/IPersonId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/IPersonId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IPersonId = function() {
};
stjs.extend(IPersonId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/PersonPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/PersonPermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/PersonPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/PersonPermId.js
index b4db44b41bab3e524223b702a6edad12b7a46f45..09f0d2ff366199f7684c51ba021b67e75d886516 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/person/id/PersonPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/id/PersonPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/person/id/IPersonId" ], function(stjs, ObjectPermId, IPersonId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/person/id/IPersonId" ], function(stjs, ObjectPermId, IPersonId) {
/**
* @param permId
@@ -13,7 +13,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/person/id/IPersonId" ], func
ObjectPermId.call(this, permId);
};
stjs.extend(PersonPermId, ObjectPermId, [ ObjectPermId, IPersonId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.person.id.PersonPermId';
+ prototype['@type'] = 'as.dto.person.id.PersonPermId';
constructor.serialVersionUID = 1;
}, {});
return PersonPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/Project.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/Project.js
similarity index 99%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/Project.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/Project.js
index 84d958ea9245ba184561e0667f0a5640cdc3aea1..bed523353184f2e35b7b3534bd68048cb310f55d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/Project.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/Project.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Project = function() {
};
stjs.extend(Project, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.Project';
+ prototype['@type'] = 'as.dto.project.Project';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/create/ProjectCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/create/ProjectCreation.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/create/ProjectCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/create/ProjectCreation.js
index 9dfe52894947e98e71f1eaaa403f75d846ed8cad..a2a5a39e0ac511ea3c7003d61444f63911d73cc9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/create/ProjectCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/create/ProjectCreation.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var ProjectCreation = function() {
};
stjs.extend(ProjectCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.create.ProjectCreation';
+ prototype['@type'] = 'as.dto.project.create.ProjectCreation';
constructor.serialVersionUID = 1;
prototype.spaceId = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/delete/ProjectDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/delete/ProjectDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/delete/ProjectDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/delete/ProjectDeletionOptions.js
index a054c847d529795616765138894c1b0879287e75..56f2bc5a2b69e9d4d8024e9036e7e75092e0a1bb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/delete/ProjectDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/delete/ProjectDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var ProjectDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(ProjectDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.delete.ProjectDeletionOptions';
+ prototype['@type'] = 'as.dto.project.delete.ProjectDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return ProjectDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
index 1db904214340ed579d8ea44881a58dccc858f2de..7844c2cbe0d969b37c7272b6aca332f0f83a33a8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
@@ -2,13 +2,13 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/fetchoptions/PersonFetchOptions', 'dto/space/fetchoptions/SpaceFetchOptions',
- 'dto/sample/fetchoptions/SampleFetchOptions', 'dto/experiment/fetchoptions/ExperimentFetchOptions', 'dto/attachment/fetchoptions/AttachmentFetchOptions',
- 'dto/project/fetchoptions/ProjectSortOptions', 'dto/history/fetchoptions/HistoryEntryFetchOptions' ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/person/fetchoptions/PersonFetchOptions', 'as/dto/space/fetchoptions/SpaceFetchOptions',
+ 'as/dto/sample/fetchoptions/SampleFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions',
+ 'as/dto/project/fetchoptions/ProjectSortOptions', 'as/dto/history/fetchoptions/HistoryEntryFetchOptions' ], function(require, stjs, FetchOptions) {
var ProjectFetchOptions = function() {
};
stjs.extend(ProjectFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.fetchoptions.ProjectFetchOptions';
+ prototype['@type'] = 'as.dto.project.fetchoptions.ProjectFetchOptions';
constructor.serialVersionUID = 1;
prototype.experiments = null;
prototype.samples = null;
@@ -21,7 +21,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
prototype.sort = null;
prototype.withExperiments = function() {
if (this.experiments == null) {
- var ExperimentFetchOptions = require("dto/experiment/fetchoptions/ExperimentFetchOptions");
+ var ExperimentFetchOptions = require("as/dto/experiment/fetchoptions/ExperimentFetchOptions");
this.experiments = new ExperimentFetchOptions();
}
return this.experiments;
@@ -34,7 +34,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withSamples = function() {
if (this.samples == null) {
- var SampleFetchOptions = require("dto/sample/fetchoptions/SampleFetchOptions");
+ var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
this.samples = new SampleFetchOptions();
}
return this.samples;
@@ -47,7 +47,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withSpace = function() {
if (this.space == null) {
- var SpaceFetchOptions = require("dto/space/fetchoptions/SpaceFetchOptions");
+ var SpaceFetchOptions = require("as/dto/space/fetchoptions/SpaceFetchOptions");
this.space = new SpaceFetchOptions();
}
return this.space;
@@ -60,7 +60,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -73,7 +73,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withModifier = function() {
if (this.modifier == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.modifier = new PersonFetchOptions();
}
return this.modifier;
@@ -86,7 +86,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withLeader = function() {
if (this.leader == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.leader = new PersonFetchOptions();
}
return this.leader;
@@ -99,7 +99,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withAttachments = function() {
if (this.attachments == null) {
- var AttachmentFetchOptions = require("dto/attachment/fetchoptions/AttachmentFetchOptions");
+ var AttachmentFetchOptions = require("as/dto/attachment/fetchoptions/AttachmentFetchOptions");
this.attachments = new AttachmentFetchOptions();
}
return this.attachments;
@@ -112,7 +112,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.withHistory = function() {
if (this.history == null) {
- var HistoryEntryFetchOptions = require("dto/history/fetchoptions/HistoryEntryFetchOptions");
+ var HistoryEntryFetchOptions = require("as/dto/history/fetchoptions/HistoryEntryFetchOptions");
this.history = new HistoryEntryFetchOptions();
}
return this.history;
@@ -125,7 +125,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var ProjectSortOptions = require("dto/project/fetchoptions/ProjectSortOptions");
+ var ProjectSortOptions = require("as/dto/project/fetchoptions/ProjectSortOptions");
this.sort = new ProjectSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectSortOptions.js
index b52d3fb9c62726e0e2ca3fa126811a1c8d352bc9..c9124cd3555b88d7cfb4fc47638f7c7e3f4e0377 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/fetchoptions/ProjectSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/fetchoptions/ProjectSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
var ProjectSortOptions = function() {
EntitySortOptions.call(this);
};
stjs.extend(ProjectSortOptions, EntitySortOptions, [ EntitySortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.fetchoptions.ProjectSortOptions';
+ prototype['@type'] = 'as.dto.project.fetchoptions.ProjectSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ProjectSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/history/ProjectRelationType.js
similarity index 79%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/history/ProjectRelationType.js
index d2983d130c748be533b43ae64de87e252b17955a..f6e6218ac365b97e3cb6fc2d88e8eb66027273e4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/history/ProjectRelationType.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var ProjectRelationType = function() {
Enum.call(this, [ "SPACE", "EXPERIMENT" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/IProjectId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/IProjectId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/IProjectId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/IProjectId.js
index e8ea14ccc3903d38d45a2657e789051097a75ed9..b04fda4b9f311cb3808f4093a9c7c0d4ceb40e56 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/IProjectId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/IProjectId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IProjectId = function() {
};
stjs.extend(IProjectId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectIdentifier.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectIdentifier.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectIdentifier.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectIdentifier.js
index 6c3f0088f9114116bb49c5c63f52f36bc627308b..6f1ce19f2afa900bd592b234931a519e59fa37dc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectIdentifier.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectIdentifier.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/project/id/IProjectId" ], function(stjs, ObjectIdentifier, IProjectId) {
+define([ "stjs", "as/dto/common/id/ObjectIdentifier", "as/dto/project/id/IProjectId" ], function(stjs, ObjectIdentifier, IProjectId) {
/**
* @param identifier
* Project identifier, e.g. "/MY_SPACE/MY_PROJECT".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/project/id/IProjectId" ]
ObjectIdentifier.call(this, identifier);
};
stjs.extend(ProjectIdentifier, ObjectIdentifier, [ ObjectIdentifier, IProjectId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.id.ProjectIdentifier';
+ prototype['@type'] = 'as.dto.project.id.ProjectIdentifier';
constructor.serialVersionUID = 1;
}, {});
return ProjectIdentifier;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectPermId.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectPermId.js
index 094ee1c5f798b84fbef8a6e3ee4a30027b49d19d..cc1425c0b9ec7fbfa0c5cf45b2f80cbca8973141 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/id/ProjectPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/id/ProjectPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/project/id/IProjectId" ], function(stjs, ObjectPermId, IProjectId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/project/id/IProjectId" ], function(stjs, ObjectPermId, IProjectId) {
/**
* @param permId
* Project perm id, e.g. "201108050937246-1031".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/project/id/IProjectId" ], fu
ObjectPermId.call(this, permId);
};
stjs.extend(ProjectPermId, ObjectPermId, [ ObjectPermId, IProjectId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.id.ProjectPermId';
+ prototype['@type'] = 'as.dto.project.id.ProjectPermId';
constructor.serialVersionUID = 1;
}, {});
return ProjectPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/NoProjectSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/NoProjectSearchCriteria.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/NoProjectSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/NoProjectSearchCriteria.js
index 6cc716cc0c69f2d70cbe08bf4ce6e31099d3fb97..51d8ff2ed6e11c7342fd5c4cbe9fcabc82f38823 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/NoProjectSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/NoProjectSearchCriteria.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
+define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
var NoProjectSearchCriteria = function() {
};
stjs.extend(NoProjectSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.search.NoProjectSearchCriteria';
+ prototype['@type'] = 'as.dto.project.search.NoProjectSearchCriteria';
constructor.serialVersionUID = 1;
}, {});
return NoProjectSearchCriteria;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/ProjectSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
similarity index 55%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/ProjectSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
index 5491d9d28dac22ac6ae73f2df88e958e855b45f4..0bbb3ce321571b877b70110eb45bc55ddf986b0e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/search/ProjectSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
@@ -1,28 +1,28 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/AbstractCompositeSearchCriteria", "dto/common/search/CodeSearchCriteria",
- "dto/common/search/PermIdSearchCriteria", "dto/space/search/SpaceSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/AbstractCompositeSearchCriteria", "as/dto/common/search/CodeSearchCriteria",
+ "as/dto/common/search/PermIdSearchCriteria", "as/dto/space/search/SpaceSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
var ProjectSearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(ProjectSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.search.ProjectSearchCriteria';
+ prototype['@type'] = 'as.dto.project.search.ProjectSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.withPermId = function() {
- var PermIdSearchCriteria = require("dto/common/search/PermIdSearchCriteria");
+ var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
prototype.withSpace = function() {
- var SpaceSearchCriteria = require("dto/space/search/SpaceSearchCriteria");
+ var SpaceSearchCriteria = require("as/dto/space/search/SpaceSearchCriteria");
return this.addCriteria(new SpaceSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setName("PROJECT");
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/update/ProjectUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/update/ProjectUpdate.js
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/update/ProjectUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/update/ProjectUpdate.js
index 39049d5fad73680dbede73a2f880659a92c61488..38897edc33a49735ca057608ef1f4b1bcabaf128 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/update/ProjectUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/update/ProjectUpdate.js
@@ -1,14 +1,14 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, AttachmentListUpdateValue) {
+define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, AttachmentListUpdateValue) {
var ProjectUpdate = function() {
this.spaceId = new FieldUpdateValue();
this.description = new FieldUpdateValue();
this.attachments = new AttachmentListUpdateValue();
};
stjs.extend(ProjectUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.project.update.ProjectUpdate';
+ prototype['@type'] = 'as.dto.project.update.ProjectUpdate';
constructor.serialVersionUID = 1;
prototype.projectId = null;
prototype.spaceId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/property/fetchoptions/PropertyFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/fetchoptions/PropertyFetchOptions.js
similarity index 59%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/property/fetchoptions/PropertyFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/fetchoptions/PropertyFetchOptions.js
index 1d6f6191ee86dade6348af4fe932b059bc6bda43..f20178722223ac1056bda28aae1ed8f05f52642f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/property/fetchoptions/PropertyFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/fetchoptions/PropertyFetchOptions.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/fetchoptions/EmptyFetchOptions" ], function(stjs, EmptyFetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/EmptyFetchOptions" ], function(stjs, EmptyFetchOptions) {
var PropertyFetchOptions = function() {
};
stjs.extend(PropertyFetchOptions, EmptyFetchOptions, [ EmptyFetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.property.fetchoptions.PropertyFetchOptions';
+ prototype['@type'] = 'as.dto.property.fetchoptions.PropertyFetchOptions';
constructor.serialVersionUID = 1;
}, {});
return PropertyFetchOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/Sample.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/Sample.js
similarity index 99%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/Sample.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/Sample.js
index b5b3b6890fd901119416dd435d6caac357b8382c..6b973fca43b42c052969c26264adba15a5fb9a1f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/Sample.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/Sample.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Sample = function() {
};
stjs.extend(Sample, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.Sample';
+ prototype['@type'] = 'as.dto.sample.Sample';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/SampleType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/SampleType.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/SampleType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/SampleType.js
index c75dc66af9885e01417c9e918d235fca70261009..41c09ddc2e51d8ef641315817c0a3e45f4b1fa6d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/SampleType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/SampleType.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
var SampleType = function() {
};
stjs.extend(SampleType, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.SampleType';
+ prototype['@type'] = 'as.dto.sample.SampleType';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesOperation.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesOperation.js
index 93411fc508583156b8097509444a4355fbea5a6f..d794823d92d7c0d86aa9e79915d3a0fba1bc927c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesOperation.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var CreateSamplesOperation = function(creations) {
this.creations = creations;
};
stjs.extend(CreateSamplesOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.create.CreateSamplesOperation';
+ prototype['@type'] = 'as.dto.sample.create.CreateSamplesOperation';
prototype.creations = null;
prototype.getCreations = function() {
return this.creations;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesResult.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesResult.js
index 98270a2d8ce503afe3c6c53b74af0c09c28d1ceb..4ff3ff425d6d0e1368519bdf8a7c0c0352e1f667 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/CreateSamplesResult.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "as/dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var CreateSamplesResult = function(permIds) {
this.permIds = permIds;
};
stjs.extend(CreateSamplesResult, null, [ IOperationResult ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.create.CreateSamplesResult';
+ prototype['@type'] = 'as.dto.sample.create.CreateSamplesResult';
prototype.permIds = null;
prototype.getPermIds = function() {
return this.permIds;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/SampleCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/SampleCreation.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/SampleCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/SampleCreation.js
index 63980e82e44088b6d1827b64941bc0531369a8a6..f7107c122304b73ccf7e627f60945acf122561b5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/SampleCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/create/SampleCreation.js
@@ -6,7 +6,7 @@ define([ "stjs" ], function(stjs) {
this.properties = {};
};
stjs.extend(SampleCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.create.SampleCreation';
+ prototype['@type'] = 'as.dto.sample.create.SampleCreation';
constructor.serialVersionUID = 1;
prototype.typeId = null;
prototype.experimentId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/delete/SampleDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/delete/SampleDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/delete/SampleDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/delete/SampleDeletionOptions.js
index 1f50085aa72d0818b7bce37bce6e04aa1325dfb3..a48354034766bdfeaee92303972b6379db3bb80e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/delete/SampleDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/delete/SampleDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var SampleDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(SampleDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.delete.SampleDeletionOptions';
+ prototype['@type'] = 'as.dto.sample.delete.SampleDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return SampleDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
index eadaf1edb54bda200beb94b1f37de67109ddf758..9fa3e331c5b7a93486895257b0f8368072fc2229 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
@@ -2,14 +2,14 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/fetchoptions/SampleTypeFetchOptions', 'dto/space/fetchoptions/SpaceFetchOptions',
- 'dto/project/fetchoptions/ProjectFetchOptions', 'dto/experiment/fetchoptions/ExperimentFetchOptions', 'dto/property/fetchoptions/PropertyFetchOptions', 'dto/tag/fetchoptions/TagFetchOptions',
- 'dto/person/fetchoptions/PersonFetchOptions', 'dto/attachment/fetchoptions/AttachmentFetchOptions', 'dto/material/fetchoptions/MaterialFetchOptions',
- 'dto/dataset/fetchoptions/DataSetFetchOptions', 'dto/history/fetchoptions/HistoryEntryFetchOptions', 'dto/sample/fetchoptions/SampleSortOptions' ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/sample/fetchoptions/SampleTypeFetchOptions', 'as/dto/space/fetchoptions/SpaceFetchOptions',
+ 'as/dto/project/fetchoptions/ProjectFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/property/fetchoptions/PropertyFetchOptions', 'as/dto/tag/fetchoptions/TagFetchOptions',
+ 'as/dto/person/fetchoptions/PersonFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions', 'as/dto/material/fetchoptions/MaterialFetchOptions',
+ 'as/dto/dataset/fetchoptions/DataSetFetchOptions', 'as/dto/history/fetchoptions/HistoryEntryFetchOptions', 'as/dto/sample/fetchoptions/SampleSortOptions' ], function(require, stjs, FetchOptions) {
var SampleFetchOptions = function() {
};
stjs.extend(SampleFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.fetchoptions.SampleFetchOptions';
+ prototype['@type'] = 'as.dto.sample.fetchoptions.SampleFetchOptions';
constructor.serialVersionUID = 1;
prototype.type = null;
prototype.project = null;
@@ -30,7 +30,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
prototype.sort = null;
prototype.withType = function() {
if (this.type == null) {
- var SampleTypeFetchOptions = require("dto/sample/fetchoptions/SampleTypeFetchOptions");
+ var SampleTypeFetchOptions = require("as/dto/sample/fetchoptions/SampleTypeFetchOptions");
this.type = new SampleTypeFetchOptions();
}
return this.type;
@@ -43,7 +43,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withProject = function() {
if (this.project == null) {
- var ProjectFetchOptions = require("dto/project/fetchoptions/ProjectFetchOptions");
+ var ProjectFetchOptions = require("as/dto/project/fetchoptions/ProjectFetchOptions");
this.project = new ProjectFetchOptions();
}
return this.project;
@@ -56,7 +56,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withSpace = function() {
if (this.space == null) {
- var SpaceFetchOptions = require("dto/space/fetchoptions/SpaceFetchOptions");
+ var SpaceFetchOptions = require("as/dto/space/fetchoptions/SpaceFetchOptions");
this.space = new SpaceFetchOptions();
}
return this.space;
@@ -69,7 +69,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withExperiment = function() {
if (this.experiment == null) {
- var ExperimentFetchOptions = require("dto/experiment/fetchoptions/ExperimentFetchOptions");
+ var ExperimentFetchOptions = require("as/dto/experiment/fetchoptions/ExperimentFetchOptions");
this.experiment = new ExperimentFetchOptions();
}
return this.experiment;
@@ -82,7 +82,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withProperties = function() {
if (this.properties == null) {
- var PropertyFetchOptions = require("dto/property/fetchoptions/PropertyFetchOptions");
+ var PropertyFetchOptions = require("as/dto/property/fetchoptions/PropertyFetchOptions");
this.properties = new PropertyFetchOptions();
}
return this.properties;
@@ -95,7 +95,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withMaterialProperties = function() {
if (this.materialProperties == null) {
- var MaterialFetchOptions = require("dto/material/fetchoptions/MaterialFetchOptions");
+ var MaterialFetchOptions = require("as/dto/material/fetchoptions/MaterialFetchOptions");
this.materialProperties = new MaterialFetchOptions();
}
return this.materialProperties;
@@ -156,7 +156,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withDataSets = function() {
if (this.dataSets == null) {
- var DataSetFetchOptions = require("dto/dataset/fetchoptions/DataSetFetchOptions");
+ var DataSetFetchOptions = require("as/dto/dataset/fetchoptions/DataSetFetchOptions");
this.dataSets = new DataSetFetchOptions();
}
return this.dataSets;
@@ -169,7 +169,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withHistory = function() {
if (this.history == null) {
- var HistoryEntryFetchOptions = require("dto/history/fetchoptions/HistoryEntryFetchOptions");
+ var HistoryEntryFetchOptions = require("as/dto/history/fetchoptions/HistoryEntryFetchOptions");
this.history = new HistoryEntryFetchOptions();
}
return this.history;
@@ -182,7 +182,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withTags = function() {
if (this.tags == null) {
- var TagFetchOptions = require("dto/tag/fetchoptions/TagFetchOptions");
+ var TagFetchOptions = require("as/dto/tag/fetchoptions/TagFetchOptions");
this.tags = new TagFetchOptions();
}
return this.tags;
@@ -195,7 +195,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -208,7 +208,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withModifier = function() {
if (this.modifier == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.modifier = new PersonFetchOptions();
}
return this.modifier;
@@ -221,7 +221,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.withAttachments = function() {
if (this.attachments == null) {
- var AttachmentFetchOptions = require("dto/attachment/fetchoptions/AttachmentFetchOptions");
+ var AttachmentFetchOptions = require("as/dto/attachment/fetchoptions/AttachmentFetchOptions");
this.attachments = new AttachmentFetchOptions();
}
return this.attachments;
@@ -234,7 +234,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", 'dto/sample/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var SampleSortOptions = require("dto/sample/fetchoptions/SampleSortOptions");
+ var SampleSortOptions = require("as/dto/sample/fetchoptions/SampleSortOptions");
this.sort = new SampleSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleSortOptions.js
index d10ba524212f67b4b977b2e1b9bb48af7d9cd4f6..9a219aa781cba931d935bc8b3d8078fa692da039 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntityWithPropertiesSortOptions" ], function(require, stjs, EntityWithPropertiesSortOptions) {
var SampleSortOptions = function() {
EntityWithPropertiesSortOptions.call(this);
};
stjs.extend(SampleSortOptions, EntityWithPropertiesSortOptions, [ EntityWithPropertiesSortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.fetchoptions.SampleSortOptions';
+ prototype['@type'] = 'as.dto.sample.fetchoptions.SampleSortOptions';
constructor.serialVersionUID = 1;
}, {});
return SampleSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeFetchOptions.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeFetchOptions.js
index dbc9c8dec99fe7d85473454006512ca6c54dfaf9..d0a5e52864ad41a6fbcc8d0245b08f0e33075ec7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeFetchOptions.js
@@ -2,16 +2,16 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "stjs", "dto/common/fetchoptions/FetchOptions", "dto/sample/fetchoptions/SampleTypeSortOptions" ], function(stjs, FetchOptions) {
+define([ "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/sample/fetchoptions/SampleTypeSortOptions" ], function(stjs, FetchOptions) {
var SampleTypeFetchOptions = function() {
};
stjs.extend(SampleTypeFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.fetchoptions.SampleTypeFetchOptions';
+ prototype['@type'] = 'as.dto.sample.fetchoptions.SampleTypeFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var SampleTypeSortOptions = require("dto/sample/fetchoptions/SampleTypeSortOptions");
+ var SampleTypeSortOptions = require("as/dto/sample/fetchoptions/SampleTypeSortOptions");
this.sort = new SampleTypeSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeSortOptions.js
index 78bc6600e8932fb72e672c211d668e9f6d04363a..23018494199f6aefd8d14b3b69ced20e72c3a9fb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/fetchoptions/SampleTypeSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/fetchoptions/SampleTypeSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var SampleTypeSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(SampleTypeSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.fetchoptions.SampleTypeSortOptions';
+ prototype['@type'] = 'as.dto.sample.fetchoptions.SampleTypeSortOptions';
constructor.serialVersionUID = 1;
}, {});
return SampleTypeSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/history/SampleRelationType.js
similarity index 82%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/history/SampleRelationType.js
index 1ca5bf0f02447366ef20e515520a39624953bc87..056e5c3d3c1a8d15db6ff924a9efb8656bf93d25 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/history/SampleRelationType.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var SampleRelationType = function() {
Enum.call(this, [ "SPACE", "EXPERIMENT", "PARENT", "CHILD", "CONTAINER", "COMPONENT", "DATA_SET" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/ISampleId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/ISampleId.js
similarity index 73%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/ISampleId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/ISampleId.js
index fecd90259f8d35f7f4154e864cc3f181fad42522..90ae821e4e0485fdf79c2c7cf3a3087f0f1161bb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/ISampleId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/ISampleId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var ISampleId = function() {
};
stjs.extend(ISampleId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SampleIdentifier.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SampleIdentifier.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SampleIdentifier.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SampleIdentifier.js
index b0dbbcc5b331766bd08d6afaa3d96a16bd011157..d4773c141c368979917f13ea3130a49f4186db1d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SampleIdentifier.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SampleIdentifier.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/sample/id/ISampleId" ], function(stjs, ObjectIdentifier, ISampleId) {
+define([ "stjs", "as/dto/common/id/ObjectIdentifier", "as/dto/sample/id/ISampleId" ], function(stjs, ObjectIdentifier, ISampleId) {
/**
* @param identifier
* Sample identifier, e.g. "/MY_SPACE/MY_SAMPLE" (space sample)
@@ -13,7 +13,7 @@ define([ "stjs", "dto/common/id/ObjectIdentifier", "dto/sample/id/ISampleId" ],
ObjectIdentifier.call(this, identifier);
};
stjs.extend(SampleIdentifier, ObjectIdentifier, [ ObjectIdentifier, ISampleId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.id.SampleIdentifier';
+ prototype['@type'] = 'as.dto.sample.id.SampleIdentifier';
constructor.serialVersionUID = 1;
}, {});
return SampleIdentifier;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SamplePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SamplePermId.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SamplePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SamplePermId.js
index 6bb32b1cdd5364cdd39f84e25847f251e93e9256..bb2de064a36813b34bf6dd6bc0252aa84f842f1e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/id/SamplePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/id/SamplePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/sample/id/ISampleId" ], function(stjs, ObjectPermId, ISampleId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/sample/id/ISampleId" ], function(stjs, ObjectPermId, ISampleId) {
/**
* @param permId
* Sample perm id, e.g. "201108050937246-1031".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/sample/id/ISampleId" ], func
ObjectPermId.call(this, permId);
};
stjs.extend(SamplePermId, ObjectPermId, [ ObjectPermId, ISampleId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.id.SamplePermId';
+ prototype['@type'] = 'as.dto.sample.id.SamplePermId';
constructor.serialVersionUID = 1;
}, {});
return SamplePermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleContainerSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleContainerSearchCriteria.js
similarity index 62%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleContainerSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleContainerSearchCriteria.js
index b005ec75eb979ba86402d6383a359ec2e2862c37..ea065dcbf543c23a6d764adfdc19ca928b600ec3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleContainerSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleContainerSearchCriteria.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/sample/search/NoSampleSearchCriteria" ], function(stjs, NoSampleSearchCriteria) {
+define([ "stjs", "as/dto/sample/search/NoSampleSearchCriteria" ], function(stjs, NoSampleSearchCriteria) {
var NoSampleContainerSearchCriteria = function() {
};
stjs.extend(NoSampleContainerSearchCriteria, NoSampleSearchCriteria, [ NoSampleSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.NoSampleContainerSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.NoSampleContainerSearchCriteria';
constructor.serialVersionUID = 1;
}, {});
return NoSampleContainerSearchCriteria;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleSearchCriteria.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleSearchCriteria.js
index 73270bfb05eb8b0755181abd7337d911bc9cac03..f0b7cb48a7118b6bf92f4bdcfc6d0e546db6e24b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/NoSampleSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/NoSampleSearchCriteria.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
+define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
var NoSampleSearchCriteria = function() {
};
stjs.extend(NoSampleSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.NoSampleSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.NoSampleSearchCriteria';
constructor.serialVersionUID = 1;
}, {});
return NoSampleSearchCriteria;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
index 566f4f20fead580a8ff63db0d450a2ff5bb9bed3..ecc76b75108847baab0bfbf5dbee6cd3a5c3b182 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
@@ -1,36 +1,36 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "dto/common/search/SearchOperator", "dto/sample/search/SampleSearchRelation", "dto/space/search/SpaceSearchCriteria",
- "dto/project/search/ProjectSearchCriteria", "dto/project/search/NoProjectSearchCriteria", "dto/experiment/search/ExperimentSearchCriteria", "dto/experiment/search/NoExperimentSearchCriteria",
- "dto/sample/search/NoSampleContainerSearchCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) {
+define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/sample/search/SampleSearchRelation", "as/dto/space/search/SpaceSearchCriteria",
+ "as/dto/project/search/ProjectSearchCriteria", "as/dto/project/search/NoProjectSearchCriteria", "as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria",
+ "as/dto/sample/search/NoSampleContainerSearchCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) {
var SampleSearchCriteria = function(relation) {
AbstractEntitySearchCriteria.call(this);
this.relation = relation ? relation : SampleSearchRelation.SAMPLE;
};
stjs.extend(SampleSearchCriteria, AbstractEntitySearchCriteria, [ AbstractEntitySearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.SampleSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.SampleSearchCriteria';
constructor.serialVersionUID = 1;
prototype.relation = null;
prototype.withSpace = function() {
- var SpaceSearchCriteria = require("dto/space/search/SpaceSearchCriteria");
+ var SpaceSearchCriteria = require("as/dto/space/search/SpaceSearchCriteria");
return this.addCriteria(new SpaceSearchCriteria());
};
prototype.withProject = function() {
- var ProjectSearchCriteria = require("dto/project/search/ProjectSearchCriteria");
+ var ProjectSearchCriteria = require("as/dto/project/search/ProjectSearchCriteria");
return this.addCriteria(new ProjectSearchCriteria());
};
prototype.withoutProject = function() {
- var NoProjectSearchCriteria = require("dto/project/search/NoProjectSearchCriteria");
+ var NoProjectSearchCriteria = require("as/dto/project/search/NoProjectSearchCriteria");
return this.addCriteria(new NoProjectSearchCriteria());
};
prototype.withExperiment = function() {
- var ExperimentSearchCriteria = require("dto/experiment/search/ExperimentSearchCriteria");
+ var ExperimentSearchCriteria = require("as/dto/experiment/search/ExperimentSearchCriteria");
return this.addCriteria(new ExperimentSearchCriteria());
};
prototype.withoutExperiment = function() {
- var NoExperimentSearchCriteria = require("dto/experiment/search/NoExperimentSearchCriteria");
+ var NoExperimentSearchCriteria = require("as/dto/experiment/search/NoExperimentSearchCriteria");
return this.addCriteria(new NoExperimentSearchCriteria());
};
prototype.withParents = function() {
@@ -43,7 +43,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
return this.addCriteria(new SampleContainerSearchCriteria());
};
prototype.withoutContainer = function() {
- var NoSampleContainerSearchCriteria = require("dto/sample/search/NoSampleContainerSearchCriteria");
+ var NoSampleContainerSearchCriteria = require("as/dto/sample/search/NoSampleContainerSearchCriteria");
return this.addCriteria(new NoSampleContainerSearchCriteria());
};
prototype.withOrOperator = function() {
@@ -79,7 +79,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
SampleSearchCriteria.call(this, SampleSearchRelation.PARENTS);
};
stjs.extend(SampleParentsSearchCriteria, SampleSearchCriteria, [ SampleSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.SampleParentsSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.SampleParentsSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
@@ -100,7 +100,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
SampleSearchCriteria.call(this, SampleSearchRelation.CHILDREN);
};
stjs.extend(SampleChildrenSearchCriteria, SampleSearchCriteria, [ SampleSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.SampleChildrenSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.SampleChildrenSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
@@ -121,7 +121,7 @@ define([ "require", "stjs", "dto/common/search/AbstractEntitySearchCriteria", "d
SampleSearchCriteria.call(this, SampleSearchRelation.CONTAINER);
};
stjs.extend(SampleContainerSearchCriteria, SampleSearchCriteria, [ SampleSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.search.SampleContainerSearchCriteria';
+ prototype['@type'] = 'as.dto.sample.search.SampleContainerSearchCriteria';
constructor.serialVersionUID = 1;
}, {
relation : {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchRelation.js
similarity index 81%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchRelation.js
index fc131e58665a7b4e86e6af7cdd37441dfa13c54c..3af3467437cf91bae525c38613ab9b16b5b03daf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchRelation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
var SampleSearchRelation = function() {
Enum.call(this, [ "SAMPLE", "PARENTS", "CHILDREN", "CONTAINER" ]);
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/SampleUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/SampleUpdate.js
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/SampleUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/SampleUpdate.js
index 73964a82edaae35c13bb1e44efa22088076b3993..22667c53c3d1f9a02518ab11301a0479ed1a568d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/SampleUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/SampleUpdate.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdListUpdateValue", "dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue,
+define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/IdListUpdateValue", "as/dto/attachment/update/AttachmentListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue,
AttachmentListUpdateValue) {
var SampleUpdate = function() {
this.properties = {};
@@ -16,7 +16,7 @@ define([ "stjs", "dto/common/update/FieldUpdateValue", "dto/common/update/IdList
this.attachments = new AttachmentListUpdateValue();
};
stjs.extend(SampleUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.update.SampleUpdate';
+ prototype['@type'] = 'as.dto.sample.update.SampleUpdate';
constructor.serialVersionUID = 1;
prototype.sampleId = null;
prototype.properties = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/UpdateSamplesOperation.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/UpdateSamplesOperation.js
index 8fbbaf6df0b19339e9ec7edb63886b55c1844e4b..2aa34d7fe1954830ad14a70e55455e0b046deee6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/update/UpdateSamplesOperation.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "as/dto/common/operations/IOperation" ], function(stjs, IOperation) {
var UpdateSamplesOperation = function(updates) {
this.updates = updates;
};
stjs.extend(UpdateSamplesOperation, null, [ IOperation ], function(constructor, prototype) {
- prototype['@type'] = 'dto.sample.update.UpdateSamplesOperation';
+ prototype['@type'] = 'as.dto.sample.update.UpdateSamplesOperation';
prototype.updates = null;
prototype.getUpdates = function() {
return this.updates;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/ExecutionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/ExecutionOptions.js
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/ExecutionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/ExecutionOptions.js
index 7b97bafd871fa466a228c3c911fabdb8031ee7c0..1dac056a9811f02ad0ab96467e9ebbc6477315ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/ExecutionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/ExecutionOptions.js
@@ -3,7 +3,7 @@ define([ "stjs"], function(stjs) {
this.parameters = {};
};
stjs.extend(ExecutionOptions, null, [ ], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.ExecutionOptions';
+ prototype['@type'] = 'as.dto.service.ExecutionOptions';
constructor.serialVersionUID = 1;
prototype.parameters = null;
prototype.withParameter = function(parameterName, value) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/Service.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/Service.js
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/Service.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/Service.js
index da6e3366e41c85cea48ec2e7a09338a2ee7a772f..1b7cca89d61db0cf3039854f46166ebad9fd276a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/Service.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/Service.js
@@ -2,7 +2,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Service = function() {
};
stjs.extend(Service, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.Service';
+ prototype['@type'] = 'as.dto.service.Service';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceFetchOptions.js
similarity index 60%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceFetchOptions.js
index 820ab4a2b1570bcca93ab4df981e67521164c540..908b32a9a1c540241f7fcfddd23cf5f05080bad4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceFetchOptions.js
@@ -1,13 +1,13 @@
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/service/fetchoptions/ServiceSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/service/fetchoptions/ServiceSortOptions" ], function(require, stjs, FetchOptions) {
var ServiceFetchOptions = function() {
};
stjs.extend(ServiceFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.fetchoptions.ServiceFetchOptions';
+ prototype['@type'] = 'as.dto.service.fetchoptions.ServiceFetchOptions';
constructor.serialVersionUID = 1;
prototype.sort = null;
prototype.sortBy = function() {
if (this.sort == null) {
- var ServiceSortOptions = require("dto/service/fetchoptions/ServiceSortOptions");
+ var ServiceSortOptions = require("as/dto/service/fetchoptions/ServiceSortOptions");
this.sort = new ServiceSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceSortOptions.js
index bd8bbcd2a51b750bd208a28a216911ab7342c415..564d373d3241d941e4c5680ebb36f17f51c2dc1b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/fetchoptions/ServiceSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/fetchoptions/ServiceSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var ServiceSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(ServiceSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.fetchoptions.ServiceSortOptions';
+ prototype['@type'] = 'as.dto.service.fetchoptions.ServiceSortOptions';
constructor.serialVersionUID = 1;
}, {});
return ServiceSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/IServiceId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/IServiceId.js
similarity index 75%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/IServiceId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/IServiceId.js
index 26154d8c528336816d84849a3ea1a094626101c9..eaf16998634c779d9e67a53fc2e49dd14a7d9f25 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/IServiceId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/IServiceId.js
@@ -3,7 +3,7 @@
*
* @author Franz-Josef Elmer
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IServiceId = function() {
};
stjs.extend(IServiceId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/ServiceCode.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/ServiceCode.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/ServiceCode.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/ServiceCode.js
index 05de3e75c3e06526915433b19d135a4b76a137a9..24e0c2d90bed5bc3e728701296482506457ea78a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/id/ServiceCode.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/id/ServiceCode.js
@@ -3,12 +3,12 @@
*
* @author Franz-Josef Elmer
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/service/id/IServiceId" ], function(stjs, ObjectPermId, IServiceId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/service/id/IServiceId" ], function(stjs, ObjectPermId, IServiceId) {
var ServiceCode = function(code) {
ObjectPermId.call(this, code);
};
stjs.extend(ServiceCode, ObjectPermId, [ ObjectPermId, IServiceId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.id.ServiceCode';
+ prototype['@type'] = 'as.dto.service.id.ServiceCode';
constructor.serialVersionUID = 1;
}, {});
return ServiceCode;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/search/ServiceSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/ServiceSearchCriteria.js
similarity index 65%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/search/ServiceSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/ServiceSearchCriteria.js
index cf0f76c864411c248d0296fda8ed0006f0fa5de4..aa9c7aebb8e7560831d72050de13bf3f390e073c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/service/search/ServiceSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/ServiceSearchCriteria.js
@@ -1,17 +1,17 @@
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/CodeSearchCriteria"],
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/CodeSearchCriteria"],
function(require, stjs, AbstractObjectSearchCriteria) {
var ServiceSearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(ServiceSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.service.search.ServiceSearchCriteria';
+ prototype['@type'] = 'as.dto.service.search.ServiceSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setName("SERVICE");
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/Space.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/Space.js
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/Space.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/Space.js
index 56c46ff5e871bd80a2e21f989dae271e8e6d2dc6..9062fe6cac395911cb990aac39c20c7adefd51a2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/Space.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/Space.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Space = function() {
};
stjs.extend(Space, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.Space';
+ prototype['@type'] = 'as.dto.space.Space';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/create/SpaceCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/create/SpaceCreation.js
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/create/SpaceCreation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/create/SpaceCreation.js
index 3a0e13b4d5fa1d3e1ee3c10d8acc597edc36e0be..b694e68fca34f5056dbb270207e6eff0f697810f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/create/SpaceCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/create/SpaceCreation.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
var SpaceCreation = function() {
};
stjs.extend(SpaceCreation, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.create.SpaceCreation';
+ prototype['@type'] = 'as.dto.space.create.SpaceCreation';
constructor.serialVersionUID = 1;
prototype.code = null;
prototype.description = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/delete/SpaceDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/delete/SpaceDeletionOptions.js
similarity index 64%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/delete/SpaceDeletionOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/delete/SpaceDeletionOptions.js
index 939da75fd9ddd7b3397630eb079490d0768fb51d..dd8043e2f08722b5c18101f74de68cad4daea911 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/delete/SpaceDeletionOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/delete/SpaceDeletionOptions.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
var SpaceDeletionOptions = function() {
AbstractObjectDeletionOptions.call(this);
};
stjs.extend(SpaceDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.delete.SpaceDeletionOptions';
+ prototype['@type'] = 'as.dto.space.delete.SpaceDeletionOptions';
constructor.serialVersionUID = 1;
}, {});
return SpaceDeletionOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceFetchOptions.js
similarity index 71%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceFetchOptions.js
index 8d873c186eb8b229361849a948a38d21d4e2873c..93af4d40b8e5e022897951ae51829f1aa0ea2900 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceFetchOptions.js
@@ -2,12 +2,12 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/fetchoptions/PersonFetchOptions", "dto/sample/fetchoptions/SampleFetchOptions",
- "dto/project/fetchoptions/ProjectFetchOptions", "dto/space/fetchoptions/SpaceSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/sample/fetchoptions/SampleFetchOptions",
+ "as/dto/project/fetchoptions/ProjectFetchOptions", "as/dto/space/fetchoptions/SpaceSortOptions" ], function(require, stjs, FetchOptions) {
var SpaceFetchOptions = function() {
};
stjs.extend(SpaceFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.fetchoptions.SpaceFetchOptions';
+ prototype['@type'] = 'as.dto.space.fetchoptions.SpaceFetchOptions';
constructor.serialVersionUID = 1;
prototype.registrator = null;
prototype.samples = null;
@@ -15,7 +15,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
prototype.sort = null;
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -28,7 +28,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.withSamples = function() {
if (this.samples == null) {
- var SampleFetchOptions = require("dto/sample/fetchoptions/SampleFetchOptions");
+ var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
this.samples = new SampleFetchOptions();
}
return this.samples;
@@ -41,7 +41,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.withProjects = function() {
if (this.projects == null) {
- var ProjectFetchOptions = require("dto/project/fetchoptions/ProjectFetchOptions");
+ var ProjectFetchOptions = require("as/dto/project/fetchoptions/ProjectFetchOptions");
this.projects = new ProjectFetchOptions();
}
return this.projects;
@@ -54,7 +54,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var SpaceSortOptions = require("dto/space/fetchoptions/SpaceSortOptions");
+ var SpaceSortOptions = require("as/dto/space/fetchoptions/SpaceSortOptions");
this.sort = new SpaceSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceSortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceSortOptions.js
index e01900238a5f9103fc3736095177153a93385d05..f9f98f50075f99cb2ccca2b31bd8276953fa7d10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/fetchoptions/SpaceSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/fetchoptions/SpaceSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/EntitySortOptions" ], function(require, stjs, EntitySortOptions) {
var SpaceSortOptions = function() {
EntitySortOptions.call(this);
};
stjs.extend(SpaceSortOptions, EntitySortOptions, [ EntitySortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.fetchoptions.SpaceSortOptions';
+ prototype['@type'] = 'as.dto.space.fetchoptions.SpaceSortOptions';
constructor.serialVersionUID = 1;
}, {});
return SpaceSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/ISpaceId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/ISpaceId.js
similarity index 72%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/ISpaceId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/ISpaceId.js
index 22e2feafc81f5d3675fa43e19d2947f9fed5d6ba..da7e5a8d03ec4c4eb810efe4875500942847dc8d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/ISpaceId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/ISpaceId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var ISpaceId = function() {
};
stjs.extend(ISpaceId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/SpacePermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/SpacePermId.js
similarity index 77%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/SpacePermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/SpacePermId.js
index ae3d5f6de925d623c26f3547b2ae20e49e36dc4d..5ca23607cb87b97f45d0bb9dbedab888327bc730 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/id/SpacePermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/id/SpacePermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/space/id/ISpaceId" ], function(stjs, ObjectPermId, ISpaceId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/space/id/ISpaceId" ], function(stjs, ObjectPermId, ISpaceId) {
/**
* @param permId
* Space perm id, e.g. "/MY_SPACE" or "MY_SPACE".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/space/id/ISpaceId" ], functi
ObjectPermId.call(this, permId);
};
stjs.extend(SpacePermId, ObjectPermId, [ ObjectPermId, ISpaceId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.id.SpacePermId';
+ prototype['@type'] = 'as.dto.space.id.SpacePermId';
constructor.serialVersionUID = 1;
prototype.getPermId = function() {
var permId = ObjectPermId.prototype.getPermId.call(this);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/search/SpaceSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
similarity index 55%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/search/SpaceSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
index fe01d11d3be1811cbac7e8b9c527dc91336d9cf3..04ceb951c99878a85fd49a18a60207be82715a5a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/search/SpaceSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
@@ -1,24 +1,24 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/CodeSearchCriteria", "dto/common/search/PermIdSearchCriteria",
- "dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/CodeSearchCriteria", "as/dto/common/search/PermIdSearchCriteria",
+ "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
var SpaceSearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(SpaceSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.search.SpaceSearchCriteria';
+ prototype['@type'] = 'as.dto.space.search.SpaceSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.withPermId = function() {
- var PermIdSearchCriteria = require("dto/common/search/PermIdSearchCriteria");
+ var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setName("SPACE");
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/update/SpaceUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/update/SpaceUpdate.js
similarity index 81%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/update/SpaceUpdate.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/update/SpaceUpdate.js
index 210b7167093ae019df24ccf46b462606a07d1ca7..38d275540abf02f3338c8c890c7375ec5037fc5b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/space/update/SpaceUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/update/SpaceUpdate.js
@@ -1,12 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
+define([ "stjs", "as/dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
var SpaceUpdate = function() {
this.description = new FieldUpdateValue();
};
stjs.extend(SpaceUpdate, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.space.update.SpaceUpdate';
+ prototype['@type'] = 'as.dto.space.update.SpaceUpdate';
constructor.serialVersionUID = 1;
prototype.spaceId = null;
prototype.description = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/Tag.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/Tag.js
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/Tag.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/Tag.js
index 467658c1150bc5c8b3f42ae260023df5912c6c7c..0dfc48068cbf6c292209172bd85735ee77f619ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/Tag.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/Tag.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Tag = function() {
};
stjs.extend(Tag, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.Tag';
+ prototype['@type'] = 'as.dto.tag.Tag';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.permId = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagFetchOptions.js
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagFetchOptions.js
index 5c638260e7af86e4c5b8d35bca883e639d127881..67f2755ac72809efcc8101f7c12bc8fe60a6f09a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagFetchOptions.js
@@ -2,17 +2,17 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/fetchoptions/PersonFetchOptions", "dto/tag/fetchoptions/TagSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/tag/fetchoptions/TagSortOptions" ], function(require, stjs, FetchOptions) {
var TagFetchOptions = function() {
};
stjs.extend(TagFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.fetchoptions.TagFetchOptions';
+ prototype['@type'] = 'as.dto.tag.fetchoptions.TagFetchOptions';
constructor.serialVersionUID = 1;
prototype.owner = null;
prototype.sort = null;
prototype.withOwner = function() {
if (this.owner == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.owner = new PersonFetchOptions();
}
return this.owner;
@@ -25,7 +25,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var TagSortOptions = require("dto/tag/fetchoptions/TagSortOptions");
+ var TagSortOptions = require("as/dto/tag/fetchoptions/TagSortOptions");
this.sort = new TagSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagSortOptions.js
similarity index 79%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagSortOptions.js
index 635de2d044be403700c3d7594ec815d1517e66fb..30831d89cb35510ec19625852d70b7f2927f05c0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/fetchoptions/TagSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/fetchoptions/TagSortOptions.js
@@ -1,4 +1,4 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var TagSortOptions = function() {
SortOptions.call(this);
};
@@ -9,7 +9,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(re
};
stjs.extend(TagSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.fetchoptions.TagSortOptions';
+ prototype['@type'] = 'as.dto.tag.fetchoptions.TagSortOptions';
constructor.serialVersionUID = 1;
prototype.code = function() {
return this.getOrCreateSorting(fields.CODE);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/ITagId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/ITagId.js
similarity index 62%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/ITagId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/ITagId.js
index 0e329cad625966206362d6d7cf8cf553018c8133..9e4a40d6f2baa048c4faa59ef03eac7ee74a9050 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/ITagId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/ITagId.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var ITagId = function() {
};
stjs.extend(ITagId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagCode.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagCode.js
similarity index 88%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagCode.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagCode.js
index 64e38227bd1f2117c00f7dac4f68b46c1d79fd9b..86b9eee5e0c2af0df1b7d30336381a06ea974242 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagCode.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagCode.js
@@ -4,7 +4,7 @@
* @author Franz-Josef Elmer
* @author Jakub Straszewski
*/
-define([ "stjs", "util/Exceptions", "dto/tag/id/ITagId" ], function(stjs, exceptions, ITagId) {
+define([ "stjs", "util/Exceptions", "as/dto/tag/id/ITagId" ], function(stjs, exceptions, ITagId) {
/**
* @param code
* Tag code, e.g. "MY_TAG".
@@ -13,7 +13,7 @@ define([ "stjs", "util/Exceptions", "dto/tag/id/ITagId" ], function(stjs, except
this.setCode(code);
};
stjs.extend(TagCode, null, [ ITagId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.id.TagCode';
+ prototype['@type'] = 'as.dto.tag.id.TagCode';
constructor.serialVersionUID = 1;
prototype.code = null;
prototype.getCode = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagPermId.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagPermId.js
index e0baaab45134c76ae85b9f39bba52b55022afa76..857bf8410d21c207ac71abfe33c019f26a504e52 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/id/TagPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/id/TagPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/tag/id/ITagId" ], function(stjs, ObjectPermId, ITagId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/tag/id/ITagId" ], function(stjs, ObjectPermId, ITagId) {
/**
* @param permId
* Tag perm id, e.g. "/MY_USER/MY_TAG".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/tag/id/ITagId" ], function(s
ObjectPermId.call(this, permId);
};
stjs.extend(TagPermId, ObjectPermId, [ ObjectPermId, ITagId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.id.TagPermId';
+ prototype['@type'] = 'as.dto.tag.id.TagPermId';
constructor.serialVersionUID = 1;
}, {});
return TagPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/search/TagSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
similarity index 55%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/search/TagSearchCriteria.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
index 4af846dc4b7d2fe6703e080294f3a8839244b655..4aa7f9032ce2e54110bfda65e3d40c302a9e9796 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/tag/search/TagSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
@@ -1,24 +1,24 @@
/**
* @author pkupczyk
*/
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria", "dto/common/search/CodeSearchCriteria", "dto/common/search/PermIdSearchCriteria",
- "dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
+define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria", "as/dto/common/search/CodeSearchCriteria", "as/dto/common/search/PermIdSearchCriteria",
+ "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(require, stjs, AbstractObjectSearchCriteria) {
var TagSearchCriteria = function() {
AbstractObjectSearchCriteria.call(this);
};
stjs.extend(TagSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.tag.search.TagSearchCriteria';
+ prototype['@type'] = 'as.dto.tag.search.TagSearchCriteria';
constructor.serialVersionUID = 1;
prototype.withCode = function() {
- var CodeSearchCriteria = require("dto/common/search/CodeSearchCriteria");
+ var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
prototype.withPermId = function() {
- var PermIdSearchCriteria = require("dto/common/search/PermIdSearchCriteria");
+ var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
+ var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
builder.setName("TAG");
return builder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/Vocabulary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/Vocabulary.js
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/Vocabulary.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/Vocabulary.js
index f6c556dc8a64ba0e61ee342dac3c010fccd5dadf..7f12bc0190ea2c93fe2fa6d6301855265a3f1258 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/Vocabulary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/Vocabulary.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var Vocabulary = function() {
};
stjs.extend(Vocabulary, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.Vocabulary';
+ prototype['@type'] = 'as.dto.vocabulary.Vocabulary';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/VocabularyTerm.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/VocabularyTerm.js
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/VocabularyTerm.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/VocabularyTerm.js
index 35a1d9475d864606c0b611b867df91e0a1566234..27e4dc762d817bacdc7d17ff488584a0ae6f2c5d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/VocabularyTerm.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/VocabularyTerm.js
@@ -6,7 +6,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var VocabularyTerm = function() {
};
stjs.extend(VocabularyTerm, null, [], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.VocabularyTerm';
+ prototype['@type'] = 'as.dto.vocabulary.VocabularyTerm';
constructor.serialVersionUID = 1;
prototype.fetchOptions = null;
prototype.code = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js
index dfaeaffdb8137b53fafca9b7ea1c1fa8a45523af..fc720a4b74e417b6d830b54048ef1c45fcfd36b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyFetchOptions.js
@@ -2,18 +2,18 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/fetchoptions/PersonFetchOptions", "dto/vocabulary/fetchoptions/VocabularySortOptions" ], function(require, stjs,
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions", "as/dto/vocabulary/fetchoptions/VocabularySortOptions" ], function(require, stjs,
FetchOptions) {
var VocabularyFetchOptions = function() {
};
stjs.extend(VocabularyFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.fetchoptions.VocabularyFetchOptions';
+ prototype['@type'] = 'as.dto.vocabulary.fetchoptions.VocabularyFetchOptions';
constructor.serialVersionUID = 1;
prototype.registrator = null;
prototype.sort = null;
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -26,7 +26,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/person/
};
prototype.sortBy = function() {
if (this.sort == null) {
- var VocabularySortOptions = require("dto/vocabulary/fetchoptions/VocabularySortOptions");
+ var VocabularySortOptions = require("as/dto/vocabulary/fetchoptions/VocabularySortOptions");
this.sort = new VocabularySortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularySortOptions.js
similarity index 56%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularySortOptions.js
index a70033caedfdd8e7ea9fa9908dd28c99bfc54b21..21f00d638cbb36e3eac49f71f68f43587b5283eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularySortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var VocabularySortOptions = function() {
SortOptions.call(this);
};
stjs.extend(VocabularySortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.fetchoptions.VocabularySortOptions';
+ prototype['@type'] = 'as.dto.vocabulary.fetchoptions.VocabularySortOptions';
constructor.serialVersionUID = 1;
}, {});
return VocabularySortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js
similarity index 69%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js
index cc22507334cc500c16e8812df999cb67de3b9230..67d44753dfb69db41df18162f67bc2377a91a96d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.js
@@ -2,19 +2,19 @@
* Class automatically generated with
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
-define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/vocabulary/fetchoptions/VocabularyFetchOptions", "dto/person/fetchoptions/PersonFetchOptions",
- "dto/vocabulary/fetchoptions/VocabularyTermSortOptions" ], function(require, stjs, FetchOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/vocabulary/fetchoptions/VocabularyFetchOptions", "as/dto/person/fetchoptions/PersonFetchOptions",
+ "as/dto/vocabulary/fetchoptions/VocabularyTermSortOptions" ], function(require, stjs, FetchOptions) {
var VocabularyTermFetchOptions = function() {
};
stjs.extend(VocabularyTermFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.fetchoptions.VocabularyTermFetchOptions';
+ prototype['@type'] = 'as.dto.vocabulary.fetchoptions.VocabularyTermFetchOptions';
constructor.serialVersionUID = 1;
prototype.vocabulary = null;
prototype.registrator = null;
prototype.sort = null;
prototype.withVocabulary = function() {
if (this.vocabulary == null) {
- var VocabularyFetchOptions = require("dto/vocabulary/fetchoptions/VocabularyFetchOptions");
+ var VocabularyFetchOptions = require("as/dto/vocabulary/fetchoptions/VocabularyFetchOptions");
this.vocabulary = new VocabularyFetchOptions();
}
return this.vocabulary;
@@ -27,7 +27,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/vocabul
};
prototype.withRegistrator = function() {
if (this.registrator == null) {
- var PersonFetchOptions = require("dto/person/fetchoptions/PersonFetchOptions");
+ var PersonFetchOptions = require("as/dto/person/fetchoptions/PersonFetchOptions");
this.registrator = new PersonFetchOptions();
}
return this.registrator;
@@ -40,7 +40,7 @@ define([ "require", "stjs", "dto/common/fetchoptions/FetchOptions", "dto/vocabul
};
prototype.sortBy = function() {
if (this.sort == null) {
- var VocabularyTermSortOptions = require("dto/vocabulary/fetchoptions/VocabularyTermSortOptions");
+ var VocabularyTermSortOptions = require("as/dto/vocabulary/fetchoptions/VocabularyTermSortOptions");
this.sort = new VocabularyTermSortOptions();
}
return this.sort;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js
index 1e308de506dc7f993371a8a5cae24a05f2151082..49fe6b5559c9dbf686c40a9127a4e3c7c8ffdab1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.js
@@ -1,9 +1,9 @@
-define([ "require", "stjs", "dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
var VocabularyTermSortOptions = function() {
SortOptions.call(this);
};
stjs.extend(VocabularyTermSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.fetchoptions.VocabularyTermSortOptions';
+ prototype['@type'] = 'as.dto.vocabulary.fetchoptions.VocabularyTermSortOptions';
constructor.serialVersionUID = 1;
}, {});
return VocabularyTermSortOptions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyId.js
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyId.js
index 6f19069dc3df9564effdcbdfe8cee5365d6ce082..9ca912acd468201a27105a3f1b112e862ef4ad29 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyId.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IVocabularyId = function() {
};
stjs.extend(IVocabularyId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyTermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyTermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyTermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyTermId.js
index cf20c0356c4221fcb662c98451da1498c2984f97..e15625222b1f1c477d853a54743339f884a855dc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/IVocabularyTermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/IVocabularyTermId.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/IObjectId" ], function(stjs, IObjectId) {
+define([ "stjs", "as/dto/common/id/IObjectId" ], function(stjs, IObjectId) {
var IVocabularyTermId = function() {
};
stjs.extend(IVocabularyTermId, null, [ IObjectId ], null, {});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyPermId.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyPermId.js
similarity index 67%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyPermId.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyPermId.js
index 9f985af750587092135e5d2736fb9bfd020a7cab..1c0677d345f139cdca3b7c71d32981f6cd239e08 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyPermId.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyPermId.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "dto/common/id/ObjectPermId", "dto/vocabulary/id/IVocabularyId" ], function(stjs, ObjectPermId, IVocabularyId) {
+define([ "stjs", "as/dto/common/id/ObjectPermId", "as/dto/vocabulary/id/IVocabularyId" ], function(stjs, ObjectPermId, IVocabularyId) {
/**
* @param permId
* Vocabulary perm id, e.g. "MY_VOCABULARY".
@@ -12,7 +12,7 @@ define([ "stjs", "dto/common/id/ObjectPermId", "dto/vocabulary/id/IVocabularyId"
ObjectPermId.call(this, permId);
};
stjs.extend(VocabularyPermId, ObjectPermId, [ ObjectPermId, IVocabularyId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.id.VocabularyPermId';
+ prototype['@type'] = 'as.dto.vocabulary.id.VocabularyPermId';
constructor.serialVersionUID = 1;
}, {});
return VocabularyPermId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyTermCode.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyTermCode.js
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyTermCode.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyTermCode.js
index a57af182608d99e1d228a656835c0cb085ecee74..362076f2e0561c253b149ddd29cf2cff76235b44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/vocabulary/id/VocabularyTermCode.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/vocabulary/id/VocabularyTermCode.js
@@ -3,7 +3,7 @@
*
* @author pkupczyk
*/
-define([ "stjs", "util/Exceptions", "dto/vocabulary/id/IVocabularyTermId" ], function(stjs, exceptions, IVocabularyTermId) {
+define([ "stjs", "util/Exceptions", "as/dto/vocabulary/id/IVocabularyTermId" ], function(stjs, exceptions, IVocabularyTermId) {
/**
* @param code
* Vocabulary term code, e.g. "MY_TERM".
@@ -12,7 +12,7 @@ define([ "stjs", "util/Exceptions", "dto/vocabulary/id/IVocabularyTermId" ], fun
this.setCode(code);
};
stjs.extend(VocabularyTermCode, null, [ IVocabularyTermId ], function(constructor, prototype) {
- prototype['@type'] = 'dto.vocabulary.id.VocabularyTermCode';
+ prototype['@type'] = 'as.dto.vocabulary.id.VocabularyTermCode';
constructor.serialVersionUID = 1;
prototype.code = null;
prototype.getCode = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchCriteria.js
deleted file mode 100644
index 94edbb1a09eaa923db183481be420bace9377163..0000000000000000000000000000000000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchCriteria.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria"],
- function(require, stjs, AbstractObjectSearchCriteria) {
- var ServiceSearchCriteria = function() {
- AbstractObjectSearchCriteria.call(this);
- };
- stjs.extend(DeletionSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'dto.deletion.search.DeletionSearchCriteria';
- constructor.serialVersionUID = 1;
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("DELETION");
- return builder;
- };
- }, {
- criteria : {
- name : "Collection",
- arguments : [ "ISearchCriteria" ]
- }
- });
- return ServiceSearchCriteria;
-})
\ No newline at end of file
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
index 245d15b8fcb2e4fbe07100114efde5956f711dd9..2d26db650969f791591d847cb0bb968040639144 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
@@ -159,7 +159,8 @@ public interface IApplicationServerApi extends IRpcService
public SearchResult<Material> searchMaterials(String sessionToken, MaterialSearchCriteria searchCriteria, MaterialFetchOptions fetchOptions);
- public SearchResult<CustomASService> searchCustomASServices(String sessionToken, CustomASServiceSearchCriteria searchCriteria, CustomASServiceFetchOptions fetchOptions);
+ public SearchResult<CustomASService> searchCustomASServices(String sessionToken, CustomASServiceSearchCriteria searchCriteria,
+ CustomASServiceFetchOptions fetchOptions);
public SearchResult<ObjectKindModification> searchObjectKindModifications(String sessionToken,
ObjectKindModificationSearchCriteria searchCriteria, ObjectKindModificationFetchOptions fetchOptions);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java
index e98bdae2538766438539d8f3a4ddb5a678716703..e6a0c33f416f8f7e613cfa64ee5c492af7afbfe3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java
@@ -15,7 +15,12 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
@@ -23,16 +28,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.attachment.Attachment")
+@JsonObject("as.dto.attachment.Attachment")
public class Attachment implements Serializable, IRegistrationDateHolder, IRegistratorHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java
index c2ae418d4ee3c96d3586b068c9fda6d75538cabb..da995a3b0a5f2746a462a5e92a4fae1e7277c4cf 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.attachment.create.AttachmentCreation")
+@JsonObject("as.dto.attachment.create.AttachmentCreation")
public class AttachmentCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java
index ed28778785f489d8cfe116a91b939ef174eab420..a7be5bb3aba13c242dd336d7b5cb19dc1e736930 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java
@@ -15,21 +15,20 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.attachment.fetchoptions.AttachmentFetchOptions")
+@JsonObject("as.dto.attachment.fetchoptions.AttachmentFetchOptions")
public class AttachmentFetchOptions extends FetchOptions<Attachment> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java
index f9ca59c00496bc85fa0528de3ae7a771ee7cf89d..7f34fc834ba9d37985f9567cf916e3083a7811f0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.attachment.fetchoptions.AttachmentSortOptions")
+@JsonObject("as.dto.attachment.fetchoptions.AttachmentSortOptions")
public class AttachmentSortOptions extends SortOptions<Attachment>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java
index 8828d4b9696595c495df9c6c2e0145f588975459..297e6e9d7f3bd9a745d3a202356f91158854c191 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.attachment.id.AttachmentFileName")
+@JsonObject("as.dto.attachment.id.AttachmentFileName")
public class AttachmentFileName implements IAttachmentId, Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
index 39db09e08a172af6759485a380cdba637522a0ce..538d9fb75e2780629081c0b5f3ac2ee084c21364 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.attachment.id.IAttachmentId")
+@JsonObject("as.dto.attachment.id.IAttachmentId")
public interface IAttachmentId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java
index f2869ac423f25925c8e9de07103092f8982b555a..8444ed3b3bcc2cb9cd7e203ecd6fa4fa7f36dc62 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.attachment.update.AttachmentListUpdateValue")
+@JsonObject("as.dto.attachment.update.AttachmentListUpdateValue")
public class AttachmentListUpdateValue extends ListUpdateValue<AttachmentCreation, IAttachmentId, AttachmentCreation, Object>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
index 78f7ed326f3cc5a600b50383c97265f3545e3b60..3ef6f5277e0e484a8651865ff2831a239d32ded2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.CacheMode")
+@JsonObject("as.dto.common.fetchoptions.CacheMode")
public enum CacheMode
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java
index 9ba34d4aa146f7b201651b5a9717c54914f2a678..0ea9e8d80d33ee4e691cb0ca33da483aa641e15e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java
@@ -2,7 +2,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.fetchoptions.EmptyFetchOptions")
+@JsonObject("as.dto.common.fetchoptions.EmptyFetchOptions")
public class EmptyFetchOptions extends FetchOptions<Void>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java
index 6b888c59e95a7f29d233f013d55dcfcc11de9dc8..dc0a3c590f6b3d489b16f5eede9251525b0f46b8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.EntitySortOptions")
+@JsonObject("as.dto.common.fetchoptions.EntitySortOptions")
public class EntitySortOptions<OBJECT extends ICodeHolder & IRegistrationDateHolder & IModificationDateHolder> extends SortOptions<OBJECT>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
index e47fe01e648189f18e8c58606b1f1f85d3466162..5411dc0c8212afc81a9d3bc8b9bcc29dafe5aeca 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.EntityWithPropertiesSortOptions")
+@JsonObject("as.dto.common.fetchoptions.EntityWithPropertiesSortOptions")
public class EntityWithPropertiesSortOptions<OBJECT extends ICodeHolder & IRegistrationDateHolder & IModificationDateHolder & IPropertiesHolder>
extends EntitySortOptions<OBJECT>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java
index 5168a7682824062fe0fe5da5b1fb3c016f0bd605..076cab45174ff5ae08b6da479da08445d5414584 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.fetchoptions.FetchOptions")
+@JsonObject("as.dto.common.fetchoptions.FetchOptions")
public abstract class FetchOptions<OBJECT> implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java
index 0ae898e3418ab9b5181f7eeb996654372b54295d..7e56b0ad2f08906078eba6b49185e839b556aa77 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.SortOptions")
+@JsonObject("as.dto.common.fetchoptions.SortOptions")
public abstract class SortOptions<OBJECT> implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java
index 5a449c62a61b77804cc1c93adf953cb3509b16e8..e9a95aa48b6d9b8513a8cb48809d0bb935852521 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.SortOrder")
+@JsonObject("as.dto.common.fetchoptions.SortOrder")
public class SortOrder implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java
index b13126ef117a44f9130bd57b574764f0454ed398..3c45afce39787ec15f71dbde9c51125dcb4cfa14 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.fetchoptions.Sorting")
+@JsonObject("as.dto.common.fetchoptions.Sorting")
public class Sorting implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java
index 67a15ef0dedd0fa12929481d53a839697f73abb4..f4d2ff850593eefa58d5679dac727a8227445e41 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.id.CreationId")
+@JsonObject("as.dto.common.id.CreationId")
public class CreationId implements ISampleId, IDataSetId, IExperimentId, IProjectId, ISpaceId, IMaterialId
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java
index 6f45ccf847347eae0acc4b940ae9d404a5261df1..9c759cd773ad7fb29d45a79744dcc2453d40940e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.common.id.IObjectId")
+@JsonObject("as.dto.common.id.IObjectId")
public interface IObjectId extends Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java
index e6caacd461a92864121c555908fd03faa5729b33..a913b6b10430318aa4ee5d860d0d0cd2a3ab1324 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.common.id.ObjectIdentifier")
+@JsonObject("as.dto.common.id.ObjectIdentifier")
public abstract class ObjectIdentifier implements IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java
index b565a43d0e0138e0f99556ffff615c885471e7d1..1bfe424b2245365fd055ddb228f2f4211e69878b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.common.id.ObjectPermId")
+@JsonObject("as.dto.common.id.ObjectPermId")
public abstract class ObjectPermId implements IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
index 7e013475a7ca877d6dc49151c7b02a2161269dc3..8e7766bac027731b8d8c2f7089234c0df6864b69 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.id.ObjectTechId")
+@JsonObject("as.dto.common.id.ObjectTechId")
public class ObjectTechId implements IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
index 869b1f630733a1ba946d8be723fe9ab9726ab101..2c7f21804251d2957e903a33a48fe7147818ed5b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IAttachmentsHolder")
+@JsonObject("as.dto.common.interfaces.IAttachmentsHolder")
public interface IAttachmentsHolder
{
List<Attachment> getAttachments();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
index 54fca8b54f82d5284fbcbf59dda8c893a2e9c240..bded05b19be67629631464447b9d02c0966c3a32 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.interfaces.ICodeHolder")
+@JsonObject("as.dto.common.interfaces.ICodeHolder")
public interface ICodeHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
index 0b64c834d6613cbdd5654ce2ea07a74f72a17fb4..74948f0d8448b655683eaf5b7939e748b34a88b8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.interfaces.ICreationIdHolder")
+@JsonObject("as.dto.common.interfaces.ICreationIdHolder")
public interface ICreationIdHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
index b6e1e96d23fc239ec2a999629603e6bcd18a827b..525bbb9d62f682a115f19f646c298a162bbf4026 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IModificationDateHolder")
+@JsonObject("as.dto.common.interfaces.IModificationDateHolder")
public interface IModificationDateHolder
{
Date getModificationDate();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
index 544c5779417b42432caa7d75ec95e6ef46eb043a..99e04401f046ad13d1c503828a7a28d85bc838c7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IModifierHolder")
+@JsonObject("as.dto.common.interfaces.IModifierHolder")
public interface IModifierHolder
{
Person getModifier();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
index 63b17d9076e4a726eeade51a0ba5b9dd3b84177d..291e37e79e0578211b6d5bad57059beec2eaaf76 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IParentChildrenHolder")
+@JsonObject("as.dto.common.interfaces.IParentChildrenHolder")
public interface IParentChildrenHolder<T>
{
List<T> getParents();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
index e950ccc2c64f0279b9a83705abb091e73c5b11b0..4a0fd493eb9da1e9dd3371016d7b45e7efe7e7d0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.interfaces.IPermIdHolder")
+@JsonObject("as.dto.common.interfaces.IPermIdHolder")
public interface IPermIdHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
index bc53aa3b62ada03440cf418a244a0ea6835dc4b0..24509f463190967ae73ecfdebab3f1d08b54ab84 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IPropertiesHolder")
+@JsonObject("as.dto.common.interfaces.IPropertiesHolder")
public interface IPropertiesHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
index 9944dbc0e123a760492b6877071ca92620da0eb1..9a96575e9e5b3fa0f60ff4e9c41301befade9919 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IRegistrationDateHolder")
+@JsonObject("as.dto.common.interfaces.IRegistrationDateHolder")
public interface IRegistrationDateHolder
{
Date getRegistrationDate();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
index fe3cb15e702246fac605c756c310871dda1aa440..8cdfc41c90f001e66e1436aeb400dd03656c8c3b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.IRegistratorHolder")
+@JsonObject("as.dto.common.interfaces.IRegistratorHolder")
public interface IRegistratorHolder
{
Person getRegistrator();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
index 1648ded1a4a8e9d15f2d9bba2b2fb405afad4366..4632fe3f310b13f0724cac0b82965462243a932e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.ISpaceHolder")
+@JsonObject("as.dto.common.interfaces.ISpaceHolder")
public interface ISpaceHolder
{
Space getSpace();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
index 89fbe8dff306eec8026fe70361420d62122389b5..6d2ff71436b76077f0d182803d0df5fba4ee1278 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.interfaces.ITagsHolder")
+@JsonObject("as.dto.common.interfaces.ITagsHolder")
public interface ITagsHolder
{
Set<Tag> getTags();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperation.java
index 7b86515871338cbe624fa503da6f28c15346778a..0e3cb20d8a8402bd7c657b0e7287d3f15ca9d273 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperation.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.operations.IOperation")
+@JsonObject("as.dto.common.operations.IOperation")
public interface IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperationResult.java
index c0b435c0f814d176e714dcb5e6844f34a5449e35..5a926dbcb600a0001a7ece313493548b03f80326 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operations/IOperationResult.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.operations.IOperationResult")
+@JsonObject("as.dto.common.operations.IOperationResult")
public interface IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java
index a57242fd556b1b1deea2b95ec895f718bd8b8a8c..e1dfd358c989282fa127c77dfd38ce4cc9ac377c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractCompositeSearchCriteria")
+@JsonObject("as.dto.common.search.AbstractCompositeSearchCriteria")
public abstract class AbstractCompositeSearchCriteria extends AbstractSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
index 4c639b26d6e8e354e526314238fcf59f93378397..ca908730448fea15d275c41bdde0769ec6e4c313 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
@@ -20,7 +20,7 @@ import java.util.Date;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.AbstractDateObjectValue")
+@JsonObject("as.dto.common.search.AbstractDateObjectValue")
public abstract class AbstractDateObjectValue extends AbstractValue<Date> implements IDate
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java
index 4c02f5aaec30e7016a2fe71871d1bb927b558f11..7d879553f7fa9219753e44651bfdf1bc7ac19cfe 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractDateValue")
+@JsonObject("as.dto.common.search.AbstractDateValue")
public class AbstractDateValue extends AbstractValue<String> implements IDate
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
index 1db4af8497d368af533cfad836156e68a25f0aeb..e3236edcbfbcf822f54d8c377e04dff2ae7ace7d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractEntitySearchCriteria")
+@JsonObject("as.dto.common.search.AbstractEntitySearchCriteria")
public class AbstractEntitySearchCriteria<ID extends IObjectId> extends AbstractObjectSearchCriteria<ID>
{
@@ -64,7 +64,7 @@ public class AbstractEntitySearchCriteria<ID extends IObjectId> extends Abstract
{
return with(new NumberPropertySearchCriteria(propertyName));
}
-
+
public StringPropertySearchCriteria withProperty(String propertyName)
{
return with(new StringPropertySearchCriteria(propertyName));
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
index 0ade37176b6372804fa98cf19262367d3613e326..41b801275aaa08743df904e3848b5b6d3014f31a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.AbstractFieldSearchCriteria")
+@JsonObject("as.dto.common.search.AbstractFieldSearchCriteria")
public abstract class AbstractFieldSearchCriteria<T> extends AbstractSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java
index 830926f52a823c45398403678f16ce6b70a5b6a0..015d116da1d9092e5347d4a89a231fe35cc1ead6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractNumberValue")
+@JsonObject("as.dto.common.search.AbstractNumberValue")
public abstract class AbstractNumberValue extends AbstractValue<Number>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java
index a54bbcfff33fedffef211e9acc56b2ba761d14db..b444d6fa16c3f54671be02dc947267591b8be949 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractObjectSearchCriteria")
+@JsonObject("as.dto.common.search.AbstractObjectSearchCriteria")
public class AbstractObjectSearchCriteria<ID extends IObjectId> extends AbstractCompositeSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java
index ff555f9e37775d328ee5a95f34a81d816fcfb87b..8a03eb4bab8a2afb97f6c5783339dadb087b680a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractSearchCriteria")
+@JsonObject("as.dto.common.search.AbstractSearchCriteria")
public abstract class AbstractSearchCriteria implements ISearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java
index 593bb701ed440301e2d24c06a6b5bcfb445994fc..874cff949c602583e2a66dc1f779b954cf466bbd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.AbstractStringValue")
+@JsonObject("as.dto.common.search.AbstractStringValue")
public abstract class AbstractStringValue extends AbstractValue<String>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
index 94cc3885258cf2c3390bb371f133aa4bbd293b1e..6d18064ef4525bc5ac332ad61d6849db4bf542e1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AbstractValue")
+@JsonObject("as.dto.common.search.AbstractValue")
abstract class AbstractValue<T> implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java
index f71821178c6ec5f63702c981ba8ab9cfcc4d6c0a..6d9590464acf3be86332c87c412c052907c8ce57 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AnyFieldSearchCriteria")
+@JsonObject("as.dto.common.search.AnyFieldSearchCriteria")
public class AnyFieldSearchCriteria extends StringFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java
index 45f5052466089361623bbdb087f3e62b1a35c150..fb45bf08165c967dcc3b9e8dc28bfdafc41adbe3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.AnyPropertySearchCriteria")
+@JsonObject("as.dto.common.search.AnyPropertySearchCriteria")
public class AnyPropertySearchCriteria extends StringFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java
index 3f5ac31c05811e927d2176bc981833723dba2084..38ffe4ba6e13964f33fe4809acef2d3ad12dba9f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.AnyStringValue")
+@JsonObject("as.dto.common.search.AnyStringValue")
public class AnyStringValue extends AbstractStringValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java
index 87285f0e2c453716b83565ec1098a0428eef7ecd..0b3bfa130a3fc8134c10fd66e7ffcc15b730bff7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.CodeSearchCriteria")
+@JsonObject("as.dto.common.search.CodeSearchCriteria")
public class CodeSearchCriteria extends StringFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
index d067f9e2678c010322943cf91e39e0ad30d05d4b..60e8e4abc10fa24ea6f511ab9c4d98b84492adcb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.DateEarlierThanOrEqualToValue")
+@JsonObject("as.dto.common.search.DateEarlierThanOrEqualToValue")
public class DateEarlierThanOrEqualToValue extends AbstractDateValue
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java
index 35b28a1806da885bb1fb5b288e11a88fb86be583..ff09f580107c7b5b380a3c65f0319b4df4598ab5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.DateEqualToValue")
+@JsonObject("as.dto.common.search.DateEqualToValue")
public class DateEqualToValue extends AbstractDateValue
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
index 3faaadf6e33b28e34d45ed649bc49c7d3491b188..49c60082edccddf1620d8fd557a927dda3969285 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
@@ -24,20 +24,21 @@ import java.util.List;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.DateFieldSearchCriteria")
+@JsonObject("as.dto.common.search.DateFieldSearchCriteria")
public class DateFieldSearchCriteria extends AbstractFieldSearchCriteria<IDate>
{
private static final long serialVersionUID = 1L;
private static final List<IDateFormat> DATE_FORMATS = new ArrayList<IDateFormat>();
-
- static {
+
+ static
+ {
DATE_FORMATS.add(new ShortDateFormat());
DATE_FORMATS.add(new NormalDateFormat());
DATE_FORMATS.add(new LongDateFormat());
}
-
+
private ITimeZone timeZone = new ServerTimeZone();
DateFieldSearchCriteria(String fieldName, SearchFieldType fieldType)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
index 9af6f0ace8556f021c864c4d1c2a034d45ed6b3c..11549f48b37c864ecbf59a97c5bdf65532f9cf43 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.DateLaterThanOrEqualToValue")
+@JsonObject("as.dto.common.search.DateLaterThanOrEqualToValue")
public class DateLaterThanOrEqualToValue extends AbstractDateValue
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
index ebe90cd2a281a937a01c087b53b4694f91d5fad7..979f59b5345885674455832cba20f36f49cf6ae5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
@@ -20,7 +20,7 @@ import java.util.Date;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.DateObjectEarlierThanOrEqualToValue")
+@JsonObject("as.dto.common.search.DateObjectEarlierThanOrEqualToValue")
public class DateObjectEarlierThanOrEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
index 1918f7e6c47df8c516f4578e984ab0011a80d293..5f619a491ec7644a0619e8b31729acd5dd1b94af 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
@@ -20,7 +20,7 @@ import java.util.Date;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.DateObjectEqualToValue")
+@JsonObject("as.dto.common.search.DateObjectEqualToValue")
public class DateObjectEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
index 01a238ee766caacdb8094db03b5acc128759db59..b9db5b45ab34d8b0e5ea46fa6ca31a9101c46c30 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
@@ -20,7 +20,7 @@ import java.util.Date;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.DateObjectLaterThanOrEqualToValue")
+@JsonObject("as.dto.common.search.DateObjectLaterThanOrEqualToValue")
public class DateObjectLaterThanOrEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java
index 2097fe6f1a77e2e80d81e17cef28556dcb46b98e..e1ab19d3abea93c28976974c91226ae29d9e5435 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java
@@ -21,17 +21,17 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.DatePropertySearchCriteria")
+@JsonObject("as.dto.common.search.DatePropertySearchCriteria")
public class DatePropertySearchCriteria extends DateFieldSearchCriteria
{
private static final long serialVersionUID = 1L;
-
+
DatePropertySearchCriteria()
{
super(null, SearchFieldType.PROPERTY);
}
-
+
DatePropertySearchCriteria(String fieldName)
{
super(fieldName, SearchFieldType.PROPERTY);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java
index 4c518a411052ed247b90a0ebc2981962302234c3..a253191dbe767164109ffc4140a52434cd8d0eeb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.IDate")
+@JsonObject("as.dto.common.search.IDate")
public interface IDate extends Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java
index a9eab09c983d0b18293508dc254576f8525334b9..9d4beb35a4e54bdc6fce33459dfd61fa63d7be16 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.IDateFormat")
+@JsonObject("as.dto.common.search.IDateFormat")
public interface IDateFormat extends Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java
index 315b7e7c412c94c8c2db7efcaa2a75900ae81f2d..f8525de8c5447ebb567513afb676d1a96c819848 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.ISearchCriteria")
+@JsonObject("as.dto.common.search.ISearchCriteria")
public interface ISearchCriteria extends Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java
index 48ab386c4ef510c3cf71c6e12ff484a375863c45..3dfce4847400adb97b0c6f9cd4587b67a2f2cf17 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.ITimeZone")
+@JsonObject("as.dto.common.search.ITimeZone")
public interface ITimeZone extends Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java
index 563955b811bedcf629d148cadf58117842190660..be9b32f990ae771791746050f24f9bb0dd27da72 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.IdSearchCriteria")
+@JsonObject("as.dto.common.search.IdSearchCriteria")
public class IdSearchCriteria<T extends IObjectId> extends AbstractSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java
index d5f475c003ff5809dcf2babc94fdfe0fa88e88a5..c9e38a732d1a37e791608bc186496bac30fbfa7e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.LongDateFormat")
+@JsonObject("as.dto.common.search.LongDateFormat")
public class LongDateFormat implements IDateFormat
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java
index 052cbfc585fb5ce0fd1f69624df3143b9d910f3e..425a3cf6d751cb3673a70772213ab2f4924dc687 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.ModificationDateSearchCriteria")
+@JsonObject("as.dto.common.search.ModificationDateSearchCriteria")
public class ModificationDateSearchCriteria extends DateFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java
index dd0a01f236e4bfec03cc13079aadc4f2a5708167..e21ac97ffaf4009d0569d0ff5efcdab4e93a1859 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.NormalDateFormat")
+@JsonObject("as.dto.common.search.NormalDateFormat")
public class NormalDateFormat implements IDateFormat
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
index 07cf107910972237105218ecb5045c0fed7ce32a..80c59481898d92093204bea47011673d07f92512 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
@@ -21,17 +21,17 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.NumberEqualToValue")
+@JsonObject("as.dto.common.search.NumberEqualToValue")
public class NumberEqualToValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
-
+
public NumberEqualToValue()
{
super(null);
}
-
+
public NumberEqualToValue(Number number)
{
super(number);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
index 53d1c62f91f0d4513be80ed564314ada407556fb..2dc7e899029a42eabbf5d9acdfc1bd5368e84efb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.NumberFieldSearchCriteria")
+@JsonObject("as.dto.common.search.NumberFieldSearchCriteria")
public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractNumberValue>
{
@@ -33,12 +33,12 @@ public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<Abstr
{
setFieldValue(new NumberEqualToValue(number));
}
-
+
public void thatIsLessThan(Number number)
{
setFieldValue(new NumberLessThanValue(number));
}
-
+
public void thatIsLessThanOrEqualTo(Number number)
{
setFieldValue(new NumberLessThanOrEqualToValue(number));
@@ -48,7 +48,7 @@ public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<Abstr
{
setFieldValue(new NumberGreaterThanValue(number));
}
-
+
public void thatIsGreaterThanOrEqualTo(Number number)
{
setFieldValue(new NumberGreaterThanOrEqualToValue(number));
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java
index 5959159f18a08426d63d5404932cdc26f2c1b54f..e13e52da100715c3739c7573dfd2ae809782ae15 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.common.search.NumberGreaterThanOrEqualToValue")
+@JsonObject("as.dto.common.search.NumberGreaterThanOrEqualToValue")
public class NumberGreaterThanOrEqualToValue extends AbstractNumberValue
{
@@ -31,7 +31,7 @@ public class NumberGreaterThanOrEqualToValue extends AbstractNumberValue
{
super(null);
}
-
+
public NumberGreaterThanOrEqualToValue(Number number)
{
super(number);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java
index 54a1fce6f36e39877f94c51afadf2239d8ec8b28..96e9124eb4370000057f5df6b7f1eb9164cb1bc7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java
@@ -21,17 +21,17 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.common.search.NumberGreaterThanValue")
+@JsonObject("as.dto.common.search.NumberGreaterThanValue")
public class NumberGreaterThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
-
+
public NumberGreaterThanValue()
{
super(null);
}
-
+
public NumberGreaterThanValue(Number number)
{
super(number);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java
index 16bbdaaa47651a84920006169da036b38cd0f3cc..20be70a076a0bccd0f7bac8eba2e44314b7bb432 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.common.search.NumberLessThanOrEqualToValue")
+@JsonObject("as.dto.common.search.NumberLessThanOrEqualToValue")
public class NumberLessThanOrEqualToValue extends AbstractNumberValue
{
@@ -31,7 +31,7 @@ public class NumberLessThanOrEqualToValue extends AbstractNumberValue
{
super(null);
}
-
+
public NumberLessThanOrEqualToValue(Number number)
{
super(number);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java
index e80bbc625cd65fac4f96eeda36a89fe5953776f8..f1a8888bb62d437865657f7544205c3a5595b2fc 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java
@@ -21,17 +21,17 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.common.search.NumberLessThanValue")
+@JsonObject("as.dto.common.search.NumberLessThanValue")
public class NumberLessThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
-
+
public NumberLessThanValue()
{
super(null);
}
-
+
public NumberLessThanValue(Number number)
{
super(number);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java
index 48bb731237368242086b83d8be3a6f56c01086c7..7e1ea89253942d28001f4136dd7f2fae5e2e3a71 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java
@@ -21,21 +21,20 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.NumberPropertySearchCriteria")
+@JsonObject("as.dto.common.search.NumberPropertySearchCriteria")
public class NumberPropertySearchCriteria extends NumberFieldSearchCriteria
{
private static final long serialVersionUID = 1L;
-
+
NumberPropertySearchCriteria()
{
super(null, SearchFieldType.PROPERTY);
}
-
+
NumberPropertySearchCriteria(String fieldName)
{
super(fieldName, SearchFieldType.PROPERTY);
}
-
-
+
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java
index 7963caac2adcd8983a1fe7e273ebd3d60762c35d..55944c3d64bdf0c0790a71c04f810c14d235c7af 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.PermIdSearchCriteria")
+@JsonObject("as.dto.common.search.PermIdSearchCriteria")
public class PermIdSearchCriteria extends StringFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java
index 39f0e7cd3f244507e5050bba17adabade77746cd..6b5ee8757cccf3827a87df452d2d66c851d7fe33 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.RegistrationDateSearchCriteria")
+@JsonObject("as.dto.common.search.RegistrationDateSearchCriteria")
public class RegistrationDateSearchCriteria extends DateFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java
index 80d2254396e4d31804fe42da546d3cbb280961e4..319fb1f608d5cf31a9587b73a382106821fe97d0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.SearchCriteriaToStringBuilder")
+@JsonObject("as.dto.common.search.SearchCriteriaToStringBuilder")
public class SearchCriteriaToStringBuilder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java
index 347aa0614526e0ea0850f4251ea44677c6d6845b..47f6fcbf2ce29caa9d7459bdee0efd7b3ba889a2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.SearchFieldType")
+@JsonObject("as.dto.common.search.SearchFieldType")
public enum SearchFieldType
{
PROPERTY, ATTRIBUTE, ANY_PROPERTY, ANY_FIELD
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java
index 95576810d0a30422b6bf8461b102f07edfdb6af6..149881a8679894acd35910773c612a23326ac81d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
* @author pkupczyk
*/
-@JsonObject("dto.common.search.SearchOperator")
+@JsonObject("as.dto.common.search.SearchOperator")
public enum SearchOperator
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
index ade53cce3468bcc7676526f52086a10df76267c9..270ec9007e9275c6fb95c5533991319158c3ffda 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.SearchResult")
+@JsonObject("as.dto.common.search.SearchResult")
public class SearchResult<OBJECT> implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java
index 42b589b14236b24b2bbb77ba0c5a486bae958e0c..8bdc843f427bad3a3a9286380adae6149bc2b170 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
* @author pkupczyk
*/
-@JsonObject("dto.common.search.ServerTimeZone")
+@JsonObject("as.dto.common.search.ServerTimeZone")
public class ServerTimeZone implements ITimeZone
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java
index c5aa00c0e872bd4a01c0d5d752969656e6bcef8b..c33f0c8f749f36f044ec069a39322eea3b806842 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.ShortDateFormat")
+@JsonObject("as.dto.common.search.ShortDateFormat")
public class ShortDateFormat implements IDateFormat
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java
index d5b5eb2f1b1fb59e022aedac021025c411a093e3..71c867c80b14cfedaba77f7a7ab53aebb43198ac 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.StringContainsValue")
+@JsonObject("as.dto.common.search.StringContainsValue")
public class StringContainsValue extends AbstractStringValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java
index dd572ced274efa5e4ab3b61c3597795daaac55a0..35448cf70110733fabedb1fab4d9f86d3e6b63dd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.StringEndsWithValue")
+@JsonObject("as.dto.common.search.StringEndsWithValue")
public class StringEndsWithValue extends AbstractStringValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java
index 9fcb36f3f8350b94bd5dd5f29ac5ab5c0b480ac1..16fad9285aae39488a2f4e05297b3029a5e5d2be 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.StringEqualToValue")
+@JsonObject("as.dto.common.search.StringEqualToValue")
public class StringEqualToValue extends AbstractStringValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
index 1615df9de3a87bd494698cc85457b6fef527bca2..c207394b4f4c3a1ea9cf34a6b98e9d457a7e7971 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.StringFieldSearchCriteria")
+@JsonObject("as.dto.common.search.StringFieldSearchCriteria")
public class StringFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractStringValue>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java
index 3966c2171fa97a3dc47f126c0d59b4d666342dd1..5e1f9a43b977ccfedf7b280920b0d1ffb67480fc 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java
@@ -21,17 +21,17 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.search.StringPropertySearchCriteria")
+@JsonObject("as.dto.common.search.StringPropertySearchCriteria")
public class StringPropertySearchCriteria extends StringFieldSearchCriteria
{
private static final long serialVersionUID = 1L;
-
+
StringPropertySearchCriteria()
{
super(null, SearchFieldType.PROPERTY);
}
-
+
StringPropertySearchCriteria(String fieldName)
{
super(fieldName, SearchFieldType.PROPERTY);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java
index 5575cc952dbccc3f3e5b90cf1b9d46aab4a04548..436f8ed9396191e877334b8f01b6cc62dcdf7150 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.StringStartsWithValue")
+@JsonObject("as.dto.common.search.StringStartsWithValue")
public class StringStartsWithValue extends AbstractStringValue
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java
index d7061dcd9c7c68dc9901e2e85892374bcc4d828d..a5943df45309410a15f76fb63e0dfdcc45df0b22 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.search.TechIdSearchCriteria")
+@JsonObject("as.dto.common.search.TechIdSearchCriteria")
public class TechIdSearchCriteria extends NumberFieldSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
index 685778dd0c6fe6d1ce54962fc7b94fd5ba54a55f..ee94ad67a395b08ffbe8767b9859c410d2e1b070 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
* @author pkupczyk
*/
-@JsonObject("dto.common.search.TimeZone")
+@JsonObject("as.dto.common.search.TimeZone")
public class TimeZone implements ITimeZone
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java
index bc40814fb841f4796cc8e9192a2afb27d4dc93b7..a9a74071c9c3ba2147a8aae3437e44680855d788 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author Jakub Straszewski
*/
-@JsonObject("dto.common.update.FieldUpdateValue")
+@JsonObject("as.dto.common.update.FieldUpdateValue")
public class FieldUpdateValue<T> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java
index 8050704126c88f4e70f9b7bfe14c8300a49282c6..59592c2e6e82977b28bcc793aba6dee25b7da4e7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java
@@ -5,7 +5,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.common.update.IdListUpdateValue")
+@JsonObject("as.dto.common.update.IdListUpdateValue")
public class IdListUpdateValue<T> extends ListUpdateValue<T, T, T, T>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java
index 2dc27e4eab58a25135fbf5b52ce4ff5adc3f216f..539017ce1ecb620c1c193260a42a5c1d3653cea6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java
@@ -9,12 +9,12 @@ import java.util.List;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("dto.common.update.ListUpdateValue")
+@JsonObject("as.dto.common.update.ListUpdateValue")
public class ListUpdateValue<ADD, REMOVE, SET, ACTION> implements Serializable
{
private static final long serialVersionUID = 1L;
- @JsonObject("dto.common.update.ListUpdateAction")
+ @JsonObject("as.dto.common.update.ListUpdateAction")
public static class ListUpdateAction<T> implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -33,19 +33,19 @@ public class ListUpdateValue<ADD, REMOVE, SET, ACTION> implements Serializable
}
- @JsonObject("dto.common.update.ListUpdateActionAdd")
+ @JsonObject("as.dto.common.update.ListUpdateActionAdd")
public static class ListUpdateActionAdd<ADD> extends ListUpdateAction<ADD>
{
private static final long serialVersionUID = 1L;
}
- @JsonObject("dto.common.update.ListUpdateActionRemove")
+ @JsonObject("as.dto.common.update.ListUpdateActionRemove")
public static class ListUpdateActionRemove<REMOVE> extends ListUpdateAction<REMOVE>
{
private static final long serialVersionUID = 1L;
}
- @JsonObject("dto.common.update.ListUpdateActionSet")
+ @JsonObject("as.dto.common.update.ListUpdateActionSet")
public static class ListUpdateActionSet<SET> extends ListUpdateAction<SET>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
index 1ecd4273133362f56632c6819494adc39cff3fc4..b929ffd505ff717ad2cbf16d43e655142ce38d85 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.ArchivingStatus")
+@JsonObject("as.dto.dataset.ArchivingStatus")
public enum ArchivingStatus
{
AVAILABLE, LOCKED, ARCHIVED, UNARCHIVE_PENDING, ARCHIVE_PENDING, BACKUP_PENDING
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
index 15a90dcd6b1d6db65d77ff4702a4fb3f531c50bd..d667f45b1de0db7ad626214ba519524a5f2862b2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.Complete")
+@JsonObject("as.dto.dataset.Complete")
public enum Complete
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
index ee5d71c693c8e7e29facb4ea299149359acafc5a..7d2f212d381e5ea2d1a50b28d28d9345c1937cbd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
@@ -15,6 +15,15 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModifierHolder;
@@ -24,9 +33,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPropertiesHol
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ITagsHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LinkedData;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.DataStore;
@@ -38,19 +44,13 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.DataSet")
-public class DataSet implements Serializable, ICodeHolder, IModificationDateHolder, IModifierHolder, IParentChildrenHolder<DataSet>, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ITagsHolder
+@JsonObject("as.dto.dataset.DataSet")
+public class DataSet implements Serializable, ICodeHolder, IModificationDateHolder, IModifierHolder, IParentChildrenHolder<DataSet>, IPermIdHolder,
+ IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ITagsHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
index b23c5dd7ce60a8346ebe5b5e013baf3028c2fce2..d5fe1af7e4b6bc4bdf47035b73a2e9dd5390979d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.DataSetKind")
+@JsonObject("as.dto.dataset.DataSetKind")
public enum DataSetKind
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java
index 89e9c7b29bbf924123c6735d3c44b858c8b29436..6fe9b56e6cab56089a647e6330dccb4393b6ae29 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java
@@ -15,25 +15,23 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetKind;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.DataSetType")
+@JsonObject("as.dto.dataset.DataSetType")
public class DataSetType implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java
index ac41f0fa0dfede7bdaf37306919c0893c9842c6b..da6c1fa32e12a7e5815a91ff0a8a54cf5a3c805e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.FileFormatTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.FileFormatTypeFetchOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.FileFormatType")
+@JsonObject("as.dto.dataset.FileFormatType")
public class FileFormatType implements Serializable, ICodeHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
index 77b3633314c31d23ee3717006566206aa55d8140..2eb6a16573ef2de6ca45a5ccdd44fe208cdcc073 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
@@ -15,20 +15,20 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LinkedDataFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LinkedDataFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
+import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.LinkedData")
+@JsonObject("as.dto.dataset.LinkedData")
public class LinkedData implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java
index 34bee640b46e07cce51c63eba08e4d568dc76d6d..eaf33a25fb66a5cc99e902d7a455dbd88328330c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LocatorTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LocatorTypeFetchOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.LocatorType")
+@JsonObject("as.dto.dataset.LocatorType")
public class LocatorType implements Serializable, ICodeHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java
index b152a5061044231cb1ee571c68909f7c0b9d7823..8398fc1b1ed7b04041bdff46e113279f15a3f106 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java
@@ -15,24 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ArchivingStatus;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.Complete;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.FileFormatType;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LocatorType;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.StorageFormat;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.PhysicalDataFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.PhysicalDataFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.PhysicalData")
+@JsonObject("as.dto.dataset.PhysicalData")
public class PhysicalData implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java
index fc0c8136f786e68c14db419e23cedbeedcb5ed77..a6fb881c836615dc23fb6102cea5768dc8f0af8e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.StorageFormatFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.StorageFormatFetchOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.StorageFormat")
+@JsonObject("as.dto.dataset.StorageFormat")
public class StorageFormat implements Serializable, ICodeHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
index eb9f28a1977de37558f1afad3880d505712aa3e0..f28a31c8df29cf37c612cf74b5d5885179232457 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
@@ -35,7 +35,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.create.DataSetCreation")
+@JsonObject("as.dto.dataset.create.DataSetCreation")
public class DataSetCreation implements Serializable, ICreationIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
index 17d1f1118aca012b62b8d84414579d7ce4d28079..bc068755e2967892cba37cceaf85db7b144f779b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.create.LinkedDataCreation")
+@JsonObject("as.dto.dataset.create.LinkedDataCreation")
public class LinkedDataCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java
index 2d8247fc7bbd5f8196d66deceaac865bf436e4ee..f5f695b50282b2e5f3937c96ede83b313312eabe 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.create.PhysicalDataCreation")
+@JsonObject("as.dto.dataset.create.PhysicalDataCreation")
public class PhysicalDataCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java
index 75398bca53f552adcc86fe0743064901f4aeb604..af90851572c1791e825bbc3122de6b855737f521 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.delete.DataSetDeletionOptions")
+@JsonObject("as.dto.dataset.delete.DataSetDeletionOptions")
public class DataSetDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java
index e22eb01da990158b4b319e5e0b407aba88f055bc..f5d78b716ed213a7d1b4804a9178d5774c361b30 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java
@@ -15,12 +15,12 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LinkedDataFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.PhysicalDataFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.fetchoptions.DataStoreFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions.ExperimentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
@@ -30,13 +30,11 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyFe
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions.TagFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.DataSetFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.DataSetFetchOptions")
public class DataSetFetchOptions extends FetchOptions<DataSet> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java
index 35717543675e4e2ccde7b639b6976c47aa5215f6..4d58fef8856bd747d0700837b281781271b3f453 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.DataSetSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.DataSetSortOptions")
public class DataSetSortOptions extends EntityWithPropertiesSortOptions<DataSet>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java
index f88fa3459b194228fe03d601be74971c96a48df4..157d2569536bd67d7d3b863db9d369c56f345e64 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.DataSetTypeFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.DataSetTypeFetchOptions")
public class DataSetTypeFetchOptions extends FetchOptions<DataSetType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
index f67453da452fd904de37611e39df420f48690499..3b15398ba18ebd83854c3cdf5ab4347c4385b6fe 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.DataSetTypeSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.DataSetTypeSortOptions")
public class DataSetTypeSortOptions extends SortOptions<DataSetType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java
index c940f15311a2ef1510f2065245c2cb640d336acc..6f01cbd45b5139b4b2d32c529426180bba5de755 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.FileFormatType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.FileFormatType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.FileFormatTypeFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.FileFormatTypeFetchOptions")
public class FileFormatTypeFetchOptions extends FetchOptions<FileFormatType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java
index 9110332b9bb7411e8b2215efe3ed1d2291f96ff9..4c605d121771a9446dd272ed81ae6202e369bf37 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.FileFormatTypeSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.FileFormatTypeSortOptions")
public class FileFormatTypeSortOptions extends SortOptions<FileFormatType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java
index 1c3b56f8e018716c91cce3f8e3f5eb9853fb1e88..30a219ee4615933d5c772baddf8ea914c9838ade 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java
@@ -15,19 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LinkedData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions.ExternalDmsFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.LinkedDataFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.LinkedDataFetchOptions")
public class LinkedDataFetchOptions extends FetchOptions<LinkedData> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java
index 03bfdd037b67d2d848466c01305da243382590ae..a25fcb61561b106faddd8a0cd1689e6e53081b56 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.LinkedDataSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.LinkedDataSortOptions")
public class LinkedDataSortOptions extends SortOptions<LinkedData>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java
index ecce7c3c37caae823d8a59752dcb3a4acdb6582c..1369cd2b22df10fb4e1ba9a644c250e0be4f885d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LocatorType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LocatorType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.LocatorTypeFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.LocatorTypeFetchOptions")
public class LocatorTypeFetchOptions extends FetchOptions<LocatorType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java
index 95b7db7da42a6a39ec101412bafe258bb07fb9a6..5854b7ca9a204399e40dd3c673aba2057ec7123c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.LocatorTypeSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.LocatorTypeSortOptions")
public class LocatorTypeSortOptions extends SortOptions<LocatorType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java
index e174aa210477493f63af36900bf3d515da3cda16..8003d4064accbc2066b418fa5a91dc4870678bcf 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java
@@ -15,21 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.FileFormatTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LocatorTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.StorageFormatFetchOptions;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.PhysicalDataFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.PhysicalDataFetchOptions")
public class PhysicalDataFetchOptions extends FetchOptions<PhysicalData> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java
index 1593187ce37975a1b2430de324753e4064276f9b..b4f2b13dd3c28fe41b93d4795978b802c5e94c5d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.PhysicalDataSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.PhysicalDataSortOptions")
public class PhysicalDataSortOptions extends SortOptions<PhysicalData>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java
index 3cb352bae443139b25955c9056202c9b46cf2e94..5e18fbc5aab236fc723f801d30b16f6aaf320a9b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.StorageFormat;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.StorageFormat;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.dataset.fetchoptions.StorageFormatFetchOptions")
+@JsonObject("as.dto.dataset.fetchoptions.StorageFormatFetchOptions")
public class StorageFormatFetchOptions extends FetchOptions<StorageFormat> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java
index bf723032a40cd8ca78e6cb1fdf77fe76c62cc952..ac304ac1cfd72c5b436ae314b7d679e85d7206cf 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.fetchoptions.StorageFormatSortOptions")
+@JsonObject("as.dto.dataset.fetchoptions.StorageFormatSortOptions")
public class StorageFormatSortOptions extends SortOptions<StorageFormat>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
index a81159e75f1395ca4e739bff2a7a27733318fe8f..16f58f7087c0504c3b5a3fa70a2027aac5f3105f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.history.DataSetRelationType")
+@JsonObject("as.dto.dataset.history.DataSetRelationType")
public enum DataSetRelationType implements IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java
index 7993cdc3760094979b8da3a5b5f7d706b5bcaa9c..d9e01ae46cb9bb1548da8fb75fdd5c51097f0a72 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.BdsDirectoryStorageFormatPermId")
+@JsonObject("as.dto.dataset.id.BdsDirectoryStorageFormatPermId")
public class BdsDirectoryStorageFormatPermId extends StorageFormatPermId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
index 77ad359f3c561b26c779cc4fe4a60d9efdb796a3..3b7c41d1e32f72cf289b4bfc108d7c2231cf3e0e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.DataSetPermId")
+@JsonObject("as.dto.dataset.id.DataSetPermId")
public class DataSetPermId extends ObjectPermId implements IDataSetId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
index 28a57d943a97d3b3add2e7e4ad626a5eda8549be..73eb2e8579fc7fff785f11c91002654dc9a12c78 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.FileFormatTypePermId")
+@JsonObject("as.dto.dataset.id.FileFormatTypePermId")
public class FileFormatTypePermId extends ObjectPermId implements IFileFormatTypeId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java
index 0c71af845f8c304afc0ca3a8491017e4c398fada..93e3ef67ff614feefbce035826a14c2f14ef38ec 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.IDataSetId")
+@JsonObject("as.dto.dataset.id.IDataSetId")
public interface IDataSetId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java
index d26614aadafc799d24a5e7414cb441fb96cb3afe..b87cb4fa58471053d6d47ad967a154393380ea16 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.IFileFormatTypeId")
+@JsonObject("as.dto.dataset.id.IFileFormatTypeId")
public interface IFileFormatTypeId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java
index 47ddc44f39736ce0ae06b1c894e7972e1f0f2a01..1c2f8e2dddeb692e7750763e47bf5e391b3ac5b7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.ILocatorTypeId")
+@JsonObject("as.dto.dataset.id.ILocatorTypeId")
public interface ILocatorTypeId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java
index 3cfd45175e9218fb85ae45e8974fb2484eda5f62..5ea1d2c3b408584d1da2b43fdefbdf5b8b866822 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.IStorageFormatId")
+@JsonObject("as.dto.dataset.id.IStorageFormatId")
public interface IStorageFormatId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
index 2d9d105e865302274d9c708c9f9e6bb0441a2868..c928769f04824d302c44c9987421cc428e225c39 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.LocatorTypePermId")
+@JsonObject("as.dto.dataset.id.LocatorTypePermId")
public class LocatorTypePermId extends ObjectPermId implements ILocatorTypeId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java
index 3e31eda8a6a1c078ec87e2455fc52c5fd054bc34..3df662cc16fae4bc37b36f1e66aa5e87aba9cf73 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.ProprietaryStorageFormatPermId")
+@JsonObject("as.dto.dataset.id.ProprietaryStorageFormatPermId")
public class ProprietaryStorageFormatPermId extends StorageFormatPermId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java
index 0fd1fedec32b53e555b5aa985625ebf2a316337c..105f000ec676f38ef69490ee876b12ab10469b9c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.RelativeLocationLocatorTypePermId")
+@JsonObject("as.dto.dataset.id.RelativeLocationLocatorTypePermId")
public class RelativeLocationLocatorTypePermId extends LocatorTypePermId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java
index 2c2a6f3c794ee74af084a8747ec5764a0e1e5bd7..8cff162f60121a718ad3bda6ca31e250a3f5f6b2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.dataset.id.StorageFormatPermId")
+@JsonObject("as.dto.dataset.id.StorageFormatPermId")
public class StorageFormatPermId extends ObjectPermId implements IStorageFormatId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java
index 055222e9041b01ab3468b75191bfc1b6cb63da2c..6150d251dab7808b2d816883ddf2410e6e470aee 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.dataset.search.DataSetChildrenSearchCriteria")
+@JsonObject("as.dto.dataset.search.DataSetChildrenSearchCriteria")
public class DataSetChildrenSearchCriteria extends DataSetSearchCriteria
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java
index 88eed08b2ef7ec559e70e7b3786c1f023ee7795f..fb9eda2c90df39f9b43432f4324c49448a01ebfa 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.dataset.search.DataSetContainerSearchCriteria")
+@JsonObject("as.dto.dataset.search.DataSetContainerSearchCriteria")
public class DataSetContainerSearchCriteria extends DataSetSearchCriteria
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java
index 6df5badaf7fcfc0cc365f983a9b8fbdc5a9cffd9..d4203f40dc50c3945a96337ad09d5f294fd25978 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.dataset.search.DataSetParentsSearchCriteria")
+@JsonObject("as.dto.dataset.search.DataSetParentsSearchCriteria")
public class DataSetParentsSearchCriteria extends DataSetSearchCriteria
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
index 93559c6f4a1f0f969c347152db633b686d54c6aa..03e45448697db2270810f13040a01ea5080a94b4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.search.DataSetSearchCriteria")
+@JsonObject("as.dto.dataset.search.DataSetSearchCriteria")
public class DataSetSearchCriteria extends AbstractEntitySearchCriteria<IDataSetId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java
index 1a37c035f2ee4c83f5a20e884bfdf88442104658..85eced5dff190039cf9f2a70bc50659d31a0030c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.search.DataSetSearchRelation")
+@JsonObject("as.dto.dataset.search.DataSetSearchRelation")
enum DataSetSearchRelation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
index 290fdae47151b554f9a7ab9f7b095f9ef2e2a0a9..c3768b982822c426e31037e833b0c9cb156e0e55 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.update.DataSetUpdate")
+@JsonObject("as.dto.dataset.update.DataSetUpdate")
public class DataSetUpdate implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
index 87bd6fbcc69bc4cd52dbf51046e766513422a7e0..81ff22204d751a71fb2123e693b5f7ad6ebe3765 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.update.LinkedDataUpdate")
+@JsonObject("as.dto.dataset.update.LinkedDataUpdate")
public class LinkedDataUpdate implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java
index cf7ca45e9af924792433397649117289a363c073..3e41b16dddb6810cdec80f92b4f1933431d82e80 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.dataset.update.PhysicalDataUpdate")
+@JsonObject("as.dto.dataset.update.PhysicalDataUpdate")
public class PhysicalDataUpdate implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java
index cfda642dc8e0d9e59ad514c75397eb89ef476cb8..da82767a6b10d72820f92b4e445270e298ee4afd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java
@@ -15,23 +15,22 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.fetchoptions.DataStoreFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.datastore.DataStore")
+@JsonObject("as.dto.datastore.DataStore")
public class DataStore implements Serializable, ICodeHolder, IModificationDateHolder, IRegistrationDateHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java
index 98edff6a43148c1716c6a6bee9c0786bfdd13b55..63885be85d311c5e9c4b9a4e0404ca9ad70dfd84 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.DataStore;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.DataStore;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.datastore.fetchoptions.DataStoreFetchOptions")
+@JsonObject("as.dto.datastore.fetchoptions.DataStoreFetchOptions")
public class DataStoreFetchOptions extends FetchOptions<DataStore> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java
index c1b2fb7b06d317f8fc0313f0189c82799633a86f..eefe9c0508e5deb0bbf473a432aa0bc217c7e516 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.datastore.fetchoptions.DataStoreSortOptions")
+@JsonObject("as.dto.datastore.fetchoptions.DataStoreSortOptions")
public class DataStoreSortOptions extends SortOptions<DataStore>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java
index 65581aee794e43fce74a4fe905e224afe4592cb6..0a1f619ee17216813a4e18548105edb3d0e9ac29 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.datastore.id.DataStorePermId")
+@JsonObject("as.dto.datastore.id.DataStorePermId")
public class DataStorePermId extends ObjectPermId implements IDataStoreId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
index 37b5bc5e248b756fe43344b9012a43afe7a0a85f..f41d31b31e923a4a184655d8b01a4b02e2ae082f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.datastore.id.IDataStoreId")
+@JsonObject("as.dto.datastore.id.IDataStoreId")
public interface IDataStoreId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java
index 5c5c1b36d9b9d0fa30112367162a8aee437a3ae0..f822ccac35d391f03d5380d958fac0832c2daf7b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.deletion.AbstractObjectDeletionOptions")
+@JsonObject("as.dto.deletion.AbstractObjectDeletionOptions")
public class AbstractObjectDeletionOptions implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java
index 35e32a8e9889c240e7826b72264e34d588154902..33f5c204a87cdb8417c129a887dd89de79657f9e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.deletion.DeletedObject")
+@JsonObject("as.dto.deletion.DeletedObject")
public class DeletedObject
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java
index a27991a268e39275ae242efed72883d0a256aef3..be4d94cc0a1d5021e5117c1531e888b552801c43 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java
@@ -15,21 +15,21 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.util.List;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
+import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.deletion.Deletion")
+@JsonObject("as.dto.deletion.Deletion")
public class Deletion implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java
index 8358bf8fd90f97ad018558a5a02f8553da028df9..0ac75e64b1a4a3a1ec5bf10fe794d263ec728c3e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.deletion.fetchoptions.DeletedObjectFetchOptions")
+@JsonObject("as.dto.deletion.fetchoptions.DeletedObjectFetchOptions")
public class DeletedObjectFetchOptions extends EmptyFetchOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java
index 5621e15daf6d71b45926546ad19a75af0b3567c1..891f6f32104ca17e9907240279b302df26b2c174 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java
@@ -15,17 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletedObjectFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.deletion.fetchoptions.DeletionFetchOptions")
+@JsonObject("as.dto.deletion.fetchoptions.DeletionFetchOptions")
public class DeletionFetchOptions extends FetchOptions<Deletion> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java
index 747873ff9da0691eddb64e833dca6ddb387fdd1e..0c4cbec97bc736f76d0af29e97f9cd6a8e2645a4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.deletion.fetchoptions.DeletionSortOptions")
+@JsonObject("as.dto.deletion.fetchoptions.DeletionSortOptions")
public class DeletionSortOptions extends SortOptions<Deletion>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
index 372c2542ebb307f8f9f239910a03c18013edf1a6..e051f4ecd86a421af5791712fb2130ea6f12274d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.deletion.id.DeletionTechId")
+@JsonObject("as.dto.deletion.id.DeletionTechId")
public class DeletionTechId extends ObjectTechId implements IDeletionId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
index 8b43770f9d6123febcb380728f1bb142353f984d..b76d6f2f8b58a61b3adcd5063651289eb7124795 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.deletion.id.IDeletionId")
+@JsonObject("as.dto.deletion.id.IDeletionId")
public interface IDeletionId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java
index 8bc4e773ba186143758c24bee5844bfe21792080..68cf25a1a10f7ebcdac6aa4f8e72506b24af86b4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.deletion.search.DeletionSearchCriteria")
+@JsonObject("as.dto.deletion.search.DeletionSearchCriteria")
public class DeletionSearchCriteria extends AbstractObjectSearchCriteria<IDeletionId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
index 990040a57811c4c4d73dfdb3f8ae4ccb9e41ef07..e6fa88640d1ada6bea554279697e4645cfd5ee8f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.entitytype.id.EntityTypePermId")
+@JsonObject("as.dto.entitytype.id.EntityTypePermId")
public class EntityTypePermId extends ObjectPermId implements IEntityTypeId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java
index 341b155203f4c8d42662e73a86c34b1069486604..d9a9fffa8520e0c65375578c0b1573f9eb91fee8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.entitytype.id.IEntityTypeId")
+@JsonObject("as.dto.entitytype.id.IEntityTypeId")
public interface IEntityTypeId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java
index d2fb45c9240bb3d6cfb8c20723c4ce5f67467a57..cc45a3bae71da19b120913a87023513011aaff61 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.entitytype.search.EntityTypeSearchCriteria")
+@JsonObject("as.dto.entitytype.search.EntityTypeSearchCriteria")
public class EntityTypeSearchCriteria extends AbstractObjectSearchCriteria<IEntityTypeId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
index 5251595e5565016c2fb88fcb03f1ad8a639d394d..35c693911e2cec36ab3e1c8af775a7c98ad31b9d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
@@ -15,6 +15,15 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IAttachmentsHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
@@ -26,7 +35,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationD
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ITagsHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.ExperimentType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions.ExperimentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentIdentifier;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentPermId;
@@ -39,20 +47,12 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.experiment.Experiment")
-public class Experiment implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ITagsHolder
+@JsonObject("as.dto.experiment.Experiment")
+public class Experiment implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder, IPermIdHolder,
+ IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ITagsHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java
index 78130d60cae067be3ea88a0814f9824e678f0785..eeec6440795f01a0c37b4de0894a09a4745619de 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java
@@ -15,24 +15,23 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions.ExperimentTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.experiment.ExperimentType")
+@JsonObject("as.dto.experiment.ExperimentType")
public class ExperimentType implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
index bd72c1845f91e74bfeff10fc490df220a3263b63..7872312ca353733090b79eb74090bb5e17c5da6f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.create.CreateExperimentsOperation")
+@JsonObject("as.dto.experiment.create.CreateExperimentsOperation")
public class CreateExperimentsOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
index b7fec85f49d6f7f5cc21e6a8adbf819762a987d6..662e44cfd71f4c23332711cd93bc51a56f8290a9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.create.CreateExperimentsOperationResult")
+@JsonObject("as.dto.experiment.create.CreateExperimentsOperationResult")
public class CreateExperimentsOperationResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
index 2d16a4479977982c8d9c6610b2b3cfe5930dce72..c51a9cdefc01f58e6334e2d4a554fb152b98fffd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.create.ExperimentCreation")
+@JsonObject("as.dto.experiment.create.ExperimentCreation")
public class ExperimentCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java
index 81df3838c0082071cb1a3d7ac73aa54f2e7d37ae..75af7fa5fa5585f6143fdbe8698b9a9109f3972a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.delete.ExperimentDeletionOptions")
+@JsonObject("as.dto.experiment.delete.ExperimentDeletionOptions")
public class ExperimentDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java
index e95d6ed47b774a5bb20afa21d5a2316555768f5b..a097bdcd30b3222e9193f0dd6f826a945559184e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java
@@ -15,11 +15,14 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions.ExperimentTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions.MaterialFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
@@ -29,14 +32,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchO
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions.TagFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.experiment.fetchoptions.ExperimentFetchOptions")
+@JsonObject("as.dto.experiment.fetchoptions.ExperimentFetchOptions")
public class ExperimentFetchOptions extends FetchOptions<Experiment> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java
index 8aa2012e221c0bf7cc450e1a9c9c495415fed815..97a2ed1fa6f2acd60ffeb982a6976d8d610def13 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.fetchoptions.ExperimentSortOptions")
+@JsonObject("as.dto.experiment.fetchoptions.ExperimentSortOptions")
public class ExperimentSortOptions extends EntityWithPropertiesSortOptions<Experiment>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java
index 92d9962255a370fb3e2c8e742caa94382d04972e..cceea2bcbb8ead5cc1a696efaac00c4e740ccbf0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.ExperimentType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.ExperimentType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.experiment.fetchoptions.ExperimentTypeFetchOptions")
+@JsonObject("as.dto.experiment.fetchoptions.ExperimentTypeFetchOptions")
public class ExperimentTypeFetchOptions extends FetchOptions<ExperimentType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java
index 4251ee02d41bd19a6e354a440b6d8ed8d5fba0f3..23bd60ef7c8b50459428cb77e9df80e0025314f4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.fetchoptions.ExperimentTypeSortOptions")
+@JsonObject("as.dto.experiment.fetchoptions.ExperimentTypeSortOptions")
public class ExperimentTypeSortOptions extends SortOptions<ExperimentType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
index 74422c46fca8e86d72ec9cd64ece495b4ca440b1..d4b1de0db53a5a0e0861641f22052fc666987206 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.history.ExperimentRelationType")
+@JsonObject("as.dto.experiment.history.ExperimentRelationType")
public enum ExperimentRelationType implements IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java
index 87f063316f2003afece161827324a163414de003..e8e4a68bf12fefd579e103b9c39d3ec590e2726c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.experiment.id.ExperimentIdentifier")
+@JsonObject("as.dto.experiment.id.ExperimentIdentifier")
public class ExperimentIdentifier extends ObjectIdentifier implements IExperimentId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java
index 600ba084e62061f0ffceb653670fb544ebd80831..4912782c137b99c1a465a8b64c8282d071a258f8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.experiment.id.ExperimentPermId")
+@JsonObject("as.dto.experiment.id.ExperimentPermId")
public class ExperimentPermId extends ObjectPermId implements IExperimentId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java
index 6a72404c82418f1892ee57b9ad3481145d162a75..06a7918daf3d32a39f8f0ff37452600d2bde861d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.experiment.id.IExperimentId")
+@JsonObject("as.dto.experiment.id.IExperimentId")
public interface IExperimentId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperation.java
index 2c5b44306af29fcbcb0d62d3d1e8561080293aa0..d9034356acf04b106d20b38c1432ffda8c90139a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperation.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.list.ListExperimentsOperation")
+@JsonObject("as.dto.experiment.list.ListExperimentsOperation")
public class ListExperimentsOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperationResult.java
index 95a5ec73c56d2cadcfbd0fe2bcd38b2d5f950e3a..46962dcbdbbd0a2a3895bcb1cb2f0ec3c6600056 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/list/ListExperimentsOperationResult.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.list.ListExperimentsOperationResult")
+@JsonObject("as.dto.experiment.list.ListExperimentsOperationResult")
public class ListExperimentsOperationResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
index e98516a423e96c712a1719ac3a8bd8bdd958386a..a074e21f6840a6e11b9b0e32cef65bd731259dd0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.ExperimentSearchCriteria")
+@JsonObject("as.dto.experiment.search.ExperimentSearchCriteria")
public class ExperimentSearchCriteria extends AbstractEntitySearchCriteria<IExperimentId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
index 5047bae136428a8324c43d60cab78a2189026172..7ffca7fe25cfd3c552183b2a1f5932a6c39a131c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.NoExperimentSearchCriteria")
+@JsonObject("as.dto.experiment.search.NoExperimentSearchCriteria")
public class NoExperimentSearchCriteria implements ISearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java
index a80247830ca764522ef6ae1db2742627cd57f344..db1da48c0df097f310fa4de0801647b58d7dbcf4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.SearchExperimentsOperation")
+@JsonObject("as.dto.experiment.search.SearchExperimentsOperation")
public class SearchExperimentsOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java
index b737a9e7499036546dae37903cfdf7a5dcf0a5ea..a2ef9879117a8f3031d37a26f8f046605b03017a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.SearchExperimentsOperationResult")
+@JsonObject("as.dto.experiment.search.SearchExperimentsOperationResult")
public class SearchExperimentsOperationResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
index 0a66f84937f244f58fd337b8bf48bc02d7016450..ace9552a7b86670abea4e863a3eecb098c4f359a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.update.ExperimentUpdate")
+@JsonObject("as.dto.experiment.update.ExperimentUpdate")
public class ExperimentUpdate implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java
index 7c07100fff3eed09d9b38c5d406b0bca641c41a2..4d2fa40d193c5fa076caed9a11ebe05f1ac09fb0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.update.UpdateExperimentsOperation")
+@JsonObject("as.dto.experiment.update.UpdateExperimentsOperation")
public class UpdateExperimentsOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java
index 9430e0477af462ed51603338a7a34e9f049cb3e8..af7ed99ae8a38ddc92fb4b2ba520199a19d7715b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.update.UpdateExperimentsOperationResult")
+@JsonObject("as.dto.experiment.update.UpdateExperimentsOperationResult")
public class UpdateExperimentsOperationResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
index 8961e2afc0980e98389a62994369e9ffba6dec73..92b111e03c2c937ec5a7b7dc415f993fffe1c32d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions.ExternalDmsFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions.ExternalDmsFetchOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.externaldms.ExternalDms")
+@JsonObject("as.dto.externaldms.ExternalDms")
public class ExternalDms implements Serializable, ICodeHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java
index 3122925eafe72169c92fa39eaba63233dd04e3fc..5494ed809a8c7a99c4791a2d236df503f2958b22 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.externaldms.fetchoptions.ExternalDmsFetchOptions")
+@JsonObject("as.dto.externaldms.fetchoptions.ExternalDmsFetchOptions")
public class ExternalDmsFetchOptions extends FetchOptions<ExternalDms> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java
index 63fd57d3a1a4f097d7095f9ac279d4fe56174b94..4dd00438d095f58eec188a5634bf3241a1eae9e1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.externaldms.fetchoptions.ExternalDmsSortOptions")
+@JsonObject("as.dto.externaldms.fetchoptions.ExternalDmsSortOptions")
public class ExternalDmsSortOptions extends SortOptions<ExternalDms>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java
index af7541f9e843545d6f43b3f6296be98233b02625..63fbd1b7b84d0b79ef9bd49557df0f0f07459d55 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.externaldms.id.ExternalDmsPermId")
+@JsonObject("as.dto.externaldms.id.ExternalDmsPermId")
public class ExternalDmsPermId extends ObjectPermId implements IExternalDmsId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
index 01972e2fb7431d465e6f225a004e2e23eabe3d0b..55aa81fe4e95094907be96640843a977e0ced864 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.externaldms.id.IExternalDmsId")
+@JsonObject("as.dto.externaldms.id.IExternalDmsId")
public interface IExternalDmsId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java
index ccce35103fd59cf0a61f424243b4af91172a885d..e679dfbec2deda14bc7b20589831b02bb415013e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.global.search.GlobalSearchTextCriteria")
+@JsonObject("as.dto.global.search.GlobalSearchTextCriteria")
public class GlobalSearchTextCriteria extends AbstractFieldSearchCriteria<StringContainsValue>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java
index 5f57587d9920d2710b3886a4d1c0bd34bcb5423f..9ab54c3bae45f96222819b2f0c7818902de64355 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java
@@ -15,21 +15,21 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.history;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
+import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.util.Date;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
+import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.history.HistoryEntry")
+@JsonObject("as.dto.history.HistoryEntry")
public class HistoryEntry implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
index d1f14bfa77f4cfe9fd391452f2da52d870a5d5a7..dad78c74a60ee8ed32272246010bac6784d3fb39 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.history.IRelationType")
+@JsonObject("as.dto.history.IRelationType")
public interface IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
index 8c0e2b831e8f6a5d730e5a09039be2b0bbd2629b..ee61fd66d499bbff94fabf11bde626c96bd722dc 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.history.PropertyHistoryEntry")
+@JsonObject("as.dto.history.PropertyHistoryEntry")
public class PropertyHistoryEntry extends HistoryEntry
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
index 90c73b293330a3d9519e6e2606431eb5106c1873..8db01514ed52db9327accc9136ca5ef7a568bd4e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.history.RelationHistoryEntry")
+@JsonObject("as.dto.history.RelationHistoryEntry")
public class RelationHistoryEntry extends HistoryEntry
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java
index a929c169c0596c85d71be1e66922994afafc5ae6..1cb9198c78197fee16052f352f099d0a16c2c841 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java
@@ -15,19 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.HistoryEntry;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.history.fetchoptions.HistoryEntryFetchOptions")
+@JsonObject("as.dto.history.fetchoptions.HistoryEntryFetchOptions")
public class HistoryEntryFetchOptions extends FetchOptions<HistoryEntry> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java
index b2e13d34d5eaeb567e37c0437d975cf6de256819..d21cd89f80c9e97a36b8c9c2930a7dfec358ff13 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.history.fetchoptions.HistoryEntrySortOptions")
+@JsonObject("as.dto.history.fetchoptions.HistoryEntrySortOptions")
public class HistoryEntrySortOptions extends SortOptions<HistoryEntry>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
index efd8a73e0d42cdf682bd7b6bb1709aa3d299ff07..f7e3b89e533dc00eb075894c456762d68f8a8ef9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
@@ -15,6 +15,15 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.material;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
@@ -23,8 +32,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationD
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ITagsHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.HistoryEntry;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions.MaterialFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.MaterialPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
@@ -32,20 +39,12 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.material.Material")
-public class Material implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ITagsHolder
+@JsonObject("as.dto.material.Material")
+public class Material implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder,
+ IRegistratorHolder, ITagsHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java
index e5fc3b7d390b8c7b7431566a5e63e5cd48a5b324..37cbf3b1eeb08c65505b53d553fceb82ce57ce1b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java
@@ -15,24 +15,23 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.material;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions.MaterialTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.material.MaterialType")
+@JsonObject("as.dto.material.MaterialType")
public class MaterialType implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
index 06a16ed1f8a3f4254777ecb5697ae5243c0dfa08..a213daff00fc5a5a65b8b5b828dd537585ebf348 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.material.create.MaterialCreation")
+@JsonObject("as.dto.material.create.MaterialCreation")
public class MaterialCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
index e3ef9799e474f0f65a6433225f4fc986107eea7e..ec812dfe3e520f78c1be0bf050b40e985e5f5793 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.material.delete.MaterialDeletionOptions")
+@JsonObject("as.dto.material.delete.MaterialDeletionOptions")
public class MaterialDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java
index dd5ebaa072d237b37cf3323c009b210787554fad..f4040167c9e7e70e5ff1793e6016a4bf68b0b3df 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java
@@ -15,24 +15,22 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions.MaterialFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions.MaterialTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions.TagFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.material.fetchoptions.MaterialFetchOptions")
+@JsonObject("as.dto.material.fetchoptions.MaterialFetchOptions")
public class MaterialFetchOptions extends FetchOptions<Material> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java
index 62368b22cfd30a3d8762e92da2e4dcd26edb60f2..d29f9c6cf9b80596d7d47cf2621b91adf1f32251 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.material.fetchoptions.MaterialSortOptions")
+@JsonObject("as.dto.material.fetchoptions.MaterialSortOptions")
public class MaterialSortOptions extends EntityWithPropertiesSortOptions<Material>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java
index d99d34cd8cccf224245c06922a3e4235a9d13c46..b803f17e56c9d52f3770dfce3a377ba62eab0d45 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.material.fetchoptions.MaterialTypeFetchOptions")
+@JsonObject("as.dto.material.fetchoptions.MaterialTypeFetchOptions")
public class MaterialTypeFetchOptions extends FetchOptions<MaterialType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java
index 60e055e24a5fe4f90b8e062532c5332b58467039..fce3f3e6ccbf68e06fa6d438fadcbd5623a90a7c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.material.fetchoptions.MaterialTypeSortOptions")
+@JsonObject("as.dto.material.fetchoptions.MaterialTypeSortOptions")
public class MaterialTypeSortOptions extends SortOptions<MaterialType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java
index fa32debbd548fa2e567ee668ebeef60ea22abd33..9fd794434563574e237a1677672f460bad7886cb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.material.id.IMaterialId")
+@JsonObject("as.dto.material.id.IMaterialId")
public interface IMaterialId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
index 7edbe85f4a7808276b6117e548db8260254a4b8e..0d5bf609a1ba41d01aeed6e9600dcd696cc34342 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.material.id.MaterialPermId")
+@JsonObject("as.dto.material.id.MaterialPermId")
public class MaterialPermId implements IMaterialId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
index f8dd600e7573593ad9910ffcdf4e762cda1cbf85..eb4d2da2b80d3c61071241bd08e4217540bc7af6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.material.search.MaterialSearchCriteria")
+@JsonObject("as.dto.material.search.MaterialSearchCriteria")
public class MaterialSearchCriteria extends AbstractEntitySearchCriteria<IMaterialId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
index efd8ebf57bc543bdf1c3f5974b72547dbe28aa69..9ff4d43e5594c051fbae8a5cc27d0a52af96c1df 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.material.update.MaterialUpdate")
+@JsonObject("as.dto.material.update.MaterialUpdate")
public class MaterialUpdate implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java
index c4aa06672ff98c35a752c3d3172a46a16ca2eb54..bf780136be7994ab187b883d8dd318c7d22a5d7f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java
@@ -19,12 +19,12 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification;
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- * Enumeration of object kinds. An object kind is an attribute an object (like a sample, a data set type or a vocabulary term)
- * which can be created, deleted or updated.
- *
+ * Enumeration of object kinds. An object kind is an attribute an object (like a sample, a data set type or a vocabulary term) which can be created,
+ * deleted or updated.
+ *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.objectkindmodification.ObjectKind")
+@JsonObject("as.dto.objectkindmodification.ObjectKind")
public enum ObjectKind
{
AUTHORIZATION_GROUP, SAMPLE, EXPERIMENT, MATERIAL, DATA_SET, SAMPLE_TYPE, EXPERIMENT_TYPE,
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java
index c4bdfe9ff06cc168416101edaef8ef40302fe937..7ca6e3115f08a498cebd7ad4b513175728841961 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.ObjectKind;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.OperationKind;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
-import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.objectkindmodification.ObjectKindModification")
+@JsonObject("as.dto.objectkindmodification.ObjectKindModification")
public class ObjectKindModification implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -101,7 +100,7 @@ public class ObjectKindModification implements Serializable
@Override
public String toString()
{
- return "Last " + operationKind + " operation of an object of kind " + objectKind + " occured at " + lastModificationTimeStamp;
+ return "Last " + operationKind + " operation of an object of kind " + objectKind + " occured at " + lastModificationTimeStamp;
}
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
index 7765168ce6678de06ad961068bedfb44a0a82026..5f6717a9241990c5eb93caf61e737c0dc2ee240f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
@@ -20,10 +20,10 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Enumeration of operations which can be applied to an object.
- *
+ *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.objectkindmodification.OperationKind")
+@JsonObject("as.dto.objectkindmodification.OperationKind")
public enum OperationKind
{
CREATE_OR_DELETE, UPDATE
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java
index 5607adc97b1837df22a75c88ae51022d8685c67e..f852139e2b94940cb3bebe576c380241a20b4584 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java
@@ -15,16 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.ObjectKindModification;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions")
+@JsonObject("as.dto.objectkindmodification.fetchoptions.ObjectKindModificationFetchOptions")
public class ObjectKindModificationFetchOptions extends FetchOptions<ObjectKindModification> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
index 309adab0de98a0a595422dd585563d4571aabd16..69975e193780d8bca079a645042013c2e67c012f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
@@ -21,11 +21,9 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.ObjectKin
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.objectkindmodification.fetchoptions.ObjectKindModificationSortOptions")
+@JsonObject("as.dto.objectkindmodification.fetchoptions.ObjectKindModificationSortOptions")
public class ObjectKindModificationSortOptions extends SortOptions<ObjectKindModification>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java
index 422d03ab16a43fb65e4f6365f7b0327fcfc2f5cc..2aeaa605af0ba01827b21cd5f02b91a66147c76c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java
@@ -26,14 +26,13 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.Operation
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.objectkindmodification.search.ObjectKindModificationSearchCriteria")
+@JsonObject("as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria")
public class ObjectKindModificationSearchCriteria implements ISearchCriteria
{
private List<ObjectKind> objectKinds = new ArrayList<>();
+
private List<OperationKind> operationKinds = new ArrayList<>();
private static final long serialVersionUID = 1L;
@@ -43,7 +42,7 @@ public class ObjectKindModificationSearchCriteria implements ISearchCriteria
this.objectKinds.addAll(Arrays.asList(someObjectKinds));
return this;
}
-
+
public ObjectKindModificationSearchCriteria withOperationKinds(OperationKind... someOperationKinds)
{
this.operationKinds.addAll(Arrays.asList(someOperationKinds));
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java
index aa929d1e8bc53d7c108f2ebbb89390737d2c1845..9b11b5c23830f7d6d2616404f4dcee4bf2ff431a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java
@@ -15,27 +15,26 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.person;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ISpaceHolder;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.id.PersonPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.person.Person")
+@JsonObject("as.dto.person.Person")
public class Person implements Serializable, IPermIdHolder, IRegistrationDateHolder, IRegistratorHolder, ISpaceHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java
index 2eec49ab3e5863a4ca5b68f377f83913b07a8897..73f77042cc15cef63f5f57404b9bb1aecd16c347 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions.SpaceFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.person.fetchoptions.PersonFetchOptions")
+@JsonObject("as.dto.person.fetchoptions.PersonFetchOptions")
public class PersonFetchOptions extends FetchOptions<Person> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java
index c5eb124116c05ccc1610f492eb6edf2d4b2f91cc..ce26ef9086680470a6e46bc513f18cad0a14d86a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.person.fetchoptions.PersonSortOptions")
+@JsonObject("as.dto.person.fetchoptions.PersonSortOptions")
public class PersonSortOptions extends SortOptions<Person>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java
index 9d76c76d8e8af11f73ea35b63d6429648a568942..7433d9d67cd32b12253a050d8f0870ae572f6207 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.person.id.IPersonId")
+@JsonObject("as.dto.person.id.IPersonId")
public interface IPersonId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
index 7a165a6e6156cbfd3184b9ecca9598efa7aaf5a3..8d1332e88ec9724ef089555f53f9e24afe0e45d8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.person.id.PersonPermId")
+@JsonObject("as.dto.person.id.PersonPermId")
public class PersonPermId extends ObjectPermId implements IPersonId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java
index 31cd77e917b21d1c560e0d25900779536332d702..25b239c2b5d8ab28bfb3f8fe39f3f74bda0e491c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java
@@ -15,6 +15,13 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.project;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IAttachmentsHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
@@ -35,18 +42,12 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.project.Project")
-public class Project implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder, IPermIdHolder, IRegistrationDateHolder, IRegistratorHolder, ISpaceHolder
+@JsonObject("as.dto.project.Project")
+public class Project implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder, IPermIdHolder,
+ IRegistrationDateHolder, IRegistratorHolder, ISpaceHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java
index b22cb43e0d5e516090b5a15709ae5cedb0adff8d..e47c8e4863de4b1d623fb4e39a7a5645b26ac456 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.create.ProjectCreation")
+@JsonObject("as.dto.project.create.ProjectCreation")
public class ProjectCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java
index 4e69a26113defc7afc9aa9ad49786d666000c9f3..a3f45de9f7bd74650b6f3165580365a0845f7e01 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.delete.ProjectDeletionOptions")
+@JsonObject("as.dto.project.delete.ProjectDeletionOptions")
public class ProjectDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java
index a2efca4cbc465188967dac765acaba4cc194d76a..3f6a9efa589b411065af1c23c93b80003d16c1c4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java
@@ -15,6 +15,10 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions.ExperimentFetchOptions;
@@ -25,14 +29,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchO
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions.SpaceFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.project.fetchoptions.ProjectFetchOptions")
+@JsonObject("as.dto.project.fetchoptions.ProjectFetchOptions")
public class ProjectFetchOptions extends FetchOptions<Project> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java
index aaf722ee86fd5a50dd6853f5b3c94a12ed7c3e3b..d8ca5db64d7692f973dfc1ff5b1202b33489dda3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.fetchoptions.ProjectSortOptions")
+@JsonObject("as.dto.project.fetchoptions.ProjectSortOptions")
public class ProjectSortOptions extends EntitySortOptions<Project>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
index f27dc5475440a73b617a0bcb20c370f9f75d0d47..93ba8956224b01843ce657ad6c4a3c9021627f10 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.history.ProjectRelationType")
+@JsonObject("as.dto.project.history.ProjectRelationType")
public enum ProjectRelationType implements IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java
index b3810522bb68d018835c6a626f1fbf6b5a95ed67..3e5ff7740790ce9aeddddf2e7735acdc2a22c425 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.project.id.IProjectId")
+@JsonObject("as.dto.project.id.IProjectId")
public interface IProjectId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java
index 5d0e9b412d31eaa1c0002070fa59f1ba216427c9..5a0f1673cc4e77c51c70bdab87c1ebab982c2dd8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.project.id.ProjectIdentifier")
+@JsonObject("as.dto.project.id.ProjectIdentifier")
public class ProjectIdentifier extends ObjectIdentifier implements IProjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java
index 824999c5635a43c1371ac8dbf94c365539e1d5d5..3060a7ee83d5538ac43a3b8820624d095981b326 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.project.id.ProjectPermId")
+@JsonObject("as.dto.project.id.ProjectPermId")
public class ProjectPermId extends ObjectPermId implements IProjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
index 04ffd063d6bfea830167b1dda95faa2dccf991fd..850d6f58c83a882f9564311e2cbdcb7e24635ef7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.search.NoProjectSearchCriteria")
+@JsonObject("as.dto.project.search.NoProjectSearchCriteria")
public class NoProjectSearchCriteria implements ISearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java
index 8f07ba68a0a7ff0ee20f6f5a5bd784148e14df8a..4b41032df07f5c11ed97e5e5f507f621d47f7d68 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.search.ProjectSearchCriteria")
+@JsonObject("as.dto.project.search.ProjectSearchCriteria")
public class ProjectSearchCriteria extends AbstractObjectSearchCriteria<IProjectId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java
index 808feb76e553d37b4c51e401ef3a33b29ec3bfb1..b08ad749a52534c3709a26ea46d1ce09bbc180b0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.project.update.ProjectUpdate")
+@JsonObject("as.dto.project.update.ProjectUpdate")
public class ProjectUpdate implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java
index c10e98aaf09d1c88c292a7e7fb1591c0bc7ddaa2..7ec94dfdf992666afc58e76c8d322bd95850a0de 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.property.fetchoptions.PropertyFetchOptions")
+@JsonObject("as.dto.property.fetchoptions.PropertyFetchOptions")
public class PropertyFetchOptions extends EmptyFetchOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
index 94b8fed90ce791161703fad247a7cfd7d9d733f8..6a06812beb4bbde23744094c2916ac6e179221c5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
@@ -15,6 +15,15 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IAttachmentsHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
@@ -33,8 +42,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.HistoryEntry;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SampleIdentifier;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId;
@@ -43,20 +50,12 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.sample.Sample")
-public class Sample implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder, IParentChildrenHolder<Sample>, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ISpaceHolder, ITagsHolder
+@JsonObject("as.dto.sample.Sample")
+public class Sample implements Serializable, IAttachmentsHolder, ICodeHolder, IModificationDateHolder, IModifierHolder,
+ IParentChildrenHolder<Sample>, IPermIdHolder, IPropertiesHolder, IRegistrationDateHolder, IRegistratorHolder, ISpaceHolder, ITagsHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java
index a41e9fbd99c1d50b36756554676ebd4e5949752d..ef56497714ff65adc379639fad74cd2719f63e2a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java
@@ -15,24 +15,23 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleTypeFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.sample.SampleType")
+@JsonObject("as.dto.sample.SampleType")
public class SampleType implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
index 5175ba38178716964bf5a97456a28d3d18a194a5..aa6029676d5b0210410dffaf5f34dab3e35f0ff9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.create.CreateSamplesOperation")
+@JsonObject("as.dto.sample.create.CreateSamplesOperation")
public class CreateSamplesOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java
index 63001763a01e6b300fc96e67afcc47e2ec07e039..ac04601b7ccd3792ab141206fd598d54a05aaacc 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.create.CreateSamplesResult")
+@JsonObject("as.dto.sample.create.CreateSamplesResult")
public class CreateSamplesResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
index bacfc8d7ff3a8c2fe993ffe868727d228c95d267..eaf8b5323fac765c1805f53b9850833dcdf2a530 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
@@ -35,7 +35,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.create.SampleCreation")
+@JsonObject("as.dto.sample.create.SampleCreation")
public class SampleCreation implements Serializable, ICreationIdHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java
index 000b137c73e441cb64cc3e373737a6a91b995360..e88df729649d1981a458926a327f54c049af2ef5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.delete.SampleDeletionOptions")
+@JsonObject("as.dto.sample.delete.SampleDeletionOptions")
public class SampleDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java
index 6e806a38546b43830e549b17ace9f45731a64699..2c8635cb83902cec927a2fe8648db76c847c798f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java
@@ -15,6 +15,10 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
@@ -25,20 +29,14 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchO
import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.fetchoptions.ProjectFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions.SpaceFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions.TagFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.sample.fetchoptions.SampleFetchOptions")
+@JsonObject("as.dto.sample.fetchoptions.SampleFetchOptions")
public class SampleFetchOptions extends FetchOptions<Sample> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java
index f6b2f9248c21ea27e792390ac082b3178d945834..3158cb40754ff595ca5d3efa2c6f014c8f431502 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.fetchoptions.SampleSortOptions")
+@JsonObject("as.dto.sample.fetchoptions.SampleSortOptions")
public class SampleSortOptions extends EntityWithPropertiesSortOptions<Sample>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java
index 9c70ae85c82192a128008dc839ed8964dcbef01f..4af635ab4eb02076749c037d62e53eb3726fa094 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java
@@ -15,18 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
-import ch.systemsx.cisd.base.annotation.JsonObject;
+import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.sample.fetchoptions.SampleTypeFetchOptions")
+@JsonObject("as.dto.sample.fetchoptions.SampleTypeFetchOptions")
public class SampleTypeFetchOptions extends FetchOptions<SampleType> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java
index e05d5251eb75b1f084647be859c4c082a2c6a91a..5d6b3355909e8386cb642a49fb86798b83aaf26d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.fetchoptions.SampleTypeSortOptions")
+@JsonObject("as.dto.sample.fetchoptions.SampleTypeSortOptions")
public class SampleTypeSortOptions extends SortOptions<SampleType>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
index 076708cfa8c4e1ba7987646125232be699d28e6f..dafa9ff35ab04cb11129fc5ede9dccfd3e06ee16 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.history.SampleRelationType")
+@JsonObject("as.dto.sample.history.SampleRelationType")
public enum SampleRelationType implements IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java
index e4857d556bfe9f9f26aefe6e1c653ee2e4b1782d..b9a95885f0aea0d63b1187979799fa7c70fc7a0e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.sample.id.ISampleId")
+@JsonObject("as.dto.sample.id.ISampleId")
public interface ISampleId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java
index 2b6b5cda3605babf4d80f397c6eb3f324d38529e..37eef13b576d1ea3e28418ad761b395c757f313a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.sample.id.SampleIdentifier")
+@JsonObject("as.dto.sample.id.SampleIdentifier")
public class SampleIdentifier extends ObjectIdentifier implements ISampleId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java
index b6a21fa350ccc1780e957ba1674f1b8b5a4f3909..02f1dcb2100de025fee971e055544937d9686d09 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.sample.id.SamplePermId")
+@JsonObject("as.dto.sample.id.SamplePermId")
public class SamplePermId extends ObjectPermId implements ISampleId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
index 71aedf29de34ed324619d5432fe1ebde9ebf03c9..3e2369ee6f3c9db872d9005a2569e3031d5cf9a2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.NoSampleContainerSearchCriteria")
+@JsonObject("as.dto.sample.search.NoSampleContainerSearchCriteria")
public class NoSampleContainerSearchCriteria extends NoSampleSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
index a5a03150c0152895a49cbc0f7cd803a770a0500c..fc1904f7e9c792601bf35bd6b2ea6042dda8a4c6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.NoSampleSearchCriteria")
+@JsonObject("as.dto.sample.search.NoSampleSearchCriteria")
public class NoSampleSearchCriteria implements ISearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java
index 1cdf550a313db17b83feef8056fbcf94c7ff1eeb..07e991c4aa026a7ecb5c23c80cb28b2f38d71528 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.SampleChildrenSearchCriteria")
+@JsonObject("as.dto.sample.search.SampleChildrenSearchCriteria")
public class SampleChildrenSearchCriteria extends SampleSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java
index 237babbacdba70fa868fdc7bf17218ac187cdf74..b3177043ebf75706d68986220b9dc2d99d406d08 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.SampleContainerSearchCriteria")
+@JsonObject("as.dto.sample.search.SampleContainerSearchCriteria")
public class SampleContainerSearchCriteria extends SampleSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java
index 43b9b2a65f22f80a6d4b7259810df9d85414dd4e..8ff43ed07f92161d5ed6d875c332d2bba8153241 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.SampleParentsSearchCriteria")
+@JsonObject("as.dto.sample.search.SampleParentsSearchCriteria")
public class SampleParentsSearchCriteria extends SampleSearchCriteria
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
index 4165299ede0a7c7b703813ea1c730be0de4dd0c5..06b7d4cea5ce262016011ebaad8aec5e431ef083 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.SampleSearchCriteria")
+@JsonObject("as.dto.sample.search.SampleSearchCriteria")
public class SampleSearchCriteria extends AbstractEntitySearchCriteria<ISampleId>
{
@@ -63,7 +63,7 @@ public class SampleSearchCriteria extends AbstractEntitySearchCriteria<ISampleId
with(new NoProjectSearchCriteria());
return this;
}
-
+
public ExperimentSearchCriteria withExperiment()
{
return with(new ExperimentSearchCriteria());
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java
index d67d98b801310d9d132a687738740b048b47cf7b..ce4bcc3059eec4e36c7ce89014d44969ee5cbbd9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.search.SampleSearchRelation")
+@JsonObject("as.dto.sample.search.SampleSearchRelation")
enum SampleSearchRelation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
index 4df5c51e8ca8ad098ad4225483f6c22d05849e79..a9a2be17c47ab6e33cb308b1af5abedd79e3ea41 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.update.SampleUpdate")
+@JsonObject("as.dto.sample.update.SampleUpdate")
public class SampleUpdate implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
index 0d5e70957c424bfa698ee27fd9c36d4315e7309a..38f72dd1406c3340f56dc103a7dfd7a05ef195c9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.sample.update.UpdateSamplesOperation")
+@JsonObject("as.dto.sample.update.UpdateSamplesOperation")
public class UpdateSamplesOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java
index 05e4230e5de8be435e9cb85df13e965cba4618bb..dcc4a301c41e1258993a503e0347958cd072bfa6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java
@@ -15,18 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.service;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions.CustomASServiceFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.id.CustomASServiceCode;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.service.CustomASService")
+@JsonObject("as.dto.service.CustomASService")
public class CustomASService implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java
index 4314b4e9cb681956a425f00ccd1659e94a0afbfc..4e1aa331189c31d49457a9f633c7e7e0e07d1403 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java
@@ -23,23 +23,21 @@ import java.util.Map;
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.service.CustomASServiceExecutionOptions")
+@JsonObject("as.dto.service.CustomASServiceExecutionOptions")
public class CustomASServiceExecutionOptions implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
private final Map<String, Object> parameters = new HashMap<String, Object>();
-
+
public CustomASServiceExecutionOptions withParameter(String parameterName, Object value)
{
parameters.put(parameterName, value);
return this;
}
-
+
public Map<String, Object> getParameters()
{
return parameters;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java
index 11fa635615f260705ac37903d4901d331dc5c89f..fc3fe4c3aaa2086b9ae29b2ba4bc0d924f9e3bdb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java
@@ -15,16 +15,18 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASService;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.service.fetchoptions.CustomASServiceFetchOptions")
+@JsonObject("as.dto.service.fetchoptions.CustomASServiceFetchOptions")
public class CustomASServiceFetchOptions extends FetchOptions<CustomASService> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java
index 193c9f044b829474f1811f4dab6170cd86ba56e8..9e68f693f898a2898008da1fd3cc20f8b05cc53d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java
@@ -21,11 +21,9 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASService;
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.service.fetchoptions.CustomASServiceSortOptions")
+@JsonObject("as.dto.service.fetchoptions.CustomASServiceSortOptions")
public class CustomASServiceSortOptions extends SortOptions<CustomASService>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java
index 0aad2e6f2f77ad0313e36bea161b5cdac7287b2e..5e4852432eefb32ff6086a14984e84eefc75941b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.service.id.CustomASServiceCode")
+@JsonObject("as.dto.service.id.CustomASServiceCode")
public class CustomASServiceCode extends ObjectPermId implements ICustomASServiceId
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java
index c25d5c21f9b502e10ffc645d332799b208d2707b..a532c3c3be6ae8aaa9297727985825a405a488cb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java
@@ -21,10 +21,10 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Holds information that uniquely identifies a custom AS service.
- *
+ *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.service.id.ICustomASServiceId")
+@JsonObject("as.dto.service.id.ICustomASServiceId")
public interface ICustomASServiceId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java
index 6aa1d18d07561b294428a4a1971f4adb4e13f8bf..7df1d898f3ef21641b2a98f96233793a75626a82 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java
@@ -23,11 +23,9 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.id.ICustomASServiceId;
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-@JsonObject("dto.service.search.CustomASServiceSearchCriteria")
+@JsonObject("as.dto.service.search.CustomASServiceSearchCriteria")
public class CustomASServiceSearchCriteria extends AbstractObjectSearchCriteria<ICustomASServiceId>
{
private static final long serialVersionUID = 1L;
@@ -35,7 +33,7 @@ public class CustomASServiceSearchCriteria extends AbstractObjectSearchCriteria<
public CustomASServiceSearchCriteria()
{
}
-
+
public CodeSearchCriteria withCode()
{
return with(new CodeSearchCriteria());
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java
index 1a1609d9c43801b37d00b32514f93f8d2209cadb..e748b968413dad8df93a2de33dbd7741801ae928 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java
@@ -15,6 +15,13 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.space;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
@@ -28,17 +35,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpacePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.space.Space")
+@JsonObject("as.dto.space.Space")
public class Space implements Serializable, ICodeHolder, IModificationDateHolder, IPermIdHolder, IRegistrationDateHolder, IRegistratorHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java
index 43381cb0d3ff5d5b5bcdd68e0ab15e0d1d792ec6..f414b90020ad9f7145795441776bf870b3f417d7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.space.create.SpaceCreation")
+@JsonObject("as.dto.space.create.SpaceCreation")
public class SpaceCreation implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java
index f36bb87fb944a45c24cd4f6d9c6dbcacb9fc2b85..dd94296d273881d205393388917a4798eec513d3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.space.delete.SpaceDeletionOptions")
+@JsonObject("as.dto.space.delete.SpaceDeletionOptions")
public class SpaceDeletionOptions extends AbstractObjectDeletionOptions
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java
index d2b4a386ba944a1fd38f0e20c48a2d174907d459..b60c5136d524b7763232d8a23a7a5eb05f9168e6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java
@@ -15,6 +15,10 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.fetchoptions.ProjectFetchOptions;
@@ -22,14 +26,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchO
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.space.fetchoptions.SpaceFetchOptions")
+@JsonObject("as.dto.space.fetchoptions.SpaceFetchOptions")
public class SpaceFetchOptions extends FetchOptions<Space> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
index bd1f9b6d22cb1a9885709be9c74c05d1c229bc89..32fb9ee471c46f8a8e57e825c8760d82a3ac9ba6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.space.fetchoptions.SpaceSortOptions")
+@JsonObject("as.dto.space.fetchoptions.SpaceSortOptions")
public class SpaceSortOptions extends EntitySortOptions<Space>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java
index b853199049e05f4f056cbc07ff8d038949bbadb8..3ae907e7a0d60c7cd84921bdf63707d4b80a75af 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.space.id.ISpaceId")
+@JsonObject("as.dto.space.id.ISpaceId")
public interface ISpaceId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
index 43f96a5a7b0c3414196031435c6abbabd0d12d05..554f96c921e3d74ef04b2742dad8ae2b4ee9c2cf 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.space.id.SpacePermId")
+@JsonObject("as.dto.space.id.SpacePermId")
public class SpacePermId extends ObjectPermId implements ISpaceId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java
index 68b9384e2f82db55d176bc902fc3560e1b5d62f9..3347a73a824a097b50b83f2fe717b8acf5ce72e7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.space.search.SpaceSearchCriteria")
+@JsonObject("as.dto.space.search.SpaceSearchCriteria")
public class SpaceSearchCriteria extends AbstractObjectSearchCriteria<ISpaceId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java
index 4b8c5164d50252951ee37940509d62456aff5e98..8cfe940b573c9956aaf96146df4d947d69420dc4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.space.update.SpaceUpdate")
+@JsonObject("as.dto.space.update.SpaceUpdate")
public class SpaceUpdate implements Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java
index 1f47e3ef370bb01df74abad0c11160656a9c297d..fe9002e1a2abc81d6e9219d7e3b1a2748f8890c2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java
@@ -15,6 +15,12 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPermIdHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
@@ -24,16 +30,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.TagPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.tag.Tag")
+@JsonObject("as.dto.tag.Tag")
public class Tag implements Serializable, ICodeHolder, IPermIdHolder, IRegistrationDateHolder
{
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@ public class Tag implements Serializable, ICodeHolder, IPermIdHolder, IRegistrat
@JsonProperty
private String description;
- @JsonProperty(value="private")
+ @JsonProperty(value = "private")
private Boolean isPrivate;
@JsonProperty
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java
index c0e6cd7150dad76d0f34886fe36ed6a12a343b97..c08971b3e281d8f75ddb892d8ed30ec3c1c0b75d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java
@@ -15,19 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.tag.fetchoptions.TagFetchOptions")
+@JsonObject("as.dto.tag.fetchoptions.TagFetchOptions")
public class TagFetchOptions extends FetchOptions<Tag> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java
index 96a8c0e45453d0251cda45922ad2acf45e1b5d81..836185fd5f3a6042b515139aac3809d925e0be0e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.tag.fetchoptions.TagSortOptions")
+@JsonObject("as.dto.tag.fetchoptions.TagSortOptions")
public class TagSortOptions extends SortOptions<Tag>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java
index 37a4278a1cb95819a46b242b074d531a064bcb3d..23c73bcc1990af57b04abff2e11e20de5dae1331 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.tag.id.ITagId")
+@JsonObject("as.dto.tag.id.ITagId")
public interface ITagId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java
index 3813b614536c4a5991b99aa6bae9875e57b5e1e8..36e19a6693610693d65ed617b6cad87eacc75601 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
* @author Franz-Josef Elmer
* @author Jakub Straszewski
*/
-@JsonObject("dto.tag.id.TagCode")
+@JsonObject("as.dto.tag.id.TagCode")
public class TagCode implements ITagId, Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
index 8fcbefe0c90695ab07e5a366aa9986a6a91551e5..139b92b9559bb864bf883eb305e5d6d030bcf9f3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.tag.id.TagPermId")
+@JsonObject("as.dto.tag.id.TagPermId")
public class TagPermId extends ObjectPermId implements ITagId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java
index 3d21002cc1eef33ad47b74018348e154cac5340b..7100048356451ab0b41e544fc6f6a127cce65273 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.tag.search.TagSearchCriteria")
+@JsonObject("as.dto.tag.search.TagSearchCriteria")
public class TagSearchCriteria extends AbstractObjectSearchCriteria<ITagId>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java
index 2a4698468d908ab57998a3ff9c06d6afd4b38479..b0cab4853e658f8ee5cf15db49882ddebc15e769 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java
@@ -15,6 +15,12 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
@@ -24,16 +30,10 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions.Vocabula
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.vocabulary.Vocabulary")
+@JsonObject("as.dto.vocabulary.Vocabulary")
public class Vocabulary implements Serializable, ICodeHolder, IModificationDateHolder, IRegistrationDateHolder, IRegistratorHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java
index cd214397818fd5248a8311dfa0dcd386e18de15d..9d87e88be7b12469bd1587ab54746b2aeebdfb3e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java
@@ -15,26 +15,25 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistrationDateHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IRegistratorHolder;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions.VocabularyTermFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.vocabulary.VocabularyTerm")
+@JsonObject("as.dto.vocabulary.VocabularyTerm")
public class VocabularyTerm implements Serializable, ICodeHolder, IModificationDateHolder, IRegistrationDateHolder, IRegistratorHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java
index c9a60c35aed27c7927c916ce60f6e72a9e074500..ae6edb1d537625bd5b1e708d37852ded8ae9d8fa 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java
@@ -15,19 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.vocabulary.fetchoptions.VocabularyFetchOptions")
+@JsonObject("as.dto.vocabulary.fetchoptions.VocabularyFetchOptions")
public class VocabularyFetchOptions extends FetchOptions<Vocabulary> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java
index d49b2d17561460e6129710a209c0fca1ef9785ef..f642d51b2053a9a5f565ac91a93f8344bba953ce 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.fetchoptions.VocabularySortOptions")
+@JsonObject("as.dto.vocabulary.fetchoptions.VocabularySortOptions")
public class VocabularySortOptions extends SortOptions<Vocabulary>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java
index 1616102c0ded31f8a5eadce0ed5ec39bf31c0df0..fd268d402d4529e63b6dd24b69bfa0720905bd4c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java
@@ -15,20 +15,19 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions.PersonFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.VocabularyTerm;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions.VocabularyFetchOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
/*
* Class automatically generated with DtoGenerator
*/
-@JsonObject("dto.vocabulary.fetchoptions.VocabularyTermFetchOptions")
+@JsonObject("as.dto.vocabulary.fetchoptions.VocabularyTermFetchOptions")
public class VocabularyTermFetchOptions extends FetchOptions<VocabularyTerm> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java
index 43386214a89a231afa04818fecd41d75d7145d60..48324ba964e43ad68023f61137d37549fde6fac0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.fetchoptions.VocabularyTermSortOptions")
+@JsonObject("as.dto.vocabulary.fetchoptions.VocabularyTermSortOptions")
public class VocabularyTermSortOptions extends SortOptions<VocabularyTerm>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
index b96bd0c1fe6e92e5b7acfbce9a24851d5cfb3c9f..1e0fc608662d2ba24db849e77a95a95a2ff1aa3d 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.id.IVocabularyId")
+@JsonObject("as.dto.vocabulary.id.IVocabularyId")
public interface IVocabularyId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
index 25dec5ce60ee1c47949c9b18de9317dd441a580b..57a70346cfaa8b679511f3ffded443395ed15b26 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.id.IVocabularyTermId")
+@JsonObject("as.dto.vocabulary.id.IVocabularyTermId")
public interface IVocabularyTermId extends IObjectId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java
index 34dd80c8d79d419b353e55a86b0d91afc484f2aa..b58d437117b64d132c57f3738b575e83a9259668 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.id.VocabularyPermId")
+@JsonObject("as.dto.vocabulary.id.VocabularyPermId")
public class VocabularyPermId extends ObjectPermId implements IVocabularyId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermCode.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermCode.java
index ef738e8d6201654a7e4b2a56edbaf1b9e59db48b..698a02f08642e57f9e1d96a769e869b09a18223a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermCode.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermCode.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.vocabulary.id.VocabularyTermCode")
+@JsonObject("as.dto.vocabulary.id.VocabularyTermCode")
public class VocabularyTermCode implements IVocabularyTermId, Serializable
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java
index 3916a8939d13ee27f96a3e4e1c970158d03bb670..2746d4af4ec37cd7a8115d0c6a34952eb369af09 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java
@@ -22,7 +22,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context.CustomASServi
/**
* Executor of a {@link CustomASService}.
- *
+ *
* @author Franz-Josef Elmer
*/
public interface ICustomASServiceExecutor
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java
index 668b6cab5d4e365f7bc57fbeaed18df803dab8f3..59a97d5f22cc82b0c3ad5b32ec963fa33eb115df 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java
@@ -17,8 +17,6 @@
package ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context;
/**
- *
- *
* @author Franz-Josef Elmer
*/
public class CustomASServiceContext extends ServiceContext
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java
index 0845654165a446c1a8ef6e3f462bfb4995d03b11..f1a60ff804f22ad754efbc391e9f865bbde1d5f8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java
@@ -17,8 +17,6 @@
package ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context;
/**
- *
- *
* @author Franz-Josef Elmer
*/
public class ServiceContext
@@ -34,5 +32,5 @@ public class ServiceContext
{
this.sessionToken = sessionToken;
}
-
+
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
index e7747d5c092036630f69b2216fa02b1d9ba1ebe1..73427cddc999e9afb6c7c4556594493767173f9b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
-@JsonObject("dto.entity.datasetfile.DataSetFile")
+@JsonObject("dss.dto.entity.datasetfile.DataSetFile")
public class DataSetFile implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java
index 137866398b091130237bd39bbdaa796c7f1cb8a1..6dbec37d47aa1c8365fb59da7a0ae8e3c0ec4e13 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.id.datasetfile.DataSetFilePermId")
+@JsonObject("dss.dto.id.datasetfile.DataSetFilePermId")
public class DataSetFilePermId implements IDataSetFileId
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java
index 199f1917d5900a41da1b2770b4a38d4f4da634bf..a55ce4d3fc3967eeae3063c0ff05d08e686f8579 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
*
* @author pkupczyk
*/
-@JsonObject("dto.id.datasetfile.IDataSetFileId")
+@JsonObject("dss.dto.id.datasetfile.IDataSetFileId")
public interface IDataSetFileId extends IObjectId
{