Merge pull request #38 from BEXIS2/rc

v3.4.0

Components/Dlm/Db/Mappings/Default/Data/DatasetVersion.hbm.xml

@@ -103,7 +103,7 @@
 	  <column name="VersionName" />
 	</property>
 
-	  <property name="VersionDescription" type="StringClob">
+	<property name="VersionDescription" type="StringClob">
       <column name="VersionDescription" sql-type="text" />
 	</property>
 
@@ -116,8 +116,17 @@
 	</property>
 
 	  <!-- Mapping entity associations -->
-    <many-to-one name="Dataset" class="BExIS.Dlm.Entities.Data.Dataset" not-null="true" column="DatasetRef" index="idx_DatasetVersions_DatasetRef" />
+	  <many-to-one name="Dataset" class="BExIS.Dlm.Entities.Data.Dataset" not-null="true" column="DatasetRef" index="idx_DatasetVersions_DatasetRef" />
 
+
+	  <!-- tag specific-->
+	  <many-to-one name="Tag" class="BExIS.Dlm.Entities.Data.Tag" column="TagRef"  cascade="all" />
+
+	  <property name="Show" type="Boolean">
+		  <column name="Show" />
+	  </property>
+
+
     <set cascade="all-delete-orphan" name="PriliminaryTuples" inverse="true" lazy="true" order-by="OrderNo">
       <key>
         <column name="DatasetVersionRef" />

Components/Dlm/Db/Mappings/Default/Data/Tag.hbm.xml

@@ -0,0 +1,35 @@
+<!--
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE hibernate-mapping [ <!ENTITY BaseEntityProperties SYSTEM "..\BaseEntityProperties.xml"> ]>
+-->
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Dlm.Entities" namespace="BExIS.Dlm.Entities.Data">
+  <class xmlns="urn:nhibernate-mapping-2.2" name="Tag" table="Tags">
+    <!-- Mapping BaseEntity properties -->
+    <id name="Id" type="Int64">
+      <column name="Id" index="idx_EntityTags_id" />
+      <generator class="native" />
+    </id>
+
+    <!-- Mapping EntityTag properties -->
+
+    <property name="Nr" type="double">
+      <column name="Nr" />
+    </property>
+
+    <property name="ReleaseDate" type="Timestamp">
+      <column name="ReleaseDate"  index="idx_ReleaseDate_timestamp" />
+    </property>
+
+
+	 <property name="Final" type="Boolean">
+		 <column name="Final" />
+	 </property>
+
+
+	  <property name="Doi" type="String">
+		<column name="Doi" />
+	</property>
+
+  </class>
+</hibernate-mapping>

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

@@ -1,4 +1,4 @@
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Security.Entities" namespace="BExIS.Security.Entities.Subjects">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="BExIS.Security.Entities" namespace="BExIS.Security.Entities.Subjects">
   <union-subclass xmlns="urn:nhibernate-mapping-2.2" name="User" table="Users" extends="Subject" dynamic-update="true">
     <property name="AccessFailedCount" type="Int32" />
     <property name="Email" type="String" />
@@ -21,6 +21,5 @@
     <property name="HasPrivacyPolicyAccepted" type="yes_no" />
     <property name="HasTermsAndConditionsAccepted" type="yes_no" />
     <property name="RegistrationDate" type="DateTime" />
-    <property name="Token" type="string" />
   </union-subclass>
-</hibernate-mapping>
+</hibernate-mapping>

General/General.Settings.xml

@@ -14,5 +14,5 @@
   <!-- landing page for users , when they logged in successfuly -->
   <entry key="faq" value="https://github.com/BEXIS2/Core/wiki/FAQ" type="string" />
 
-  <entry key="version" value="3.3.3" type="string" />
-</settings>
+  <entry key="version" value="3.4.0" type="string" />
+</settings>