some changes in the model classes and its xml-descriptions

diff --git a/build.xml b/build.xml
index 454afe8..1a0ef69 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -293,10 +293,16 @@
   </target>
   
   <target name="rundbtest" depends="compile">
-       <java classname="mir.core.test.Test">
+       <java fork="true" classname="mir.core.test.Test">
                <classpath>
+                       <fileset dir="${tomcat.home}/common/endorsed">
+                               <include name="**/*.jar"/>
+                       </fileset>
+                       <fileset dir="${tomcat.home}/common/lib">
+                               <include name="**/*.jar"/>
+                       </fileset>
                        <fileset dir="${deploy.webinf}/lib">
-                               <include name="*.jar"/>
+                               <include name="**/*.jar"/>
                        </fileset>
                        <path id="classes" path="${deploy.classes}"/>
                </classpath>

diff --git a/etc/hibernate.cfg.xml b/etc/hibernate.cfg.xml
index 2d5d4df..8dc63c7 100755 (executable)
--- a/etc/hibernate.cfg.xml
+++ b/etc/hibernate.cfg.xml
@@ -10,10 +10,12 @@
         <property name="connection.driver_class">org.postgresql.Driver</property>
         <property name="connection.username">postgres</property>
         <property name="connection.password"></property>
+        <property name="connection.pool_size">10</property>
+        <property name="statement_cache.size">100</property>
         <property name="show_sql">false</property>
         <property name="use_outer_join">true</property>
         <property name="dialect">net.sf.hibernate.dialect.PostgreSQLDialect</property>
-
+        
         <!-- Mapping files -->
         <mapping resource="mir/core/model/ArticleType.hbm.xml"/>
         <mapping resource="mir/core/model/Breaking.hbm.xml"/>

diff --git a/source/mir/core/test/Test.java b/source/mir/core/test/Test.java
index f392c72..4aaf867 100755 (executable)
--- a/source/mir/core/test/Test.java
+++ b/source/mir/core/test/Test.java
@@ -36,6 +36,8 @@ import java.util.List;
 
 import org.apache.log4j.BasicConfigurator;
 
+import com.sun.tools.javac.v8.util.FatalError;
+
 import mir.core.model.Audio;
 import mir.core.model.Content;
 import mir.core.model.Image;
@@ -43,6 +45,7 @@ import mir.core.model.Media;
 import mir.core.model.Topic;
 import mir.core.model.UploadedMedia;
 import mir.core.model.Video;
+import mir.core.service.storage.ContentService;
 import net.sf.hibernate.Criteria;
 import net.sf.hibernate.HibernateException;
 import net.sf.hibernate.Session;
@@ -52,7 +55,7 @@ import net.sf.hibernate.cfg.Configuration;
 
 /**
  * Test
- * @version $Id: Test.java,v 1.2 2003/08/17 14:19:17 idfx Exp $
+ * @version $Id: Test.java,v 1.3 2003/08/17 22:02:07 idfx Exp $
  * @author idefix
  */
 public class Test {
@@ -75,13 +78,19 @@ public class Test {
                                Media media = (Media)iterator.next();
                                System.out.println(media.toString());
                        }
+                       transaction.commit();
+                       session.close();
                        System.out.println("****** content media");
-                       criteria = session.createCriteria(Content.class);
-                       list = criteria.setMaxResults(10).list();
+                       ContentService contentService = new ContentService(factory);
+                       list = contentService.list(0,10);
                        for(Iterator iterator = list.iterator(); iterator.hasNext();){
                                Content media = (Content)iterator.next();
                                System.out.println(media.getTitle());
                        }
+                       Content content = (Content)contentService.load(new Integer(7));
+                       System.out.println(content);
+                       session = factory.openSession();
+                       transaction = session.beginTransaction();
                        criteria = session.createCriteria(UploadedMedia.class);
                        list = criteria.setMaxResults(10).list();
                        System.out.println("****** uploaded media");