Skip to content

Commit 5540c69

Browse files
committed
add all changed files for 2.14.7, contains mapping & setting files
1 parent f86926e commit 5540c69

File tree

18 files changed

+23
-31
lines changed

18 files changed

+23
-31
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/General/Configurations/Credentials.config
55
>>>>>>> 9a1b89511ee2031ef009497d1d5403106eb32385
66

7+
/General/Logging

Components/Security/Db/Mappings/Default/Authorization/EntityPermission.hbm.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
</property>
1515

1616
<property name="CreationDate" type="DateTime">
17-
<column name="CreationDate"/>
17+
<column name="CreationDate" />
1818
</property>
19-
20-
<many-to-one name="Entity" column="EntityRef" class="BExIS.Security.Entities.Objects.Entity, BExIS.Security.Entities" index="idx_EntityPermissions_EntityRef"/>
21-
<property name="Key" type="Int64" index="idx_EntityPermissions_Key"/>
22-
<property name="Rights" type="Int32" index="idx_EntityPermissions_Rights"/>
19+
20+
<many-to-one name="Entity" column="EntityRef" class="BExIS.Security.Entities.Objects.Entity, BExIS.Security.Entities" index="idx_EntityPermissions_EntityRef" />
21+
<property name="Key" type="Int64" index="idx_EntityPermissions_Key" />
22+
<property name="Rights" type="Int32" index="idx_EntityPermissions_Rights" />
2323
<many-to-one name="Subject" column="SubjectRef" class="BExIS.Security.Entities.Subjects.Subject, BExIS.Security.Entities" not-null="false" index="idx_EntityPermissions_SubjectRef" />
2424
</class>
25-
</hibernate-mapping>
25+
</hibernate-mapping>

Components/Security/Db/Mappings/Default/FormerMember/Users_Groups_FormerMember.hbm.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Security.Entities" namespace="BExIS.Security.Entities.FormerMember">
22
<class xmlns="urn:nhibernate-mapping-2.2" name="UsersGroupsRelationFormerMember" table="Users_Groups_FormerMember" dynamic-update="true">
3-
3+
44
<id name="Id" type="Int64">
55
<generator class="native" />
66
</id>
@@ -13,8 +13,7 @@
1313
<column name="Extra" not-null="false" sql-type="xml" />
1414
</property>
1515

16-
1716
<property name="UserRef" type="Int64" />
1817
<property name="GroupRef" type="Int64" />
1918
</class>
20-
</hibernate-mapping>
19+
</hibernate-mapping>

Components/Security/Db/Mappings/Default/Requests/Decision.hbm.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<column name="Extra" not-null="false" sql-type="xml" />
1414
</property>
1515

16-
1716
<property name="DecisionDate" type="DateTime">
1817
<column name="DecisionDate" />
1918
</property>
@@ -26,7 +25,6 @@
2625
<column name="Status" />
2726
</property>
2827

29-
3028
<many-to-one name="DecisionMaker" column="DecisionMakerRef" class="BExIS.Security.Entities.Subjects.User, BExIS.Security.Entities" />
3129

3230
<many-to-one name="Request" column="RequestRef" class="BExIS.Security.Entities.Requests.Request, BExIS.Security.Entities" />

Components/Security/Db/Mappings/Default/Requests/Request.hbm.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<column name="Extra" not-null="false" sql-type="xml" />
1313
</property>
1414

15-
1615
<property name="Intention" type="StringClob">
1716
<column name="Intention" sql-type="text" />
1817
</property>
@@ -33,7 +32,6 @@
3332
<column name="Status" />
3433
</property>
3534

36-
3735
<set name="Decisions" inverse="true" cascade="all-delete-orphan" lazy="true">
3836
<key column="RequestRef" />
3937
<one-to-many class="BExIS.Security.Entities.Requests.Decision, BExIS.Security.Entities" />

Components/Security/Db/Mappings/Default/Subjects/Group.hbm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Security.Entities" namespace="BExIS.Security.Entities.Subjects">
22
<union-subclass xmlns="urn:nhibernate-mapping-2.2" name="Group" table="Groups" extends="Subject" dynamic-update="true">
3-
<property name="Description" type="String" >
3+
<property name="Description" type="String">
44
<column name="Description" sql-type="text" />
55
</property>
66
<property name="IsValid" type="yes_no" />

Components/Security/Db/Mappings/Default/Versions/Version.hbm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
<property name="Value" type="String" />
1818
<property name="Date" type="DateTime" />
1919
</class>
20-
</hibernate-mapping>
20+
</hibernate-mapping>

General/Db/Settings/DB2Dialect.hibernate.cfg.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
<property name="dialect">NHibernate.Dialect.DB2Dialect</property>
88
<property name='adonet.batch_size'>100</property>
99
<property name="default_schema">Standard</property>
10-
10+
1111
<property name="show_sql">true</property>
1212
<property name="format_sql">true</property>
1313
<property name="generate_statistics">false</property>
1414
</session-factory>
15-
16-
</hibernate-configuration>
15+
</hibernate-configuration>

General/Db/Settings/MsSql2008Dialect.hibernate.cfg.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
<property name="show_sql">True</property>
1414
<property name="format_sql">True</property>
1515
</session-factory>
16-
17-
</hibernate-configuration>
16+
</hibernate-configuration>

General/Db/Settings/PostgreSQL82Dialect.hibernate.cfg.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818
<property name="generate_statistics">False</property><!--set to false on production-->
1919
<property name="command_timeout">180</property><!-- Specify the default timeout in seconds of DbCommands generated by NHibernate. Negative values disable it. Link: https://nhibernate.info/doc/nhibernate-reference/session-configuration.html-->
2020
</session-factory>
21-
22-
</hibernate-configuration>
21+
</hibernate-configuration>

0 commit comments

Comments
 (0)