diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
index cd2d633b2595097699c104e91b85d70e341c52a0..85930c3cff5f4c36d768e5df70679115c4bc8816 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
@@ -161,7 +161,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
final AdditionResult additionResult = addEntityTypePropertyAssignments(rowNumber,
entityType.getPropertyAssignments(), exportableKind, permId,
- entityTypeExportFieldsMap, compatibleWithImport);
+ compatibleWithImport);
warnings.addAll(additionResult.getWarnings());
rowNumber = additionResult.getRowNumber();
@@ -174,8 +174,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
protected AdditionResult addEntityTypePropertyAssignments(int rowNumber,
final Collection<PropertyAssignment> propertyAssignments, final ExportableKind exportableKind,
- final String permId, final Map<String, List<Map<String, String>>> entityTypeExportFieldsMap,
- final boolean compatibleWithImport)
+ final String permId, final boolean compatibleWithImport)
{
final Collection<String> warnings = new ArrayList<>(
addRow(rowNumber++, true, exportableKind, permId, compatibleWithImport
@@ -187,7 +186,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
final Plugin plugin = propertyAssignment.getPlugin();
final Vocabulary vocabulary = propertyType.getVocabulary();
- final String code = (propertyType.isManagedInternally() ? INTERNAL_PROPERTY_PREFIX : "") + propertyType.getCode();
+ final String code = propertyType.getCode();
final String[] values = {
String.valueOf(VersionUtils.getStoredVersion(allVersions, ImportTypes.PROPERTY_TYPE, null, code)),
code,
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
index 074a950497e9b4877d2b780f9cc9b703181b8f0b..fccc56487f72b0567809947b1a5f4a0366d98cbf 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
@@ -28,6 +28,7 @@ import org.jmock.api.Invocation;
import org.jmock.lib.action.CustomAction;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ArchivingStatus;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
@@ -100,16 +101,19 @@ class DataSetExpectations extends Expectations
physicalData[0].setArchivingRequested(false);
physicalData[0].setPresentInArchive(true);
physicalData[0].setStorageConfirmation(true);
+ physicalData[0].setStatus(ArchivingStatus.AVAILABLE);
physicalData[1] = new PhysicalData();
physicalData[1].setArchivingRequested(true);
physicalData[1].setPresentInArchive(false);
physicalData[1].setStorageConfirmation(false);
+ physicalData[1].setStatus(ArchivingStatus.AVAILABLE);
physicalData[2] = new PhysicalData();
physicalData[2].setArchivingRequested(true);
physicalData[2].setPresentInArchive(true);
physicalData[2].setStorageConfirmation(false);
+ physicalData[2].setStatus(ArchivingStatus.ARCHIVED);
final DataSet[] dataSets = new DataSet[3];
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
index f02c68246507d92f5d370b82f5af5952126877e9..6e82e8d0fa08e3d7883ad24a9d44246438d20bfc 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
@@ -82,7 +82,7 @@ class DataSetTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -106,7 +106,7 @@ class DataSetTypeExpectations extends Expectations
propertyAssignments[2] = PropertyAssignmentFactory.createPropertyAssignment(
propertyAssignmentFetchOptions);
- propertyAssignments[2].getPropertyType().setCode("XMLCOMMENTS");
+ propertyAssignments[2].getPropertyType().setCode("$XMLCOMMENTS");
propertyAssignments[2].setMandatory(false);
propertyAssignments[2].setShowInEditView(false);
propertyAssignments[2].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
index 3e6d20ae6a63573a882abe1bc25e2ed2c9875427..1c428d50a782fdf0b15ce0c525f7a9a109c7f1d4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
@@ -86,7 +86,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -97,7 +97,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("DEFAULT_OBJECT_TYPE");
+ propertyAssignments[1].getPropertyType().setCode("$DEFAULT_OBJECT_TYPE");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(true);
propertyAssignments[1].setSection("General info");
@@ -121,7 +121,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[3] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[3].getPropertyType().setCode("XMLCOMMENTS");
+ propertyAssignments[3].getPropertyType().setCode("$XMLCOMMENTS");
propertyAssignments[3].setMandatory(false);
propertyAssignments[3].setShowInEditView(false);
propertyAssignments[3].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
index 5da30a0232ba508b4b91d42be7ea812746c4d5e7..367c56c3303e5dc5e1924b2c7e2e38820549ac2d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
@@ -100,7 +100,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -111,7 +111,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("DOCUMENT");
+ propertyAssignments[1].getPropertyType().setCode("$DOCUMENT");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(true);
propertyAssignments[1].setSection("General info");
@@ -124,7 +124,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[2] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[2].getPropertyType().setCode("ANNOTATIONS_STATE");
+ propertyAssignments[2].getPropertyType().setCode("$ANNOTATIONS_STATE");
propertyAssignments[2].setMandatory(false);
propertyAssignments[2].setShowInEditView(false);
propertyAssignments[2].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
index b83874fe903289b002155a943874cdaccd26cc29..d288fcf6c4631c7098715aa0e825e1b2ce4cc878 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
@@ -100,7 +100,7 @@ class SampleTypeWithBareSamplePropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
index 8b1ad81ccb32b6ea32226b74351c6bcb6f0a7428..93572b362018824a0dc39ba960bd65c52b515623 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
@@ -140,7 +140,7 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
final PropertyAssignmentFetchOptions propertyAssignmentFetchOptions = fetchOptions.withPropertyAssignments();
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -212,7 +212,7 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
final PropertyAssignment[] propertyAssignments = new PropertyAssignment[5];
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
index ce59a4b7252fc93f8d970bbd48adfa7c314e3903..adc7bea77c69fb9982da1356010d5daf70236034 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
@@ -139,7 +139,7 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
final PropertyAssignmentFetchOptions propertyAssignmentFetchOptions = fetchOptions.withPropertyAssignments();
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -223,7 +223,7 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
final PropertyAssignment[] propertyAssignments = new PropertyAssignment[5];
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
index 366335c732a5774e28f3c79aec29179502f718bc..a95ff2d028d559c8d8fe12939da3bf3d3fcf69ec 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
@@ -171,7 +171,7 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
index 3eb95e9a342fb212f72b8b322481612f7d6b6edd..3b1169803d858e4564d0c613099c3a3a21ffa261 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
@@ -179,7 +179,7 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -190,7 +190,7 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("BARCODE");
+ propertyAssignments[1].getPropertyType().setCode("$BARCODE");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(false);
propertyAssignments[1].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx
index 23a8108ac15da282be9e92d696fd475638eec732..9077e4d823c7a224080539661eaaca4a54ac4b44 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx
index 059256318f6f79b477b2b471c74eba3f295256d9..a872b05d2070ab60de061ad8e6d23f6aec863f81 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx
index 85ea05ae9fc814155f6538b2474679d1d4e3b494..c5174f1d75277603112dbe2b8e584d6a39334966 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx
index 88dbc885700cabf108b1c2d232bc628a376a9ed2..095637531f9c7e3c998923b07690e1df3f19f991 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx differ