small bugfixes

diff --git a/source/mir/core/model/ArticleType.hbm.xml b/source/mir/core/model/ArticleType.hbm.xml
index 451402e..8fb79ca 100755 (executable)
--- a/source/mir/core/model/ArticleType.hbm.xml
+++ b/source/mir/core/model/ArticleType.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-        <generator class="sequence" />
+        <generator class="sequence">
+               <param name="sequence">article_type_id_seq</param> 
+        </generator>
     </id>
     <property
         name="name"

diff --git a/source/mir/core/model/Audio.hbm.xml b/source/mir/core/model/Audio.hbm.xml
index bb2a39e..8592a01 100755 (executable)
--- a/source/mir/core/model/Audio.hbm.xml
+++ b/source/mir/core/model/Audio.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator>
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Breaking.hbm.xml b/source/mir/core/model/Breaking.hbm.xml
index 8a4d065..e45cbf7 100755 (executable)
--- a/source/mir/core/model/Breaking.hbm.xml
+++ b/source/mir/core/model/Breaking.hbm.xml
@@ -1,44 +1,46 @@
-<?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.BreakingNewsItem" \r
-    table="breaking"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-        <generator class="sequence" />\r
-    </id>\r
-    <property\r
-        name="text"\r
-        type="java.lang.String"\r
-        column="text"\r
-        not-null="true"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\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.BreakingNewsItem" 
+    table="breaking"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">breaking_id_seq</param> 
+        </generator>
+    </id>
+    <property
+        name="text"
+        type="java.lang.String"
+        column="text"
+        not-null="true"
+        length="255"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Comment.hbm.xml b/source/mir/core/model/Comment.hbm.xml
index 605b18c..4c1fcf9 100755 (executable)
--- a/source/mir/core/model/Comment.hbm.xml
+++ b/source/mir/core/model/Comment.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-        <generator class="assigned" />
+        <generator class="sequence">
+               <param name="sequence">comment_id_seq</param> 
+        </generator>
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/CommentStatus.hbm.xml b/source/mir/core/model/CommentStatus.hbm.xml
index 9880f02..48f65c8 100755 (executable)
--- a/source/mir/core/model/CommentStatus.hbm.xml
+++ b/source/mir/core/model/CommentStatus.hbm.xml
@@ -1,37 +1,39 @@
-<?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.CommentStatus" \r
-    table="comment_status"\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="40"\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.CommentStatus" 
+    table="comment_status"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">comment_status_seq</param> 
+        </generator> 
+    </id>
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="40"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Content.hbm.xml b/source/mir/core/model/Content.hbm.xml
index 9c0bc7c..0b04fbd 100755 (executable)
--- a/source/mir/core/model/Content.hbm.xml
+++ b/source/mir/core/model/Content.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Feature.hbm.xml b/source/mir/core/model/Feature.hbm.xml
index 12f1881..b5e0370 100755 (executable)
--- a/source/mir/core/model/Feature.hbm.xml
+++ b/source/mir/core/model/Feature.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-        <generator class="sequence" />
+        <generator class="sequence">
+               <param name="sequence">feature_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Image.hbm.xml b/source/mir/core/model/Image.hbm.xml
index e7d8038..010fd66 100755 (executable)
--- a/source/mir/core/model/Image.hbm.xml
+++ b/source/mir/core/model/Image.hbm.xml
@@ -22,7 +22,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Language.hbm.xml b/source/mir/core/model/Language.hbm.xml
index 41a8a01..898cf29 100755 (executable)
--- a/source/mir/core/model/Language.hbm.xml
+++ b/source/mir/core/model/Language.hbm.xml
@@ -1,44 +1,46 @@
-<?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.Language" \r
-    table="language"\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="40"\r
-    />\r
-    <property\r
-        name="code"\r
-        type="java.lang.String"\r
-        column="code"\r
-        not-null="true"\r
-        length="2"\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.Language" 
+    table="language"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">language_id_seq</param> 
+        </generator> 
+    </id>
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="40"
+    />
+    <property
+        name="code"
+        type="java.lang.String"
+        column="code"
+        not-null="true"
+        length="2"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Media.hbm.xml b/source/mir/core/model/Media.hbm.xml
index 1cf55ec..fa9bb3c 100755 (executable)
--- a/source/mir/core/model/Media.hbm.xml
+++ b/source/mir/core/model/Media.hbm.xml
@@ -22,7 +22,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/MediaFolder.hbm.xml b/source/mir/core/model/MediaFolder.hbm.xml
index 5751998..8288cf3 100755 (executable)
--- a/source/mir/core/model/MediaFolder.hbm.xml
+++ b/source/mir/core/model/MediaFolder.hbm.xml
@@ -1,75 +1,77 @@
-<?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.MediaFolder" \r
-    table="media_folder"\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="255"\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="place"\r
-        type="java.lang.String"\r
-        column="place"\r
-        length="80"\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="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
-    <!-- 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.MediaFolder" 
+    table="media_folder"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">media_folder_id_seq</param> 
+        </generator> 
+    </id>
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="255"
+    />
+    <property
+        name="date"
+        type="java.lang.String"
+        column="date"
+        not-null="true"
+        length="8"
+    />
+    <property
+        name="place"
+        type="java.lang.String"
+        column="place"
+        length="80"
+    />
+    <property
+        name="keywords"
+        type="java.lang.String"
+        column="keywords"
+        length="-1"
+    />
+    <property
+        name="comment"
+        type="java.lang.String"
+        column="comment"
+        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 -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/MediaType.hbm.xml b/source/mir/core/model/MediaType.hbm.xml
index 6521304..bc91f7c 100755 (executable)
--- a/source/mir/core/model/MediaType.hbm.xml
+++ b/source/mir/core/model/MediaType.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-        <generator class="sequence" />
+        <generator class="sequence">
+               <param name="sequence">media_type_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="name"

diff --git a/source/mir/core/model/Message.hbm.xml b/source/mir/core/model/Message.hbm.xml
index 5675290..9e64104 100755 (executable)
--- a/source/mir/core/model/Message.hbm.xml
+++ b/source/mir/core/model/Message.hbm.xml
@@ -1,57 +1,59 @@
-<?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.Message" \r
-    table="messages"\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
-        length="30"\r
-    />\r
-    <property\r
-        name="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        not-null="true"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="creator"\r
-        type="java.lang.String"\r
-        column="creator"\r
-        not-null="true"\r
-        length="30"\r
-    />\r
-    <property\r
-        name="webdbCreate"\r
-        type="java.sql.Timestamp"\r
-        column="webdb_create"\r
-        not-null="true"\r
-        length="8"\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.Message" 
+    table="messages"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">messages_id_seq</param> 
+        </generator>
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="30"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        not-null="true"
+        length="255"
+    />
+    <property
+        name="creator"
+        type="java.lang.String"
+        column="creator"
+        not-null="true"
+        length="30"
+    />
+    <property
+        name="webdbCreate"
+        type="java.sql.Timestamp"
+        column="webdb_create"
+        not-null="true"
+        length="8"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/OtherMedia.hbm.xml b/source/mir/core/model/OtherMedia.hbm.xml
index ea175f8..9ef1dfe 100755 (executable)
--- a/source/mir/core/model/OtherMedia.hbm.xml
+++ b/source/mir/core/model/OtherMedia.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Rights.hbm.xml b/source/mir/core/model/Rights.hbm.xml
index 4b5307d..47405f6 100755 (executable)
--- a/source/mir/core/model/Rights.hbm.xml
+++ b/source/mir/core/model/Rights.hbm.xml
@@ -1,43 +1,45 @@
-<?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.Rights" \r
-    table="rights"\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="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\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.Rights" 
+    table="rights"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">rights_id_seq</param> 
+        </generator> 
+    </id>
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/Topic.hbm.xml b/source/mir/core/model/Topic.hbm.xml
index 4a1e1d5..cb0d9f2 100755 (executable)
--- a/source/mir/core/model/Topic.hbm.xml
+++ b/source/mir/core/model/Topic.hbm.xml
@@ -1,84 +1,86 @@
-<?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.Topic" \r
-    table="topic"\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="description"\r
-        type="java.lang.String"\r
-        column="description"\r
-        length="-1"\r
-    />\r
-    <property\r
-        name="filename"\r
-        type="java.lang.String"\r
-        column="filename"\r
-        not-null="true"\r
-        length="20"\r
-    />\r
-    <property\r
-        name="mainUrl"\r
-        type="java.lang.String"\r
-        column="main_url"\r
-        length="255"\r
-    />\r
-    <property\r
-        name="archivUrl"\r
-        type="java.lang.String"\r
-        column="archiv_url"\r
-        length="255"\r
-    />\r
-\r
-    <!-- associations -->\r
-    <set name="content" table="content_x_topic" lazy="true">\r
-           <key column="topic_id"/>\r
-           <many-to-many column="content_id" class="mir.core.model.Content"/>\r
-       </set> \r
-       \r
-       <!--\r
-    <set \r
-       name="childTopics"> \r
-       inverse="true" \r
-       cascade="all">\r
-       <key \r
-               column="parent_id"\r
-       />\r
-        <one-to-many \r
-               class="mir.core.model.Topic"\r
-        />\r
-    </set>\r
-    <many-to-one \r
-       name="parentTopic" \r
-       column="parent_id" \r
-       class="mir.core.model.Topic"\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.Topic" 
+    table="topic"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">topic_id_seq</param> 
+        </generator> 
+    </id>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        not-null="true"
+        length="80"
+    />
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="-1"
+    />
+    <property
+        name="filename"
+        type="java.lang.String"
+        column="filename"
+        not-null="true"
+        length="20"
+    />
+    <property
+        name="mainUrl"
+        type="java.lang.String"
+        column="main_url"
+        length="255"
+    />
+    <property
+        name="archivUrl"
+        type="java.lang.String"
+        column="archiv_url"
+        length="255"
+    />
+
+    <!-- associations -->
+    <set name="content" table="content_x_topic" lazy="true">
+           <key column="topic_id"/>
+           <many-to-many column="content_id" class="mir.core.model.Content"/>
+       </set> 
+       
+       <!--
+    <set 
+       name="childTopics"> 
+       inverse="true" 
+       cascade="all">
+       <key 
+               column="parent_id"
+       />
+        <one-to-many 
+               class="mir.core.model.Topic"
+        />
+    </set>
+    <many-to-one 
+       name="parentTopic" 
+       column="parent_id" 
+       class="mir.core.model.Topic"
+    />
+    -->
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/model/UploadedMedia.hbm.xml b/source/mir/core/model/UploadedMedia.hbm.xml
index 7f3768a..4944a74 100755 (executable)
--- a/source/mir/core/model/UploadedMedia.hbm.xml
+++ b/source/mir/core/model/UploadedMedia.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/Video.hbm.xml b/source/mir/core/model/Video.hbm.xml
index ab7ee4e..4ae71c7 100755 (executable)
--- a/source/mir/core/model/Video.hbm.xml
+++ b/source/mir/core/model/Video.hbm.xml
@@ -21,7 +21,9 @@
         type="int"
         column="id"
     >
-       <generator class="sequence"/>
+        <generator class="sequence">
+               <param name="sequence">media_id_seq</param> 
+        </generator> 
     </id>
     <property
         name="title"

diff --git a/source/mir/core/model/WebdbUser.hbm.xml b/source/mir/core/model/WebdbUser.hbm.xml
index 853539a..d0a35f3 100755 (executable)
--- a/source/mir/core/model/WebdbUser.hbm.xml
+++ b/source/mir/core/model/WebdbUser.hbm.xml
@@ -1,51 +1,53 @@
-<?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.MirUser" \r
-    table="webdb_users"\r
->\r
-    <id\r
-        name="id"\r
-        type="int"\r
-        column="id"\r
-    >\r
-        <generator class="sequence" />\r
-    </id>\r
-    <property\r
-        name="login"\r
-        type="java.lang.String"\r
-        column="login"\r
-        not-null="true"\r
-        length="16"\r
-    />\r
-    <property\r
-        name="password"\r
-        type="java.lang.String"\r
-        column="password"\r
-        not-null="true"\r
-        length="16"\r
-    />\r
-    <property\r
-        name="isAdmin"\r
-        type="boolean"\r
-        column="is_admin"\r
-        not-null="true"\r
-        length="1"\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.MirUser" 
+    table="webdb_users"
+>
+    <id
+        name="id"
+        type="int"
+        column="id"
+    >
+        <generator class="sequence">
+               <param name="sequence">webdb_users_id_seq</param> 
+        </generator>
+    </id>
+    <property
+        name="login"
+        type="java.lang.String"
+        column="login"
+        not-null="true"
+        length="16"
+    />
+    <property
+        name="password"
+        type="java.lang.String"
+        column="password"
+        not-null="true"
+        length="16"
+    />
+    <property
+        name="isAdmin"
+        type="boolean"
+        column="is_admin"
+        not-null="true"
+        length="1"
+    />
+
+    <!-- associations -->
+
+</class>
+</hibernate-mapping>

diff --git a/source/mir/core/service/storage/StorageService.java b/source/mir/core/service/storage/StorageService.java
index fb8edd1..32043b5 100755 (executable)
--- a/source/mir/core/service/storage/StorageService.java
+++ b/source/mir/core/service/storage/StorageService.java
@@ -48,7 +48,7 @@ import net.sf.hibernate.expression.Order;
  * 
  * StorageService
  * @author idefix
- * @version $Id: StorageService.java,v 1.5 2003/09/10 20:57:17 idfx Exp $
+ * @version $Id: StorageService.java,v 1.6 2003/09/18 21:39:42 idfx Exp $
  */
 public abstract class StorageService {
        private final int defaultLimit;
@@ -78,6 +78,10 @@ public abstract class StorageService {
        public List list(final int offset){
                return list(offset, defaultLimit, null);
        }
+
+       public List list(final int offset, Order order){
+               return list(offset, defaultLimit, null, order);
+       }
                
        public List list(final int offset, final Expression expression){
                return list(offset, defaultLimit, expression);
@@ -177,9 +181,9 @@ public abstract class StorageService {
                        Transaction transaction = null;
                        try {
                                session = sessionHolder.currentSession();
-                               transaction = session.beginTransaction();
+                               //transaction = session.beginTransaction();
                                Integer newid = (Integer)session.save(newObject);
-                               transaction.commit();
+                               //transaction.commit();
                                return newid;
                        } catch (HibernateException e) {
                                if(transaction != null){