Skip to content

Commit eff120a

Browse files
DavidBlaaDavidBlaa
authored
Merge pull request #28 from BEXIS2/rc
Rc
2 parents fb1dc6b + 0417a50 commit eff120a

File tree

133 files changed

+7771
-712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+7771
-712
lines changed

‎Components/Dlm/Db/Mappings/Default/Administration/ResearchPlan.hbm.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Dlm.Entities" namespace="BExIS.Dlm.Entities.Administration">
22
<class xmlns="urn:nhibernate-mapping-2.2" name="ResearchPlan" table="ResearchPlans">
33
<!-- Mapping BaseEntity properties -->
4-
<id name="Id" type="Int64" >
5-
<column name="Id" index="idx_ResearchPlans_id"/>
4+
<id name="Id" type="Int64">
5+
<column name="Id" index="idx_ResearchPlans_id" />
66
<generator class="native" />
77
</id>
88

@@ -11,15 +11,15 @@
1111
<version name="VersionNo" type="Int32">
1212
<column name="VersionNo" />
1313
</version>
14-
14+
1515
<property name="Extra" type="System.Xml.XmlDocument, System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
1616
<column name="Extra" not-null="false" sql-type="xml" />
1717
</property>
1818

1919
<!-- Mapping Dataset properties -->
20-
20+
2121
<property name="Title" type="string">
22-
<column name="Title" index="idx_ResearchPlans_title"/>
22+
<column name="Title" index="idx_ResearchPlans_title" />
2323
</property>
2424

2525
<property name="Description" type="string">
@@ -28,15 +28,13 @@
2828

2929
<!-- Mapping entity associations -->
3030
<set cascade="none" name="Datasets" inverse="true" lazy="true">
31-
<key column="ResearchPlanRef" not-null="false" foreign-key="FK_Datasets_ResearchPlans"/>
31+
<key column="ResearchPlanRef" not-null="false" foreign-key="FK_Datasets_ResearchPlans" />
3232
<one-to-many class="BExIS.Dlm.Entities.Data.Dataset" />
3333
</set>
3434

3535
<set name="DataStructures" table="ResearchPlans_DataStructures" cascade="all-delete-orphan" lazy="true">
36-
<key column="ResearchPlanRef"/>
37-
<many-to-many column="DataStructureRef" class="BExIS.Dlm.Entities.DataStructure.DataStructure"/>
36+
<key column="ResearchPlanRef" />
37+
<many-to-many column="DataStructureRef" class="BExIS.Dlm.Entities.DataStructure.DataStructure" />
3838
</set>
39-
4039
</class>
41-
4240
</hibernate-mapping>

‎Components/Dlm/Db/Mappings/Default/Base/BaseEntityProperties.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
<!--<property name="TimeStamp" type="DateTime">
88
<column name="TimeStamp" />
9-
</property>-->
9+
</property>-->

‎Components/Dlm/Db/Mappings/Default/Data/ContentDescriptor.hbm.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Dlm.Entities" namespace="BExIS.Dlm.Entities.Data">
22
<class xmlns="urn:nhibernate-mapping-2.2" name="ContentDescriptor" table="ContentDescriptors">
33
<!-- Mapping BaseEntity properties -->
4-
4+
55
<id name="Id" type="Int64">
6-
<column name="Id" index="idx_ContentDescriptors_id"/>
6+
<column name="Id" index="idx_ContentDescriptors_id" />
77
<generator class="native" />
88
</id>
99

@@ -16,7 +16,7 @@
1616
</property>
1717

1818
<!-- Mapping own properties -->
19-
19+
2020
<property name="OrderNo" type="Int32">
2121
<column name="OrderNo" />
2222
</property>
@@ -26,24 +26,22 @@
2626
</property>
2727

2828
<property name="Name" type="String">
29-
<column name="Name" index="idx_ContentDescriptors_id"/>
29+
<column name="Name" index="idx_ContentDescriptors_id" />
3030
</property>
3131

3232
<property name="URI" type="StringClob">
33-
<column name="URI" sql-type="text"/>
33+
<column name="URI" sql-type="text" />
3434
</property>
3535

3636
<property name="Description" type="StringClob">
37-
<column name="Description" sql-type="text"/>
37+
<column name="Description" sql-type="text" />
3838
</property>
3939

4040
<property name="FileSize" type="Int32">
41-
<column name="FileSize"/>
41+
<column name="FileSize" />
4242
</property>
4343

44-
<many-to-one class="DatasetVersion" name="DatasetVersion" column="DatasetVersionRef" not-null="true">
45-
</many-to-one>
46-
44+
<many-to-one class="DatasetVersion" name="DatasetVersion" column="DatasetVersionRef" not-null="true">
45+
</many-to-one>
4746
</class>
48-
4947
</hibernate-mapping>

‎Components/Dlm/Db/Mappings/Default/Data/DataTupleVersion.hbm.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Mapping BaseEntity properties -->
44

55
<id name="Id" type="Int64">
6-
<column name="Id" index="idx_DataTupleVersions_id"/>
6+
<column name="Id" index="idx_DataTupleVersions_id" />
77
<generator class="native" />
88
</id>
99

@@ -26,7 +26,7 @@
2626
</property>
2727

2828
<property name="Timestamp" type="Timestamp">
29-
<column name="Timestamp" index="idx_DataTupleVersions_timestamp"/>
29+
<column name="Timestamp" index="idx_DataTupleVersions_timestamp" />
3030
</property>
3131

3232
<property name="JsonVariableValues" type="StringClob">
@@ -38,10 +38,9 @@
3838
</property>
3939

4040
<property name="Values" type="StringClob">
41-
<column name="Values" not-null="false"/>
41+
<column name="Values" not-null="false" />
4242
</property>
4343

44-
4544
<many-to-one class="DataTuple" name="OriginalTuple" column="OriginalTupleRef">
4645
</many-to-one>
4746

@@ -50,7 +49,5 @@
5049

5150
<many-to-one class="DatasetVersion" name="ActingDatasetVersion" column="ActingDatasetVersionRef">
5251
</many-to-one>
53-
5452
</class>
55-
5653
</hibernate-mapping>

‎Components/Dlm/Db/Mappings/Default/Data/Dataset.hbm.xml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!--
2-
<?xml version="1.0" encoding="utf-8" ? >
2+
<?xml version="1.0" encoding="utf-8" ?>
33
<!DOCTYPE hibernate-mapping [ <!ENTITY BaseEntityProperties SYSTEM "..\BaseEntityProperties.xml"> ]>
44
-->
5-
5+
66
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Dlm.Entities" namespace="BExIS.Dlm.Entities.Data">
77
<class xmlns="urn:nhibernate-mapping-2.2" name="Dataset" table="Datasets">
88
<!-- Mapping BaseEntity properties -->
99
<id name="Id" type="Int64">
10-
<column name="Id" index="idx_Datasets_id"/>
10+
<column name="Id" index="idx_Datasets_id" />
1111
<generator class="native" />
1212
</id>
1313

@@ -16,7 +16,7 @@
1616
<version name="VersionNo" type="Int32">
1717
<column name="VersionNo" />
1818
</version>
19-
19+
2020
<property name="Extra" type="System.Xml.XmlDocument, System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
2121
<column name="Extra" not-null="false" sql-type="xml" />
2222
</property>
@@ -28,14 +28,14 @@
2828
<column name="State" />
2929
</property>
3030
<property name="Timestamp" type="DateTime">
31-
<column name="StateTimestamp" not-null="false"/>
31+
<column name="StateTimestamp" not-null="false" />
3232
</property>
3333
<property name="Comment" type="string">
3434
<column name="StateComment" />
3535
</property>
3636
</component>
3737

38-
<component name="CreationInfo" >
38+
<component name="CreationInfo">
3939
<property name="ActionType" type="Vaiona.Entities.Common.AuditActionType, Vaiona.Entities">
4040
<column name="C_ActionType" />
4141
</property>
@@ -46,11 +46,11 @@
4646
<column name="C_Comment" />
4747
</property>
4848
<property name="Timestamp" type="DateTime">
49-
<column name="C_Timestamp" not-null="false"/>
49+
<column name="C_Timestamp" not-null="false" />
5050
</property>
5151
</component>
5252

53-
<component name="ModificationInfo" >
53+
<component name="ModificationInfo">
5454
<property name="ActionType" type="Vaiona.Entities.Common.AuditActionType, Vaiona.Entities">
5555
<column name="M_ActionType" />
5656
</property>
@@ -61,33 +61,32 @@
6161
<column name="M_Comment" />
6262
</property>
6363
<property name="Timestamp" type="DateTime">
64-
<column name="M_Timestamp" not-null="false"/>
64+
<column name="M_Timestamp" not-null="false" />
6565
</property>
6666
</component>
67-
67+
6868
<!-- Mapping Dataset properties -->
6969

7070
<property name="Status" type="BExIS.Dlm.Entities.Data.DatasetStatus, BExIS.Dlm.Entities">
71-
<column name="Status" index="idx_ContentDescriptors_status"/>
71+
<column name="Status" index="idx_ContentDescriptors_status" />
7272
</property>
73-
73+
7474
<property name="LastCheckIOTimestamp" type="Timestamp">
7575
<column name="LastCheckIOTimestamp" index="idx_ContentDescriptors_lastCheckIOTimestamp" />
7676
</property>
77-
77+
7878
<property name="CheckOutUser" type="string">
7979
<column name="CheckOutUser" />
8080
</property>
81-
82-
<!-- Mapping entity associations -->
83-
<many-to-one name="DataStructure" class="BExIS.Dlm.Entities.DataStructure.DataStructure" not-null="false" column="DataStructureRef"/>
8481

85-
<many-to-one name="MetadataStructure" class="BExIS.Dlm.Entities.MetadataStructure.MetadataStructure" not-null="false" column="MetadataStructureRef"/> <!-- not-null should be true, when testing is finished-->
82+
<!-- Mapping entity associations -->
83+
<many-to-one name="DataStructure" class="BExIS.Dlm.Entities.DataStructure.DataStructure" not-null="false" column="DataStructureRef" />
8684

87-
<many-to-one name="ResearchPlan" class="BExIS.Dlm.Entities.Administration.ResearchPlan" not-null="false" column="ResearchPlanRef"/>
85+
<many-to-one name="MetadataStructure" class="BExIS.Dlm.Entities.MetadataStructure.MetadataStructure" not-null="false" column="MetadataStructureRef" /> <!-- not-null should be true, when testing is finished-->
8886

89-
<many-to-one name="EntityTemplate" class="BExIS.Dlm.Entities.Data.EntityTemplate" not-null="true" column="EntityTemplateRef"/>
87+
<many-to-one name="ResearchPlan" class="BExIS.Dlm.Entities.Administration.ResearchPlan" not-null="false" column="ResearchPlanRef" />
9088

89+
<many-to-one name="EntityTemplate" class="BExIS.Dlm.Entities.Data.EntityTemplate" not-null="true" column="EntityTemplateRef" />
9190

9291
<set name="Versions" inverse="true" lazy="true" order-by="Timestamp desc" cascade="all-delete-orphan">
9392
<key>
@@ -97,15 +96,13 @@
9796
</set>
9897

9998
<set name="Views" inverse="true" lazy="true" cascade="all">
100-
<key column="DatasetRef" not-null="false" foreign-key="FK_Views_Datasets"/>
99+
<key column="DatasetRef" not-null="false" foreign-key="FK_Views_Datasets" />
101100
<one-to-many class="BExIS.Dlm.Entities.DataStructure.DatasetView" />
102101
</set>
103-
104102
</class>
105103

106104
<sql-query name="test1">
107-
<return alias="dataset" class="BExIS.Dlm.Entities.Data.Dataset"/>
105+
<return alias="dataset" class="BExIS.Dlm.Entities.Data.Dataset" />
108106
select * from Datasets where xmlexists('$c/Metadata/Ownership[LastName= "Chamanara"]' passing Datasets.Metadata as "c")
109107
</sql-query>
110-
111108
</hibernate-mapping>

0 commit comments

Comments
 (0)