Author: sohil.shah(a)jboss.com Date: 2009-01-14 06:47:46 -0500 (Wed, 14 Jan 2009) New Revision: 12496 Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/CMSEntry.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/RepositoryEntry.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/VersionEntry.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/VersionBinVal.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/WSPBinVal.java modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java Log: JBPORTAL-2258 - Create file in CMS not working for several databases Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/CMSEntry.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/CMSEntry.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/CMSEntry.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -23,6 +23,8 @@ package org.jboss.portal.cms.hibernate; import java.io.Serializable; +import org.hibernate.Hibernate; +import org.jboss.portal.common.io.IOTools; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class CMSEntry implements Serializable @@ -33,9 +35,11 @@ private Integer key; private String path; private String name; - private java.sql.Blob data; + //private java.sql.Blob data; private long lastmod; private long length; + + private byte[] blobData; public CMSEntry() { @@ -45,10 +49,11 @@ { this.key = null; this.path = path; - this.name = name; - this.data = data; + this.name = name; this.lastmod = lastmod; this.length = length; + + this.setData(data); } public Integer getKey() @@ -81,16 +86,6 @@ this.name = name; } - public java.sql.Blob getData() - { - return data; - } - - public void setData(java.sql.Blob data) - { - this.data = data; - } - public long getLastmod() { return lastmod; @@ -110,4 +105,31 @@ { this.length = length; } + + public java.sql.Blob getData() + { + java.sql.Blob blob = null; + + if(this.blobData != null) + { + blob = Hibernate.createBlob(this.blobData); + } + + return blob; + } + + public void setData(java.sql.Blob data) + { + try + { + if(data != null) + { + this.blobData = IOTools.getBytes(data.getBinaryStream()); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } } Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/HibernateStore.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -955,7 +955,7 @@ versionEntry.setLength(length); session.save(versionEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName)) { @@ -975,7 +975,7 @@ cmsEntry.setLength(length); session.save(cmsEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName)) { @@ -995,7 +995,7 @@ repoEntry.setLength(length); session.save(repoEntry); - session.flush(); + //session.flush(); } } catch (Exception e) @@ -1023,7 +1023,7 @@ VersionEntry versionEntry = new VersionEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(versionEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName)) { @@ -1031,7 +1031,7 @@ CMSEntry cmsEntry = new CMSEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(cmsEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName)) { @@ -1039,7 +1039,7 @@ RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(repoEntry); - session.flush(); + //session.flush(); } } catch (Exception e) @@ -1176,7 +1176,7 @@ versionEntry.setLength(length); session.save(versionEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName)) { @@ -1196,7 +1196,7 @@ cmsEntry.setLength(length); session.save(cmsEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName)) { @@ -1217,7 +1217,7 @@ repoEntry.setLength(length); session.save(repoEntry); - session.flush(); + //session.flush(); } } catch (Exception e) @@ -1245,7 +1245,7 @@ VersionEntry versionEntry = new VersionEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(versionEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName)) { @@ -1253,7 +1253,7 @@ CMSEntry cmsEntry = new CMSEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(cmsEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName)) { @@ -1261,7 +1261,7 @@ RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, Hibernate.createBlob(in), System.currentTimeMillis(), length); session.save(repoEntry); - session.flush(); + //session.flush(); } } catch (Exception e) @@ -1508,20 +1508,21 @@ VersionEntry versionEntry = new VersionEntry(parentDir, name, null, System.currentTimeMillis(), 0); session.save(versionEntry); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName)) { CMSEntry cmsEntry = new CMSEntry(parentDir, name, null, System.currentTimeMillis(), 0); session.save(cmsEntry); + //session.flush(); } else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName)) { RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, null, System.currentTimeMillis(), 0); session.save(repoEntry); - session.flush(); + //session.flush(); } } catch (Exception e) Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/RepositoryEntry.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/RepositoryEntry.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/RepositoryEntry.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -23,6 +23,8 @@ package org.jboss.portal.cms.hibernate; import java.io.Serializable; +import org.hibernate.Hibernate; +import org.jboss.portal.common.io.IOTools; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class RepositoryEntry implements Serializable @@ -33,9 +35,11 @@ private Integer key; private String path; private String name; - private java.sql.Blob data; + //private java.sql.Blob data; private long lastmod; private long length; + + private byte[] blobData; public RepositoryEntry() { @@ -46,9 +50,10 @@ this.key = null; this.path = path; this.name = name; - this.data = data; this.lastmod = lastmod; this.length = length; + + this.setData(data); } public Integer getKey() @@ -81,16 +86,6 @@ this.name = name; } - public java.sql.Blob getData() - { - return data; - } - - public void setData(java.sql.Blob data) - { - this.data = data; - } - public long getLastmod() { return lastmod; @@ -110,4 +105,31 @@ { this.length = length; } + + public java.sql.Blob getData() + { + java.sql.Blob blob = null; + + if(this.blobData != null) + { + blob = Hibernate.createBlob(this.blobData); + } + + return blob; + } + + public void setData(java.sql.Blob data) + { + try + { + if(data != null) + { + this.blobData = IOTools.getBytes(data.getBinaryStream()); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } } Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/VersionEntry.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/VersionEntry.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/VersionEntry.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -23,6 +23,8 @@ package org.jboss.portal.cms.hibernate; import java.io.Serializable; +import org.hibernate.Hibernate; +import org.jboss.portal.common.io.IOTools; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class VersionEntry implements Serializable @@ -33,9 +35,11 @@ private Integer key; private String path; private String name; - private java.sql.Blob data; + //private java.sql.Blob data; private long lastmod; private long length; + + private byte[] blobData; public VersionEntry() { @@ -45,10 +49,11 @@ { this.key = null; this.path = path; - this.name = name; - this.data = data; + this.name = name; this.lastmod = lastmod; this.length = length; + + this.setData(data); } public Integer getKey() @@ -81,16 +86,6 @@ this.name = name; } - public java.sql.Blob getData() - { - return data; - } - - public void setData(java.sql.Blob data) - { - this.data = data; - } - public long getLastmod() { return lastmod; @@ -110,4 +105,31 @@ { this.length = length; } + + public java.sql.Blob getData() + { + java.sql.Blob blob = null; + + if(this.blobData != null) + { + blob = Hibernate.createBlob(this.blobData); + } + + return blob; + } + + public void setData(java.sql.Blob data) + { + try + { + if(data != null) + { + this.blobData = IOTools.getBytes(data.getBinaryStream()); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } } Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -1527,7 +1527,7 @@ //versionNode.setData(IOTools.getBytes(in)); versionNode.setData(Hibernate.createBlob(in)); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) @@ -1542,7 +1542,7 @@ //wspNode.setData(IOTools.getBytes(in)); wspNode.setData(Hibernate.createBlob(in)); - session.flush(); + //session.flush(); } } catch (Exception e) @@ -1571,7 +1571,7 @@ Hibernate.createBlob(in)); session.save(versionNode); - session.flush(); + //session.flush(); } else if (schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) @@ -1580,7 +1580,7 @@ WSPBinVal wspNode = new WSPBinVal(blobId, Hibernate.createBlob(in)); session.save(wspNode); - session.flush(); + //session.flush(); } } catch (Exception e) Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/VersionBinVal.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/VersionBinVal.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/VersionBinVal.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -24,6 +24,9 @@ import java.io.Serializable; +import org.hibernate.Hibernate; +import org.jboss.portal.common.io.IOTools; + /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class VersionBinVal implements Serializable { @@ -32,7 +35,9 @@ private Integer key; private String id; - private java.sql.Blob data; + //private java.sql.Blob data; + + private byte[] blobData; public VersionBinVal() { @@ -42,7 +47,8 @@ { this.key = null; this.id = id; - this.data = data; + + this.setData(data); } public Integer getKey() @@ -67,11 +73,28 @@ public java.sql.Blob getData() { - return data; + java.sql.Blob blob = null; + + if(this.blobData != null) + { + blob = Hibernate.createBlob(this.blobData); + } + + return blob; } public void setData(java.sql.Blob data) { - this.data = data; + try + { + if(data != null) + { + this.blobData = IOTools.getBytes(data.getBinaryStream()); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } } } Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/WSPBinVal.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/WSPBinVal.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/hibernate/state/WSPBinVal.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -24,6 +24,9 @@ import java.io.Serializable; +import org.hibernate.Hibernate; +import org.jboss.portal.common.io.IOTools; + /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class WSPBinVal implements Serializable { @@ -32,7 +35,8 @@ private Integer key; private String id; - private java.sql.Blob data; + //private java.sql.Blob data; + private byte[] blobData; public WSPBinVal() { @@ -42,7 +46,8 @@ { this.key = null; this.id = id; - this.data = data; + + this.setData(data); } public Integer getKey() @@ -67,11 +72,28 @@ public java.sql.Blob getData() { - return data; + java.sql.Blob blob = null; + + if(this.blobData != null) + { + blob = Hibernate.createBlob(this.blobData); + } + + return blob; } public void setData(java.sql.Blob data) { - this.data = data; + try + { + if(data != null) + { + this.blobData = IOTools.getBytes(data.getBinaryStream()); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } } } Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-01-14 11:11:10 UTC (rev 12495) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-01-14 11:47:46 UTC (rev 12496) @@ -73,11 +73,7 @@ import java.util.Locale; import java.util.Set; -import javax.transaction.TransactionManager; -import javax.transaction.Status; -import javax.naming.InitialContext; - /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a>