Author: bdaw Date: 2009-11-14 05:15:27 -0500 (Sat, 14 Nov 2009) New Revision: 947 Added: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml Log: - another take on binary data in schema Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -45,6 +45,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -46,6 +46,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -67,6 +67,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -48,6 +48,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -51,6 +51,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> Added: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java (rev 0) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java 2009-11-14 10:15:27 UTC (rev 947) @@ -0,0 +1,60 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2009, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + + +package org.jboss.identity.idm.impl.model.hibernate; + +public class HibernateBinaryValue +{ + private Long id; + + private byte[] value = null; + + public HibernateBinaryValue() + { + } + + public HibernateBinaryValue(byte[] value) + { + this.value = value; + } + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + public byte[] getValue() + { + return value; + } + + public void setValue(byte[] value) + { + this.value = value; + } +} Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-14 10:15:27 UTC (rev 947) @@ -48,7 +48,7 @@ private String type; - private byte[] binaryValue = null; + private HibernateBinaryValue binaryValue = null; private Set<String> textValues = new HashSet<String>(); @@ -108,12 +108,12 @@ this.type = newType; } - public byte[] getBinaryValue() + public HibernateBinaryValue getBinaryValue() { return binaryValue; } - public void setBinaryValue(byte[] binaryValue) + public void setBinaryValue(HibernateBinaryValue binaryValue) { this.binaryValue = binaryValue; } @@ -149,7 +149,7 @@ } else if (type.equals(TYPE_BINARY)) { - return getBinaryValue(); + return getBinaryValue().getValue(); } else { @@ -174,7 +174,7 @@ throw new IllegalArgumentException("byte[] value expected with a set type." + " Name=" + name + "; type=" + type); } - setBinaryValue((byte[])value); + setBinaryValue(new HibernateBinaryValue((byte[])value)); } else { @@ -191,7 +191,7 @@ else if (type.equals(TYPE_BINARY)) { Set vals = new HashSet(); - vals.add(getBinaryValue()); + vals.add(getBinaryValue().getValue()); return vals; } else Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-14 10:15:27 UTC (rev 947) @@ -46,7 +46,7 @@ private String textValue; - private byte[] binaryValue; + private HibernateBinaryValue binaryValue; private Map<String, String> properties = new HashMap<String, String>(); @@ -74,12 +74,12 @@ this.textValue = textValue; } - public byte[] getBinaryValue() + public HibernateBinaryValue getBinaryValue() { return binaryValue; } - public void setBinaryValue(byte[] binaryValue) + public void setBinaryValue(HibernateBinaryValue binaryValue) { this.binaryValue = binaryValue; } @@ -120,7 +120,7 @@ { return textValue; } - return binaryValue; + return binaryValue.getValue(); } public Object getEncodedValue() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-14 10:15:27 UTC (rev 947) @@ -23,15 +23,7 @@ package org.jboss.identity.idm.impl.store.hibernate; import org.jboss.identity.idm.common.exception.IdentityException; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; +import org.jboss.identity.idm.impl.model.hibernate.*; import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl; import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; @@ -427,6 +419,7 @@ return config .addResource("mappings/HibernateIdentityObject.hbm.xml") + .addResource("mappings/HibernateBinaryValue.hbm.xml") .addResource("mappings/HibernateIdentityObjectAttribute.hbm.xml") .addResource("mappings/HibernateIdentityObjectCredential.hbm.xml") .addResource("mappings/HibernateIdentityObjectCredentialType.hbm.xml") @@ -1796,7 +1789,9 @@ throw new IdentityException("Wrong attribute mapping. Attribute persisted as binary is mapped with: " + type + ". Attribute name: " + name); } - storeAttribute.setBinaryValue((byte[])attribute.getValue()); + HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue()); + getHibernateSession(ctx).persist(bv); + storeAttribute.setBinaryValue(bv); } else { @@ -1815,7 +1810,9 @@ } else if (type.equals(HibernateIdentityObjectAttribute.TYPE_BINARY)) { - newAttribute.setBinaryValue((byte[])attribute.getValue()); + HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue()); + getHibernateSession(ctx).persist(bv); + newAttribute.setBinaryValue(bv); } hibernateObject.addAttribute(newAttribute); } @@ -1962,7 +1959,9 @@ + type + ". Attribute name: " + name); } - hibernateAttribute.setBinaryValue((byte[])hibernateAttribute.getValue()); + HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue()); + getHibernateSession(ctx).persist(bv); + hibernateAttribute.setBinaryValue(bv); } else { @@ -1993,7 +1992,9 @@ values.add((byte[])value); } hibernateAttribute = new HibernateIdentityObjectAttribute(hibernateObject, name, HibernateIdentityObjectAttribute.TYPE_BINARY); - hibernateAttribute.setBinaryValue((byte[])attribute.getValue()); + HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue()); + getHibernateSession(ctx).persist(bv); + hibernateAttribute.setBinaryValue(bv); } @@ -2181,7 +2182,7 @@ } else if (value instanceof byte[] && hibernateCredential.getBinaryValue() != null) { - return Arrays.equals((byte[])value, hibernateCredential.getBinaryValue()); + return Arrays.equals((byte[])value, hibernateCredential.getBinaryValue().getValue()); } else { @@ -2247,7 +2248,9 @@ } else if (value instanceof byte[]) { - hibernateCredential.setBinaryValue((byte[])value); + HibernateBinaryValue bv = new HibernateBinaryValue((byte[])value); + getHibernateSession(ctx).persist(bv); + hibernateCredential.setBinaryValue(bv); } else { Copied: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml (from rev 943, idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml) =================================================================== --- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml (rev 0) +++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue" + table="jbid_bin_value"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ATTRIBUTE_ID" /> + <generator class="native"/> + </id> + <property name="value" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="true" + not-null="true"> + <column name="VALUE" length="10240000"/> + </property> + </class> +</hibernate-mapping> Modified: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -42,13 +42,17 @@ <element type="string" column="ATTR_VALUE"/> </set> - <property name="binaryValue" - type="org.hibernate.type.PrimitiveByteArrayBlobType" - access="field" - lazy="true" - not-null="true"> - <column name="BINARY_VALUE" length="10240000"/> - </property> + <many-to-one name="binaryValue" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue" + not-null="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"> + <column name="BINARY_VALUE" + not-null="false"/> + </many-to-one> + </class> </hibernate-mapping> Modified: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -12,14 +12,16 @@ <column name="ID" /> <generator class="native"/> </id> - <property name="binaryValue" - type="org.hibernate.type.PrimitiveByteArrayBlobType" - access="field" - lazy="false" - not-null="true"> - <column name="BINARY_VAL" - length="10240000" /> - </property> + <many-to-one name="binaryValue" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue" + not-null="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"> + <column name="BINARY_VALUE" + not-null="false"/> + </many-to-one> <many-to-one name="identityObject" class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject" access="field" Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-14 10:15:27 UTC (rev 947) @@ -95,6 +95,7 @@ List<String> mappings = new LinkedList<String>(); mappings.add("mappings/HibernateIdentityObject.hbm.xml"); + mappings.add("mappings/HibernateBinaryValue.hbm.xml"); mappings.add("mappings/HibernateIdentityObjectAttribute.hbm.xml"); mappings.add("mappings/HibernateIdentityObjectCredential.hbm.xml"); mappings.add("mappings/HibernateIdentityObjectCredentialType.hbm.xml"); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-14 10:15:27 UTC (rev 947) @@ -99,7 +99,7 @@ random.nextBytes(picture); attr = new HibernateIdentityObjectAttribute(user1, "simple2", HibernateIdentityObjectAttribute.TYPE_BINARY); - attr.setBinaryValue(picture); + attr.setBinaryValue(new HibernateBinaryValue(picture)); user1.addAttribute(attr); commit(); @@ -117,7 +117,7 @@ attr = new HibernateIdentityObjectAttribute(user1, "simple3", HibernateIdentityObjectAttribute.TYPE_BINARY); - attr.setBinaryValue(picture); + attr.setBinaryValue(new HibernateBinaryValue(picture)); user1.getAttributes().add(attr); commit(); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-11-14 10:15:27 UTC (rev 947) @@ -232,8 +232,8 @@ store.removeAttributes(ctx, user1, new String[]{"key1", "key2"}); assertNull(store.findIdentityObjectByUniqueAttribute(ctx, IdentityTypeEnum.USER, new SimpleAttribute("key1", new String[]{"toto"}))); - + commit(); } Modified: idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -48,6 +48,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947) @@ -49,6 +49,7 @@ <!-- all nessesary mappings are added programatically to the configuration in the store--> <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->