next steps in new persitence

diff --git a/source/mir/core/model/Audio.hbm.xml b/source/mir/core/model/Audio.hbm.xml
index 771ccf6..5f303d4 100755 (executable)
--- a/source/mir/core/model/Audio.hbm.xml
+++ b/source/mir/core/model/Audio.hbm.xml
@@ -1,207 +1,207 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.Audio" \r
-    table="audio"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-       <property\r
-        name="iconIsProduced"\r
-        type="boolean"\r
-        column="icon_is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="iconPath"\r
-        type="java.lang.String"\r
-        column="icon_path"\r
-        length="255"\r
-    />   \r
-    <property\r
-        name="kbits"\r
-        type="short"\r
-        column="kbits"\r
-        length="2"\r
-    />     \r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />\r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.Audio" 
+    table="audio"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+       <property
+        name="iconIsProduced"
+        type="boolean"
+        column="icon_is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="iconPath"
+        type="java.lang.String"
+        column="icon_path"
+        length="255"
+    />   
+    <property
+        name="kbits"
+        type="short"
+        column="kbits"
+        length="2"
+    />     
+    <!-- associations -->
+    <many-to-one
+        name="mediaType"
+        class="mir.core.model.MediaType"
+        column="to_media_type"
+    />    
+    <many-to-one
+        name="mediaFolder"
+        class="mir.core.model.MediaFolder"
+        column="to_media_folder"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    /> 
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>
+    
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Content.hbm.xml b/source/mir/core/model/Content.hbm.xml
index 3f4246f..97a25e8 100755 (executable)
--- a/source/mir/core/model/Content.hbm.xml
+++ b/source/mir/core/model/Content.hbm.xml
@@ -1,342 +1,215 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.Content" \r
-    table="content"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-    <property\r
-       name="isHtml"\r
-       type="boolean"\r
-       column="is_html"\r
-       not-null="true"\r
-               length="1"\r
-       />\r
-    <property\r
-        name="contentData"\r
-        type="java.lang.String"\r
-        column="content_data"\r
-        length="-1"\r
-    />\r
-    <!-- associations -->\r
-       <one-to-one\r
-               name="articleType"\r
-           class="mir.core.model.ArticleType"\r
-           column="to_article_type"\r
-       />\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />\r
-    <set \r
-       name="childContent" \r
-       inverse="true" \r
-       cascade="all">\r
-       <key \r
-               column="to_content"\r
-       />\r
-        <one-to-many \r
-               class="mir.core.model.Content"\r
-        />\r
-    </set>\r
-    <many-to-one\r
-        name="parentContent"\r
-        class="mir.core.model.Content"\r
-        column="to_content"\r
-    />\r
-    <set name="topics" table="content_x_topic">\r
-           <key column="content_id"/>\r
-           <many-to-many column="topic_id" class="mir.core.model.Topic"/>\r
-       </set> \r
-    <set name="attachedMedias" table="content_x_media" lazy="true">\r
-           <key column="content_id"/>\r
-           <many-to-many column="media_id" class="mir.core.model.Media"/>\r
-       </set>\r
-\r
-<!--\r
-    </joined-subclass>   \r
-    <joined-subclass\r
-       table="uploaded_media"\r
-       name="mir.core.model.UploadedMedia">\r
-           <property\r
-               name="iconIsProduced"\r
-               type="boolean"\r
-               column="icon_is_produced"\r
-               not-null="true"\r
-               length="1"\r
-           />\r
-           <property\r
-               name="iconPath"\r
-               type="java.lang.String"\r
-               column="icon_path"\r
-               length="255"\r
-           />\r
-           <property\r
-               name="size"\r
-               type="int"\r
-               column="size"\r
-               length="4"\r
-           />  \r
-                  \r
-           <joined-subclass\r
-               table="images"\r
-               name="mir.core.model.Image">\r
-                   <property\r
-                       name="imageData"\r
-                       type="int"\r
-                       column="image_data"\r
-                       length="4"\r
-                   />\r
-                   <property\r
-                       name="iconData"\r
-                       type="int"\r
-                       column="icon_data"\r
-                       length="4"\r
-                   />\r
-                   <property\r
-                       name="year"\r
-                       type="java.lang.String"\r
-                       column="year"\r
-                       length="40"\r
-                   />\r
-                   <property\r
-                       name="imgWidth"\r
-                       type="short"\r
-                       column="img_width"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="imgHeight"\r
-                       type="short"\r
-                       column="img_height"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="imgFormat"\r
-                       type="short"\r
-                       column="to_img_format"\r
-                       not-null="true"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="imgLayout"\r
-                       type="short"\r
-                       column="to_img_layout"\r
-                       not-null="true"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="imgType"\r
-                       type="short"\r
-                       column="to_img_type"\r
-                       not-null="true"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="imgColor"\r
-                       type="short"\r
-                       column="to_img_color"\r
-                       not-null="true"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="iconWidth"\r
-                       type="short"\r
-                       column="icon_width"\r
-                       length="2"\r
-                   />\r
-                   <property\r
-                       name="iconHeight"\r
-                       type="short"\r
-                       column="icon_height"\r
-                       length="2"\r
-                   />              \r
-           </joined-subclass>\r
-           <joined-subclass\r
-               name="mir.core.model.OtherMedia">                   \r
-           </joined-subclass>      \r
-\r
-           <joined-subclass\r
-               table="audio"\r
-               name="mir.core.model.Audio">\r
-                   <property\r
-                       name="kbits"\r
-                       type="short"\r
-                       column="kbits"\r
-                       length="2"\r
-                   />              \r
-           </joined-subclass>\r
-    </joined-subclass>\r
-    \r
--->\r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.Content" 
+    table="content"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+    <property
+       name="isHtml"
+       type="boolean"
+       column="is_html"
+       not-null="true"
+               length="1"
+       />
+    <property
+        name="contentData"
+        type="java.lang.String"
+        column="content_data"
+        length="-1"
+    />
+    <!-- associations -->
+    <many-to-one
+        name="articleType"
+        class="mir.core.model.ArticleType"
+        column="to_article_type"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    /> 
+    <set 
+       name="childContent" 
+       inverse="true" 
+       cascade="all">
+       <key 
+               column="to_content"
+       />
+        <one-to-many 
+               class="mir.core.model.Content"
+        />
+    </set>
+    <many-to-one
+        name="parentContent"
+        class="mir.core.model.Content"
+        column="to_content"
+    />
+    <set name="topics" table="content_x_topic">
+           <key column="content_id"/>
+           <many-to-many column="topic_id" class="mir.core.model.Topic"/>
+       </set> 
+    <set name="attachedMedias" table="content_x_media" lazy="true">
+           <key column="content_id"/>
+           <many-to-many column="media_id" class="mir.core.model.Media"/>
+       </set>
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Image.hbm.xml b/source/mir/core/model/Image.hbm.xml
index af1732d..559d563 100755 (executable)
--- a/source/mir/core/model/Image.hbm.xml
+++ b/source/mir/core/model/Image.hbm.xml
@@ -1,245 +1,245 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.Image" \r
-    table="images"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-\r
-    <property\r
-        name="iconIsProduced"\r
-        type="boolean"\r
-        column="icon_is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    \r
-    <property\r
-        name="iconPath"\r
-        type="java.lang.String"\r
-        column="icon_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="imageData"\r
-        type="int"\r
-        column="image_data"\r
-        length="4"\r
-    />\r
-    <property\r
-        name="iconData"\r
-        type="int"\r
-        column="icon_data"\r
-        length="4"\r
-    />\r
-    <property\r
-        name="year"\r
-        type="java.lang.String"\r
-        column="year"\r
-        length="40"\r
-    />\r
-    <property\r
-        name="imgWidth"\r
-        type="short"\r
-        column="img_width"\r
-        length="2"\r
-    />\r
-    <property\r
-        name="imgHeight"\r
-        type="short"\r
-        column="img_height"\r
-        length="2"\r
-    />\r
-    <property\r
-        name="iconWidth"\r
-        type="short"\r
-        column="icon_width"\r
-        length="2"\r
-    />\r
-    <property\r
-        name="iconHeight"\r
-        type="short"\r
-        column="icon_height"\r
-        length="2"\r
-    />             \r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />    \r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.Image" 
+    table="images"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+
+    <property
+        name="iconIsProduced"
+        type="boolean"
+        column="icon_is_produced"
+        not-null="true"
+        length="1"
+    />
+    
+    <property
+        name="iconPath"
+        type="java.lang.String"
+        column="icon_path"
+        length="255"
+    />
+    <property
+        name="imageData"
+        type="int"
+        column="image_data"
+        length="4"
+    />
+    <property
+        name="iconData"
+        type="int"
+        column="icon_data"
+        length="4"
+    />
+    <property
+        name="year"
+        type="java.lang.String"
+        column="year"
+        length="40"
+    />
+    <property
+        name="imgWidth"
+        type="short"
+        column="img_width"
+        length="2"
+    />
+    <property
+        name="imgHeight"
+        type="short"
+        column="img_height"
+        length="2"
+    />
+    <property
+        name="iconWidth"
+        type="short"
+        column="icon_width"
+        length="2"
+    />
+    <property
+        name="iconHeight"
+        type="short"
+        column="icon_height"
+        length="2"
+    />             
+
+    <!-- associations -->
+    <many-to-one
+        name="mediaType"
+        class="mir.core.model.MediaType"
+        column="to_media_type"
+    />    
+    <many-to-one
+        name="mediaFolder"
+        class="mir.core.model.MediaFolder"
+        column="to_media_folder"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    />    
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>?
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Image.java b/source/mir/core/model/Image.java
index 65c132e..a4777f3 100755 (executable)
--- a/source/mir/core/model/Image.java
+++ b/source/mir/core/model/Image.java
@@ -1,11 +1,22 @@
 package mir.core.model;
 
 import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import net.sf.hibernate.CallbackException;
+import net.sf.hibernate.HibernateException;
+import net.sf.hibernate.Lifecycle;
+import net.sf.hibernate.Session;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.postgresql.PGConnection;
+import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
 
 /** @author Hibernate CodeGenerator */
-public class Image extends UploadedMedia implements Serializable {
+public class Image extends UploadedMedia 
+       implements Serializable, Lifecycle {
 
     /** nullable persistent field */
     private int imageData;
@@ -138,4 +149,51 @@ public class Image extends UploadedMedia implements Serializable {
             .toString();
     }
 
+               /* (non-Javadoc)
+                * @see net.sf.hibernate.Lifecycle#onSave(net.sf.hibernate.Session)
+                */
+               public boolean onSave(Session arg0) throws CallbackException {
+                       // TODO Auto-generated method stub
+                       return false;
+               }
+
+               /* (non-Javadoc)
+                * @see net.sf.hibernate.Lifecycle#onUpdate(net.sf.hibernate.Session)
+                */
+               public boolean onUpdate(Session arg0) throws CallbackException {
+                       // TODO Auto-generated method stub
+                       return false;
+               }
+
+               /* (non-Javadoc)
+                * @see net.sf.hibernate.Lifecycle#onDelete(net.sf.hibernate.Session)
+                */
+               public boolean onDelete(Session arg0) throws CallbackException {
+                       // TODO Auto-generated method stub
+                       return false;
+               }
+
+               /* (non-Javadoc)
+                * @see net.sf.hibernate.Lifecycle#onLoad(net.sf.hibernate.Session, java.io.Serializable)
+                */
+               public void onLoad(Session session, Serializable arg1) {
+                       // TODO Auto-generated method stub
+                       System.out.println("hello: ");
+                       try {
+                               Connection connection = session.connection();
+                               if(connection instanceof PGConnection){
+                                       PGConnection pgcon = (PGConnection)connection;
+                                       LargeObjectManager largeObjectManager = pgcon.getLargeObjectAPI();
+                                       LargeObject image = largeObjectManager.open(getImageData());
+                                       System.out.println("juppii" + image.size()  + " " + this.getMediaType().getId());
+                               }
+                       } catch (HibernateException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       } catch (SQLException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
+               }
+
 }

diff --git a/source/mir/core/model/Media.hbm.xml b/source/mir/core/model/Media.hbm.xml
index 3fc19c5..53d9688 100755 (executable)
--- a/source/mir/core/model/Media.hbm.xml
+++ b/source/mir/core/model/Media.hbm.xml
@@ -1,189 +1,179 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.Media" \r
-    table="media"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />\r
-    \r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.Media" 
+    table="media"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+    <!-- associations -->
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    /> 
+    
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>
+    
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Media.java b/source/mir/core/model/Media.java
index d85060c..41280b0 100755 (executable)
--- a/source/mir/core/model/Media.java
+++ b/source/mir/core/model/Media.java
@@ -78,12 +78,6 @@ public class Media implements Serializable {
     private mir.core.model.Feature feature;
 
     /** nullable persistent field */
-    private MediaFolder mediaFolder;
-
-    /** nullable persistent field */
-    private MediaType mediaType;
-
-    /** nullable persistent field */
     private MirUser publisher;
 
     /** nullable persistent field */
@@ -275,22 +269,6 @@ public class Media implements Serializable {
         this.feature = feature;
     }
 
-    public mir.core.model.MediaFolder getMediaFolder() {
-        return this.mediaFolder;
-    }
-
-    public void setMediaFolder(mir.core.model.MediaFolder mediaFolder) {
-        this.mediaFolder = mediaFolder;
-    }
-
-    public mir.core.model.MediaType getMediaType() {
-        return this.mediaType;
-    }
-
-    public void setMediaType(mir.core.model.MediaType mediaType) {
-        this.mediaType = mediaType;
-    }
-
     public mir.core.model.MirUser getPublisher() {
         return this.publisher;
     }

diff --git a/source/mir/core/model/MediaType.hbm.xml b/source/mir/core/model/MediaType.hbm.xml
index 7f5795e..6521304 100755 (executable)
--- a/source/mir/core/model/MediaType.hbm.xml
+++ b/source/mir/core/model/MediaType.hbm.xml
@@ -1,64 +1,67 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.MediaType" \r
-    table="media_type"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-        <generator class="sequence" />\r
-    </id>\r
-    <property\r
-        name="name"\r
-        type="java.lang.String"\r
-        column="name"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="mimeType"\r
-        type="java.lang.String"\r
-        column="mime_type"\r
-        not-null="true"\r
-        length="40"\r
-    />\r
-    <property\r
-        name="classname"\r
-        type="java.lang.String"\r
-        column="classname"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="tablename"\r
-        type="java.lang.String"\r
-        column="tablename"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="dcname"\r
-        type="java.lang.String"\r
-        column="dcname"\r
-        length="20"\r
-    />\r
-\r
-    <!-- associations -->\r
-\r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.MediaType" 
+    table="media_type"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence" />
+    </id>
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="mimeType"
+        type="java.lang.String"
+        column="mime_type"
+        not-null="true"
+        length="40"
+    />
+    <property
+        name="classname"
+        type="java.lang.String"
+        column="classname"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="tablename"
+        type="java.lang.String"
+        column="tablename"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="dcname"
+        type="java.lang.String"
+        column="dcname"
+        length="20"
+    />
+
+    <!-- associations -->
+    <set name="mediaItems" lazy="true">
+           <key column="id"/>
+       <one-to-many class="mir.core.model.Media"/> 
+       </set>
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/MediaType.java b/source/mir/core/model/MediaType.java
index 98f7d40..57b9e2a 100755 (executable)
--- a/source/mir/core/model/MediaType.java
+++ b/source/mir/core/model/MediaType.java
@@ -1,6 +1,7 @@
 package mir.core.model;
 
 import java.io.Serializable;
+import java.util.Set;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -26,6 +27,8 @@ public class MediaType implements Serializable {
 
     /** nullable persistent field */
     private String dcname;
+    
+    private Set mediaItems;
 
     /** full constructor */
     public MediaType(java.lang.String name, java.lang.String mimeType, java.lang.String classname, java.lang.String tablename, java.lang.String dcname) {
@@ -96,6 +99,20 @@ public class MediaType implements Serializable {
         this.dcname = dcname;
     }
 
+               /**
+                * @return
+                */
+               public Set getMediaItems() {
+                       return mediaItems;
+               }
+
+               /**
+                * @param mediaItems
+                */
+               public void setMediaItems(Set mediaItems) {
+                       this.mediaItems = mediaItems;
+               }
+
     public String toString() {
         return new ToStringBuilder(this)
             .append("id", getId())

diff --git a/source/mir/core/model/OtherMedia.hbm.xml b/source/mir/core/model/OtherMedia.hbm.xml
index b1321f9..0ce3d19 100755 (executable)
--- a/source/mir/core/model/OtherMedia.hbm.xml
+++ b/source/mir/core/model/OtherMedia.hbm.xml
@@ -1,208 +1,208 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.OtherMedia" \r
-    table="other_media"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />\r
-       <property\r
-        name="iconIsProduced"\r
-        type="boolean"\r
-        column="icon_is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="iconPath"\r
-        type="java.lang.String"\r
-        column="icon_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="size"\r
-        type="int"\r
-        column="size"\r
-        length="4"\r
-    />\r
-    \r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.OtherMedia" 
+    table="other_media"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+    <!-- associations -->
+    <many-to-one
+        name="mediaType"
+        class="mir.core.model.MediaType"
+        column="to_media_type"
+    />    
+    <many-to-one
+        name="mediaFolder"
+        class="mir.core.model.MediaFolder"
+        column="to_media_folder"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    /> 
+       <property
+        name="iconIsProduced"
+        type="boolean"
+        column="icon_is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="iconPath"
+        type="java.lang.String"
+        column="icon_path"
+        length="255"
+    />
+    <property
+        name="size"
+        type="int"
+        column="size"
+        length="4"
+    />
+    
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>
+    
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/UploadedMedia.hbm.xml b/source/mir/core/model/UploadedMedia.hbm.xml
index aaf6047..02c493b 100755 (executable)
--- a/source/mir/core/model/UploadedMedia.hbm.xml
+++ b/source/mir/core/model/UploadedMedia.hbm.xml
@@ -1,202 +1,202 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.UploadedMedia" \r
-    table="uploaded_media"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-       <property\r
-        name="iconIsProduced"\r
-        type="boolean"\r
-        column="icon_is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="iconPath"\r
-        type="java.lang.String"\r
-        column="icon_path"\r
-        length="255"\r
-    />\r
-    \r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />    \r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.UploadedMedia" 
+    table="uploaded_media"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+       <property
+        name="iconIsProduced"
+        type="boolean"
+        column="icon_is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="iconPath"
+        type="java.lang.String"
+        column="icon_path"
+        length="255"
+    />
+    
+    <!-- associations -->
+    <many-to-one
+        name="mediaType"
+        class="mir.core.model.MediaType"
+        column="to_media_type"
+    />    
+    <many-to-one
+        name="mediaFolder"
+        class="mir.core.model.MediaFolder"
+        column="to_media_folder"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    />    
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>
+    
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/UploadedMedia.java b/source/mir/core/model/UploadedMedia.java
index a5357ac..b41e034 100755 (executable)
--- a/source/mir/core/model/UploadedMedia.java
+++ b/source/mir/core/model/UploadedMedia.java
@@ -13,6 +13,12 @@ public class UploadedMedia extends Media implements Serializable {
     /** nullable persistent field */
     private String iconPath;
 
+               /** nullable persistent field */
+               private MediaFolder mediaFolder;
+
+               /** nullable persistent field */
+               private MediaType mediaType;
+
     /** default constructor */
     public UploadedMedia() {
     }
@@ -39,4 +45,20 @@ public class UploadedMedia extends Media implements Serializable {
             .toString();
     }
 
+               public mir.core.model.MediaFolder getMediaFolder() {
+                   return this.mediaFolder;
+               }
+
+               public void setMediaFolder(mir.core.model.MediaFolder mediaFolder) {
+                   this.mediaFolder = mediaFolder;
+               }
+
+               public mir.core.model.MediaType getMediaType() {
+                   return this.mediaType;
+               }
+
+               public void setMediaType(mir.core.model.MediaType mediaType) {
+                   this.mediaType = mediaType;
+               }
+
 }

diff --git a/source/mir/core/model/Video.hbm.xml b/source/mir/core/model/Video.hbm.xml
index 045ce7b..2044e9f 100755 (executable)
--- a/source/mir/core/model/Video.hbm.xml
+++ b/source/mir/core/model/Video.hbm.xml
@@ -1,202 +1,202 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
-    "-//Hibernate/Hibernate Mapping DTD//EN"\r
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >\r
-    \r
-<hibernate-mapping>\r
-\r
-<!-- \r
-    Created by Middlegen Hibernate plugin\r
-\r
-    http://boss.bekk.no/boss/middlegen/\r
-    http://hibernate.sourceforge.net/\r
--->\r
-\r
-<class \r
-    name="mir.core.model.Video" \r
-    table="video"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-       <generator class="sequence"/>\r
-    </id>\r
-    <property\r
-        name="title"\r
-        type="java.lang.String"\r
-        column="title"\r
-        not-null="true"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="subtitle"\r
-        type="java.lang.String"\r
-        column="subtitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="edittitle"\r
-        type="java.lang.String"\r
-        column="edittitle"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="date"\r
-        type="java.lang.String"\r
-        column="date"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorMainUrl"\r
-        type="java.lang.String"\r
-        column="creator_main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creatorEmail"\r
-        type="java.lang.String"\r
-        column="creator_email"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorAddress"\r
-        type="java.lang.String"\r
-        column="creator_address"\r
-        length="80"\r
-    />\r
-    <property\r
-        name="creatorPhone"\r
-        type="java.lang.String"\r
-        column="creator_phone"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="keywords"\r
-        type="java.lang.String"\r
-        column="keywords"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="comment"\r
-        type="java.lang.String"\r
-        column="comment"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="source"\r
-        type="java.lang.String"\r
-        column="source"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishDate"\r
-        type="java.sql.Timestamp"\r
-        column="publish_date"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="publishServer"\r
-        type="java.lang.String"\r
-        column="publish_server"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="publishPath"\r
-        type="java.lang.String"\r
-        column="publish_path"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="isPublished"\r
-        type="boolean"\r
-        column="is_published"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="isProduced"\r
-        type="boolean"\r
-        column="is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\r
-    />\r
-    <property\r
-        name="webdbLastchange"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_lastchange"\r
-        length="8"\r
-    />\r
-       <property\r
-        name="iconIsProduced"\r
-        type="boolean"\r
-        column="icon_is_produced"\r
-        not-null="true"\r
-        length="1"\r
-    />\r
-    <property\r
-        name="iconPath"\r
-        type="java.lang.String"\r
-        column="icon_path"\r
-        length="255"\r
-    />\r
-    \r
-    <!-- associations -->\r
-    <one-to-one\r
-        name="feature"\r
-        class="mir.core.model.Feature"\r
-        column="to_feature"\r
-    />\r
-    <one-to-one\r
-        name="mediaFolder"\r
-        class="mir.core.model.MediaFolder"\r
-        column="to_media_folder"\r
-    />\r
-    <one-to-one\r
-        name="mediaType"\r
-        class="mir.core.model.MediaType"\r
-        column="to_media_type"\r
-    />\r
-    <one-to-one\r
-        name="publisher"\r
-        class="mir.core.model.MirUser"\r
-        column="to_publisher"\r
-    />\r
-    <one-to-one\r
-        name="language"\r
-        class="mir.core.model.Language"\r
-        column="to_language"\r
-    />\r
-    <one-to-one\r
-        name="rights"\r
-        class="mir.core.model.Rights"\r
-        column="to_rights"\r
-    />    \r
-    <set name="content" table="content_x_media" lazy="true">\r
-           <key column="media_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set>\r
-    \r
-</class>\r
-</hibernate-mapping>\r
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+
+<!-- 
+    Created by Middlegen Hibernate plugin
+
+    http://boss.bekk.no/boss/middlegen/
+    http://hibernate.sourceforge.net/
+-->
+
+<class 
+    name="mir.core.model.Video" 
+    table="video"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+       <generator class="sequence"/>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="subtitle"
+        type="java.lang.String"
+        column="subtitle"
+        length="30"
+    />
+    <property
+        name="edittitle"
+        type="java.lang.String"
+        column="edittitle"
+        length="30"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        length="80"
+    />
+    <property
+        name="creatorMainUrl"
+        type="java.lang.String"
+        column="creator_main_url"
+        length="255"
+    />
+    <property
+        name="creatorEmail"
+        type="java.lang.String"
+        column="creator_email"
+        length="80"
+    />
+    <property
+        name="creatorAddress"
+        type="java.lang.String"
+        column="creator_address"
+        length="80"
+    />
+    <property
+        name="creatorPhone"
+        type="java.lang.String"
+        column="creator_phone"
+        length="20"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        length="-1"
+    />
+    <property
+        name="source"
+        type="java.lang.String"
+        column="source"
+        length="255"
+    />
+    <property
+        name="publishDate"
+        type="java.sql.Timestamp"
+        column="publish_date"
+        length="8"
+    />
+    <property
+        name="publishServer"
+        type="java.lang.String"
+        column="publish_server"
+        length="255"
+    />
+    <property
+        name="publishPath"
+        type="java.lang.String"
+        column="publish_path"
+        length="255"
+    />
+    <property
+        name="isPublished"
+        type="boolean"
+        column="is_published"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="isProduced"
+        type="boolean"
+        column="is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="webdbLastchange"
+        type="java.sql.Timestamp"
+        column="webdb_lastchange"
+        length="8"
+    />
+       <property
+        name="iconIsProduced"
+        type="boolean"
+        column="icon_is_produced"
+        not-null="true"
+        length="1"
+    />
+    <property
+        name="iconPath"
+        type="java.lang.String"
+        column="icon_path"
+        length="255"
+    />
+    
+    <!-- associations -->
+    <many-to-one
+        name="mediaType"
+        class="mir.core.model.MediaType"
+        column="to_media_type"
+    />    
+    <many-to-one
+        name="mediaFolder"
+        class="mir.core.model.MediaFolder"
+        column="to_media_folder"
+    />
+    <many-to-one
+        name="feature"
+        class="mir.core.model.Feature"
+        column="to_feature"
+    />
+    <many-to-one
+        name="publisher"
+        class="mir.core.model.MirUser"
+        column="to_publisher"
+    />
+    <many-to-one
+        name="language"
+        class="mir.core.model.Language"
+        column="to_language"
+    />
+    <many-to-one
+        name="rights"
+        class="mir.core.model.Rights"
+        column="to_rights"
+    />   
+    <set name="content" table="content_x_media" lazy="true">
+           <key column="media_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set>
+    
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/test/Test.java b/source/mir/core/test/Test.java
index 775299f..f392c72 100755 (executable)
--- a/source/mir/core/test/Test.java
+++ b/source/mir/core/test/Test.java
@@ -52,7 +52,7 @@ import net.sf.hibernate.cfg.Configuration;
 
 /**
  * Test
- * @version $Id: Test.java,v 1.1 2003/08/16 19:15:27 idfx Exp $
+ * @version $Id: Test.java,v 1.2 2003/08/17 14:19:17 idfx Exp $
  * @author idefix
  */
 public class Test {
@@ -75,6 +75,7 @@ public class Test {
                                Media media = (Media)iterator.next();
                                System.out.println(media.toString());
                        }
+                       System.out.println("****** content media");
                        criteria = session.createCriteria(Content.class);
                        list = criteria.setMaxResults(10).list();
                        for(Iterator iterator = list.iterator(); iterator.hasNext();){