From: idfx Date: Sun, 17 Aug 2003 14:18:51 +0000 (+0000) Subject: next steps in new persitence X-Git-Tag: BEFORE_MERGE_1_1~78 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=eebe229310f3c6238805037f426c2b28e75dff78 next steps in new persitence --- diff --git a/source/mir/core/model/Audio.hbm.xml b/source/mir/core/model/Audio.hbm.xml index 771ccf6a..5f303d49 100755 --- a/source/mir/core/model/Audio.hbm.xml +++ b/source/mir/core/model/Audio.hbm.xml @@ -1,207 +1,207 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/Content.hbm.xml b/source/mir/core/model/Content.hbm.xml index 3f4246f7..97a25e86 100755 --- a/source/mir/core/model/Content.hbm.xml +++ b/source/mir/core/model/Content.hbm.xml @@ -1,342 +1,215 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/Image.hbm.xml b/source/mir/core/model/Image.hbm.xml index af1732dd..559d5635 100755 --- a/source/mir/core/model/Image.hbm.xml +++ b/source/mir/core/model/Image.hbm.xml @@ -1,245 +1,245 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + diff --git a/source/mir/core/model/Image.java b/source/mir/core/model/Image.java index 65c132ee..a4777f33 100755 --- 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 3fc19c54..53d9688d 100755 --- a/source/mir/core/model/Media.hbm.xml +++ b/source/mir/core/model/Media.hbm.xml @@ -1,189 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/Media.java b/source/mir/core/model/Media.java index d85060c8..41280b0f 100755 --- 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 7f5795eb..6521304b 100755 --- a/source/mir/core/model/MediaType.hbm.xml +++ b/source/mir/core/model/MediaType.hbm.xml @@ -1,64 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/MediaType.java b/source/mir/core/model/MediaType.java index 98f7d40d..57b9e2a1 100755 --- 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 b1321f97..0ce3d198 100755 --- a/source/mir/core/model/OtherMedia.hbm.xml +++ b/source/mir/core/model/OtherMedia.hbm.xml @@ -1,208 +1,208 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/UploadedMedia.hbm.xml b/source/mir/core/model/UploadedMedia.hbm.xml index aaf6047e..02c493bc 100755 --- a/source/mir/core/model/UploadedMedia.hbm.xml +++ b/source/mir/core/model/UploadedMedia.hbm.xml @@ -1,202 +1,202 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/model/UploadedMedia.java b/source/mir/core/model/UploadedMedia.java index a5357aca..b41e0342 100755 --- 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 045ce7b9..2044e9fd 100755 --- a/source/mir/core/model/Video.hbm.xml +++ b/source/mir/core/model/Video.hbm.xml @@ -1,202 +1,202 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/mir/core/test/Test.java b/source/mir/core/test/Test.java index 775299fc..f392c726 100755 --- 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();){