Author: bdaw Date: 2009-11-08 17:37:19 -0500 (Sun, 08 Nov 2009) New Revision: 915 Added: idm/trunk/idm-testsuite/src/test/resources/mappings/ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObject.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredential.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectType.hbm.xml idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateRealm.hbm.xml Removed: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 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/model/hibernate/HibernateIdentityObjectCredentialType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 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/HibernateModelTestCase.java idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml idm/trunk/pom.xml Log: - convert hibernate annotations into xml mappings Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-08 22:37:19 UTC (rev 915) @@ -26,12 +26,7 @@ import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -55,10 +50,6 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name = "jbid_io", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "IDENTITY_TYPE", "REALM"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - public class HibernateIdentityObject implements IdentityObject { public static final String findIdentityObjectByNameAndType = @@ -79,53 +70,22 @@ "select count(o.id) from HibernateIdentityObject o where o.realm.name = :realmName and o.identityType.name = :typeName"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(name = "NAME", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "IDENTITY_TYPE", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObjectType identityType; - @OneToMany(mappedBy = "fromIdentityObject") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Set<HibernateIdentityObjectRelationship> fromRelationships = new HashSet<HibernateIdentityObjectRelationship>(); - @OneToMany(mappedBy = "toIdentityObject") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - private Set<HibernateIdentityObjectRelationship> toRelationships = new HashSet<HibernateIdentityObjectRelationship>(); - @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL}, - mappedBy = "identityObject") - @org.hibernate.annotations.Cascade( - value = {org.hibernate.annotations.CascadeType.DELETE_ORPHAN} - ) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Set<HibernateIdentityObjectAttribute> attributes = new HashSet<HibernateIdentityObjectAttribute>(); - @CollectionOfElements - @JoinTable(name = "identity_obj_properties", joinColumns = @JoinColumn(name = "IDENTITY_OBJ_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) - @Column(name = "PROPERTY") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Map<String, String> properties = new HashMap<String, String>(); - @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL}, mappedBy = "identityObject") - @Cascade(value = org.hibernate.annotations.CascadeType.DELETE_ORPHAN) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Set<HibernateIdentityObjectCredential> credentials = new HashSet<HibernateIdentityObjectCredential>(); - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(nullable = false, unique = false, name="REALM") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateRealm realm; public HibernateIdentityObject() @@ -205,7 +165,11 @@ public void addTextAttribute(String name, String[] values) { - attributes.add(new HibernateIdentityObjectTextAttribute(this, name, values)); + HibernateIdentityObjectAttribute attr = new HibernateIdentityObjectAttribute(this, name, HibernateIdentityObjectAttribute.TYPE_TEXT); + List<String> list = Arrays.asList(values); + Set<String> vals = new HashSet<String>(list); + attr.setTextValues(vals); + attributes.add(attr); } public void removeAttribute(String name) 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-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-08 22:37:19 UTC (rev 915) @@ -24,65 +24,43 @@ import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; -import javax.persistence.UniqueConstraint; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import java.util.Set; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; +import java.util.HashSet; +import java.util.Collection; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "jbid_io_attr", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "IDENTITY_OBJECT_ID"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public abstract class HibernateIdentityObjectAttribute implements IdentityObjectAttribute +public class HibernateIdentityObjectAttribute implements IdentityObjectAttribute { - @Id - @GeneratedValue - @Column(name="ATTRIBUTE_ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) + + public static final String TYPE_TEXT = "TEXT"; + + public static final String TYPE_BINARY = "BINARY"; + private Long id; - @ManyToOne - @JoinColumn(name="IDENTITY_OBJECT_ID", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObject identityObject; - @Column(name = "NAME") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; - public HibernateIdentityObjectAttribute() - { - } + private String type; - public HibernateIdentityObjectAttribute(HibernateIdentityObject identityObject, String name) - { - this.identityObject = identityObject; - this.name = name; - } + private Set<byte[]> binaryValues = new HashSet<byte[]>(); - public HibernateIdentityObjectAttribute(HibernateIdentityObject identityObject, String name, Set<String> values) + private Set<String> textValues = new HashSet<String>(); + + + public HibernateIdentityObjectAttribute() { - this.identityObject = identityObject; - this.name = name; } - public HibernateIdentityObjectAttribute(HibernateIdentityObject identityObject, String name, String[] values) + public HibernateIdentityObjectAttribute(HibernateIdentityObject identityObject, String name, String type) { this.identityObject = identityObject; this.name = name; + setType(type); } public Long getId() @@ -105,12 +83,6 @@ this.name = name; } - @SuppressWarnings("unchecked") - public void addValue(String val) - { - getValues().add(val); - } - public HibernateIdentityObject getIdentityObject() { return identityObject; @@ -121,4 +93,130 @@ this.identityObject = identityObject; } + public String getType() + { + return type; + } + + public void setType(String newType) + { + this.type = newType; + } + + public Set<byte[]> getBinaryValues() + { + return binaryValues; + } + + public void setBinaryValues(Set<byte[]> binaryValues) + { + this.binaryValues = binaryValues; + } + + public void addBinValue(byte[] value) + { + getBinaryValues().add(value); + } + + public Set<String> getTextValues() + { + return textValues; + } + + public void setTextValues(Set<String> textValues) + { + this.textValues = textValues; + } + + public void addTextValue(String value) + { + getTextValues().add(value); + } + + public Object getValue() + { + if (type.equals(TYPE_TEXT)) + { + if (getTextValues().size() > 0) + { + return getTextValues().iterator().next(); + } + else + { + return null; + } + } + else if (type.equals(TYPE_BINARY)) + { + if (getBinaryValues().size() > 0) + { + return getBinaryValues().iterator().next(); + } + else + { + return null; + } + } + else + { + throw new IllegalStateException("Type has not supported value"); + } + } + + public void addValue(Object value) + { + if (type.equals(TYPE_TEXT)) + { + if (!(value instanceof String)) + { + throw new IllegalArgumentException("String value expected with a set type"); + } + addTextValue((String)value); + } + else if (type.equals(TYPE_BINARY)) + { + if (!(value instanceof byte[])) + { + throw new IllegalArgumentException("byte[] value expected with a set type"); + } + + addBinValue((byte[])value); + } + else + { + throw new IllegalStateException("Type has not supported value or has not been set"); + } + } + + public Collection getValues() + { + if (type.equals(TYPE_TEXT)) + { + return getTextValues(); + } + else if (type.equals(TYPE_BINARY)) + { + return getBinaryValues(); + } + else + { + throw new IllegalStateException("Type has not supported value"); + } + } + + public int getSize() + { + if (type.equals(TYPE_TEXT)) + { + return getTextValues().size(); + } + else if (type.equals(TYPE_BINARY)) + { + return getBinaryValues().size(); + } + else + { + throw new IllegalStateException("Type has not supported value"); + } + } } Deleted: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-11-08 22:37:19 UTC (rev 915) @@ -1,122 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, 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; - -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ - -@Entity -@Table(name = "jbid_io_attr_bin") -@PrimaryKeyJoinColumn(name = "ATTRIBUTE_ID") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public class HibernateIdentityObjectBinaryAttribute extends HibernateIdentityObjectAttribute -{ - - @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL}) - @org.hibernate.annotations.Cascade( - value = {org.hibernate.annotations.CascadeType.DELETE_ORPHAN} - ) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - private Set<HibernateIdentityObjectBinaryAttributeValue> values = new HashSet<HibernateIdentityObjectBinaryAttributeValue>(); - - public HibernateIdentityObjectBinaryAttribute() - { - } - - public HibernateIdentityObjectBinaryAttribute(HibernateIdentityObject identityObject, String name, Set<byte[]> values) - { - super(identityObject, name); - - for (byte[] value : values) - { - addValue(value); - } - - } - - public Set<byte[]> getValues() - { - Set<byte[]> vals = new HashSet<byte[]>(); - for (HibernateIdentityObjectBinaryAttributeValue value : values) - { - vals.add(value.getValue()); - } - - return vals; - - } - - public void setValues(Set<byte[]> values) - { - this.values = new HashSet<HibernateIdentityObjectBinaryAttributeValue>(); - for (byte[] value : values) - { - addValue(value); - } - } - - public byte[] getValue() - { - if (values.size() > 0) - { - return values.iterator().next().getValue(); - } - else - { - return null; - } - } - - public int getSize() - { - return values.size(); - } - - public void addValue(Object value) - { - if (value != null && value instanceof byte[]) - { - addValue(new HibernateIdentityObjectBinaryAttributeValue((byte[])value)); - } - } - - public void addValue(HibernateIdentityObjectBinaryAttributeValue value) - { - values.add(value); - } - -} Deleted: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java 2009-11-08 22:37:19 UTC (rev 915) @@ -1,85 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, 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; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ - -@Entity -//The table name need to fit in oracle constrants (ORA-00972: identifier is too long) -@Table(name = "jbid_io_bin") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public class HibernateIdentityObjectBinaryAttributeValue -{ - - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - private Long id; - - @Lob - @Column(length = 10240000, name="VAL") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - private byte[] value; - - public HibernateIdentityObjectBinaryAttributeValue() - { - } - - public HibernateIdentityObjectBinaryAttributeValue(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; - } -} \ No newline at end of file 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-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-08 22:37:19 UTC (rev 915) @@ -47,9 +47,6 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name = "jbid_io_creden", uniqueConstraints = {@UniqueConstraint(columnNames = {"CREDENTIAL_TYPE", "IDENTITY_OBJECT_ID"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectCredential implements IdentityObjectCredential { @@ -57,36 +54,16 @@ "select c from HibernateIdentityObjectCredential c where c.type.name like :typeName and c.identityObject = :identityObject"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "CREDENTIAL_TYPE", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObjectCredentialType type; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "IDENTITY_OBJECT_ID", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObject identityObject; - @Column(name= "TEXT", nullable = true) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String textValue; - @Lob - @Column(name= "BINARY_VAL", nullable = true, length = 10240000) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private byte[] binaryValue; - @CollectionOfElements - @JoinTable(name = "jbid_io_creden_props", joinColumns = @JoinColumn(name = "CREDENTIAL_ID", nullable = false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) - @Column(name = "PROPERTY") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Map<String, String> properties = new HashMap<String, String>(); public HibernateIdentityObjectCredential() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-11-08 22:37:19 UTC (rev 915) @@ -36,20 +36,11 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name = "jbid_io_creden_type") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectCredentialType implements IdentityObjectCredentialType { - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(name = "NAME", unique = true) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; public HibernateIdentityObjectCredentialType() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-11-08 22:37:19 UTC (rev 915) @@ -47,9 +47,6 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name="jbid_io_rel", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "REL_TYPE", "FROM_IDENTITY", "TO_IDENTITY"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectRelationship implements IdentityObjectRelationship { public static final String findIdentityObjectRelationshipsByType = @@ -59,37 +56,16 @@ "select r.name from HibernateIdentityObjectRelationship r where r.type.name = :typeName"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @ManyToOne - @JoinColumn(nullable = true, unique = false, name="NAME") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObjectRelationshipName name; - @ManyToOne - @JoinColumn(nullable = false, name="REL_TYPE") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObjectRelationshipType type; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(nullable = false, name="FROM_IDENTITY") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObject fromIdentityObject; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(nullable = false, name="TO_IDENTITY") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateIdentityObject toIdentityObject; - @CollectionOfElements - @JoinTable(name = "jbid_io_rel_props", joinColumns = @JoinColumn(name = "REALATIONSHIP_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) - @Column(name = "PROPERTY") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Map<String, String> properties = new HashMap<String, String>(); public HibernateIdentityObjectRelationship() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-08 22:37:19 UTC (rev 915) @@ -44,9 +44,6 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name="jbid_io_rel_name", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "REALM"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectRelationshipName { @@ -78,27 +75,12 @@ "r.fromIdentityObject = :identityObject or r.toIdentityObject = :identityObject " + "order by r.name.name desc"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(nullable = false, unique = true, name = "NAME") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; - @ManyToOne - @JoinColumn(nullable = false, name="REALM") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private HibernateRealm realm; - @CollectionOfElements() - @JoinTable(name = "jbid_io_rel_name_props", joinColumns = @JoinColumn(name = "REALATIONSHIP_NAME_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) - @Column(name = "PROPERTY") - @Cascade(value = {org.hibernate.annotations.CascadeType.DELETE_ORPHAN, org.hibernate.annotations.CascadeType.ALL}) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Map<String, String> properties = new HashMap<String, String>(); public HibernateIdentityObjectRelationshipName() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-11-08 22:37:19 UTC (rev 915) @@ -36,30 +36,14 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -//@NamedQueries({ -// @NamedQuery( -// name = "findIdentityObjectRelationshipTypeByName", -// query = "select t from HibernateIdentityObjectRelationshipType t where t.name like :name" -// ) -// }) -@Entity -@Table(name = "jbid_io_rel_type") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectRelationshipType implements IdentityObjectRelationshipType { public static final String findIdentityObjectRelationshipTypeByName = "select t from HibernateIdentityObjectRelationshipType t where t.name like :name"; - - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(nullable = false, unique = true, name="NAME") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; public HibernateIdentityObjectRelationshipType() Deleted: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-11-08 22:37:19 UTC (rev 915) @@ -1,103 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, 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; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.CollectionOfElements; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -@Entity -@Table(name = "jbid_io_attr_text") -@PrimaryKeyJoinColumn(name = "ATTRIBUTE_ID") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public class HibernateIdentityObjectTextAttribute extends HibernateIdentityObjectAttribute -{ - - @CollectionOfElements - @JoinTable(name = "jbid_io_attr_text_values", joinColumns = @JoinColumn(name = "VAL")) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) - private Set<String> values = new HashSet<String>(); - - public HibernateIdentityObjectTextAttribute() - { - } - - public HibernateIdentityObjectTextAttribute(HibernateIdentityObject identityObject, String name, Set<String> values) - { - super(identityObject, name); - this.values = values; - } - - public HibernateIdentityObjectTextAttribute(HibernateIdentityObject identityObject, String name, String[] values) - { - super(identityObject, name); - } - - public Set<String> getValues() - { - return Collections.unmodifiableSet(values); - } - - public void setValues(Set<String> values) - { - this.values = values; - } - - public String getValue() - { - if (values.size() > 0) - { - return values.iterator().next(); - } - else - { - return null; - } - } - - public void addValue(Object value) - { - values.add(value.toString()); - } - - public int getSize() - { - return values.size(); - } - - -} Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-11-08 22:37:19 UTC (rev 915) @@ -38,29 +38,14 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@NamedQueries({ - @NamedQuery( - name = "findIdentityObjectTypeByName", - query = "select t from HibernateIdentityObjectType t where t.name like :name" - ) - }) -@Entity -@Table(name = "jbid_io_type") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateIdentityObjectType implements IdentityObjectType { public static final String findIdentityObjectTypeByName = "select t from HibernateIdentityObjectType t where t.name like :name"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(nullable = false, unique = true, name="NAME") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-11-08 22:37:19 UTC (rev 915) @@ -42,30 +42,16 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Entity -@Table(name = "jbid_realm", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})}) -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibernateRealm { public static final String findIRealmByName = "select o from HibernateRealm o where o.name = :name"; - @Id - @GeneratedValue - @Column(name = "ID") - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Long id; - @Column(name = "NAME", nullable = false) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private String name; - @CollectionOfElements - @JoinTable(name = "jbid_io_realm_props", joinColumns = @JoinColumn(name = "REALM_ID", nullable=false)) - @Column(name = "PROPERTY") - @org.hibernate.annotations.MapKey(columns = @Column(name = "prop_key", nullable=false)) - @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private Map<String, String> properties = new HashMap<String, String>(); public HibernateRealm() 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-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-08 22:37:19 UTC (rev 915) @@ -25,14 +25,11 @@ 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.HibernateIdentityObjectBinaryAttribute; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue; 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.HibernateIdentityObjectTextAttribute; import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl; @@ -424,7 +421,6 @@ { AnnotationConfiguration config = new AnnotationConfiguration().configure(hibernateConfiguration); - //TODO: make it optional to add annotated classes here if (addMappedClasses != null && addMappedClasses.equals("false")) { @@ -435,9 +431,6 @@ return config.addAnnotatedClass(HibernateIdentityObject.class) .addAnnotatedClass(HibernateIdentityObjectAttribute.class) - .addAnnotatedClass(HibernateIdentityObjectBinaryAttribute.class) - .addAnnotatedClass(HibernateIdentityObjectBinaryAttributeValue.class) - .addAnnotatedClass(HibernateIdentityObjectTextAttribute.class) .addAnnotatedClass(HibernateIdentityObjectCredential.class) .addAnnotatedClass(HibernateIdentityObjectCredentialType.class) .addAnnotatedClass(HibernateIdentityObjectRelationship.class) @@ -1755,7 +1748,7 @@ { if (storeAttribute.getName().equals(name)) { - if (storeAttribute instanceof HibernateIdentityObjectTextAttribute) + if (storeAttribute.getType().equals(HibernateIdentityObjectAttribute.TYPE_TEXT)) { if (!type.equals(IdentityObjectAttributeMetaData.TEXT_TYPE)) { @@ -1770,9 +1763,9 @@ v.add(value.toString()); } - ((HibernateIdentityObjectTextAttribute)storeAttribute).setValues(v); + storeAttribute.setTextValues(v); } - else if (storeAttribute instanceof HibernateIdentityObjectBinaryAttribute) + else if (storeAttribute.equals(HibernateIdentityObjectAttribute.TYPE_BINARY)) { if (!type.equals(IdentityObjectAttributeMetaData.BINARY_TYPE)) @@ -1787,7 +1780,7 @@ v.add((byte[])value); } - ((HibernateIdentityObjectBinaryAttribute)storeAttribute).setValues(v); + storeAttribute.setBinaryValues(v); } else { @@ -1904,7 +1897,7 @@ if (hibernateAttribute != null) { - if (hibernateAttribute instanceof HibernateIdentityObjectTextAttribute) + if (hibernateAttribute.getType().equals(HibernateIdentityObjectAttribute.TYPE_TEXT)) { if (!type.equals(IdentityObjectAttributeMetaData.TEXT_TYPE)) { @@ -1919,9 +1912,9 @@ mergedValues.add(value.toString()); } - ((HibernateIdentityObjectTextAttribute)hibernateAttribute).setValues(mergedValues); + hibernateAttribute.setTextValues(mergedValues); } - else if (hibernateAttribute instanceof HibernateIdentityObjectBinaryAttribute) + else if (hibernateAttribute.getType().equals(HibernateIdentityObjectAttribute.TYPE_BINARY)) { if (!type.equals(IdentityObjectAttributeMetaData.BINARY_TYPE)) @@ -1936,7 +1929,7 @@ mergedValues.add((byte[])value); } - ((HibernateIdentityObjectBinaryAttribute)hibernateAttribute).setValues(mergedValues); + hibernateAttribute.setBinaryValues(mergedValues); } else { @@ -1955,7 +1948,8 @@ { values.add(value.toString()); } - hibernateAttribute = new HibernateIdentityObjectTextAttribute(hibernateObject, name, values); + hibernateAttribute = new HibernateIdentityObjectAttribute(hibernateObject, name, HibernateIdentityObjectAttribute.TYPE_TEXT); + hibernateAttribute.setTextValues(values);; } else if (type.equals(IdentityObjectAttributeMetaData.BINARY_TYPE)) { @@ -1965,7 +1959,8 @@ { values.add((byte[])value); } - hibernateAttribute = new HibernateIdentityObjectBinaryAttribute(hibernateObject, name, values); + hibernateAttribute = new HibernateIdentityObjectAttribute(hibernateObject, name, HibernateIdentityObjectAttribute.TYPE_BINARY); + hibernateAttribute.setBinaryValues(values); } @@ -2029,6 +2024,7 @@ checkIOType(identityObjectType); + //TODO: check both binary and text with multivalue String attrMappedName = resolveAttributeStoreMapping(identityObjectType, attribute.getName()); @@ -2036,8 +2032,8 @@ Session session = getHibernateSession(invocationCtx); - Query q = session.createQuery("select a from HibernateIdentityObjectTextAttribute a where a.identityObject.identityType = :identityType " + - "and a.name like :attributeName and :value = any elements(a.values)"); + Query q = session.createQuery("select a from HibernateIdentityObjectAttribute a where a.identityObject.identityType = :identityType " + + "and a.name = :attributeName and :value = any elements(a.textValues)"); Set attrValues = new HashSet(); attrValues.addAll(attribute.getValues()); 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-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-08 22:37:19 UTC (rev 915) @@ -24,14 +24,11 @@ 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.HibernateIdentityObjectBinaryAttribute; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue; 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.HibernateIdentityObjectTextAttribute; import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; import org.jboss.identity.idm.test.HibernateAnnotationsSupport; @@ -102,26 +99,38 @@ dataSourceSupport.setConfig(dataSourceConfig); dataSourceSupport.start(); - hibernateSupport = new HibernateAnnotationsSupport(); +// hibernateSupport = new HibernateAnnotationsSupport(); + hibernateSupport = new HibernateSupport(); hibernateSupport.setConfig(hibernateSupportConfig); hibernateSupport.setJNDIName("java:/jbossidentity/HibernateStoreSessionFactory"); - List<String> annotatedClasses = new LinkedList<String>(); - annotatedClasses.add(HibernateIdentityObject.class.getName()); - annotatedClasses.add(HibernateIdentityObjectAttribute.class.getName()); - annotatedClasses.add(HibernateIdentityObjectBinaryAttribute.class.getName()); - annotatedClasses.add(HibernateIdentityObjectBinaryAttributeValue.class.getName()); - annotatedClasses.add(HibernateIdentityObjectTextAttribute.class.getName()); - annotatedClasses.add(HibernateIdentityObjectCredential.class.getName()); - annotatedClasses.add(HibernateIdentityObjectCredentialType.class.getName()); - annotatedClasses.add(HibernateIdentityObjectRelationship.class.getName()); - annotatedClasses.add(HibernateIdentityObjectRelationshipName.class.getName()); - annotatedClasses.add(HibernateIdentityObjectRelationshipType.class.getName()); - annotatedClasses.add(HibernateIdentityObjectType.class.getName()); - annotatedClasses.add(HibernateRealm.class.getName()); +// List<String> annotatedClasses = new LinkedList<String>(); +// annotatedClasses.add(HibernateIdentityObject.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectAttribute.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectBinaryAttribute.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectBinaryAttributeValue.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectTextAttribute.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectCredential.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectCredentialType.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectRelationship.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectRelationshipName.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectRelationshipType.class.getName()); +// annotatedClasses.add(HibernateIdentityObjectType.class.getName()); +// annotatedClasses.add(HibernateRealm.class.getName()); - hibernateSupport.setMappings(annotatedClasses); + List<String> mappings = new LinkedList<String>(); + mappings.add("mappings/HibernateIdentityObject.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectAttribute.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectCredential.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectCredentialType.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectRelationship.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectRelationshipName.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectRelationshipType.hbm.xml"); + mappings.add("mappings/HibernateIdentityObjectType.hbm.xml"); + mappings.add("mappings/HibernateRealm.hbm.xml"); + hibernateSupport.setMappings(mappings); + hibernateSupport.start(); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-11-08 22:37:19 UTC (rev 915) @@ -22,14 +22,7 @@ package org.jboss.identity.idm.impl.store.hibernate; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential; +import org.jboss.identity.idm.impl.model.hibernate.*; import org.jboss.identity.idm.impl.IdentityTestPOJO; import org.jboss.identity.idm.impl.api.PasswordCredential; import org.jboss.unit.api.pojo.annotations.Destroy; @@ -38,7 +31,12 @@ import org.hibernate.Session; import org.hibernate.Query; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; +import java.util.HashSet; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -73,6 +71,14 @@ HibernateRealm defaultRealm = new HibernateRealm("default"); session.persist(defaultRealm); + Map<String, String> props = new HashMap<String, String>(); + props.put("test", "testValue"); + defaultRealm.setProperties(props); + + defaultRealm = (HibernateRealm)session.get(HibernateRealm.class, defaultRealm.getId()); + + assertEquals(defaultRealm.getProperties().keySet().size(), 1); + // HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); @@ -105,19 +111,6 @@ session.persist(iort); assertTrue(session.contains(iort)); - // - -// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); -// ior.setType(iort); -// -// em.persist(ior); -// assertTrue(em.contains(ior)); - -// em.remove(ior); -// assertFalse(em.contains(ior)); - - // - assertTrue(session.contains(iort)); session.delete(iort); @@ -312,16 +305,24 @@ HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); session.persist(user1); -// Set<String> values1 = new HashSet<String>(); -// values1.add("Val1"); -// values1.add("Val2"); -// values1.add("Val3"); + Set<String> values1 = new HashSet<String>(); + values1.add("Val1"); + values1.add("Val2"); + values1.add("Val3"); + HibernateIdentityObjectAttribute attr = new HibernateIdentityObjectAttribute(user1, "simple1", HibernateIdentityObjectAttribute.TYPE_TEXT); + attr.setTextValues(values1); + user1.getAttributes().add(attr); + attr = new HibernateIdentityObjectAttribute(user1, "simple2", HibernateIdentityObjectAttribute.TYPE_TEXT); + attr.setTextValues(values1); + user1.getAttributes().add(attr); - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); + + + + commit(); Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObject.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObject.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,85 @@ +<?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.HibernateIdentityObject" + table="jbid_io"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <set name="attributes" + inverse="true" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" /> + </set> + <set name="credentials" + inverse="true" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential" /> + </set> + <set name="fromRelationships" + inverse="true"> + <cache usage="read-write"/> + <key> + <column name="FROM_IDENTITY" /> + </key> + <one-to-many class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + <many-to-one name="identityType" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType" + access="field" + fetch="join" + lazy="false"> + <column name="IDENTITY_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_props" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="join"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + <set name="toRelationships" + inverse="true"> + <cache usage="read-write"/> + <key> + <column name="TO_IDENTITY" /> + </key> + <one-to-many class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,53 @@ +<?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.HibernateIdentityObjectAttribute" + table="jbid_io_attr"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ATTRIBUTE_ID" /> + <generator class="native"/> + </id> + <many-to-one name="identityObject" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join"> + <column name="IDENTITY_OBJECT_ID" not-null="true" unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="property" + lazy="false"> + <column name="NAME" + unique-key="id" /> + </property> + <property name="type" + type="java.lang.String" + access="field" + lazy="false" + not-null="true"> + <column name="TYPE"/> + </property> + <set name="textValues" + table="jbid_io_attr_text_values" + lazy="false"> + <cache usage="read-write"/> + <key column="TEXT_ATTR_VALUE_ID"/> + <element type="string" + column="ATTR_VALUE"/> + </set> + <set name="binaryValues" + table="jbid_io_attr_bin_values" + access="field" + lazy="false"> + <cache usage="read-write"/> + <key column="BIN_ATTR_VALUE_ID"/> + <element type="org.hibernate.type.PrimitiveByteArrayBlobType" + column="ATTR_VALUE" length="10240000"/> + </set> + + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredential.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,58 @@ +<?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.HibernateIdentityObjectCredential" + table="jbid_io_creden"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="binaryValue" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="false"> + <column name="BINARY_VAL" + length="10240000" /> + </property> + <many-to-one name="identityObject" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join" + lazy="false"> + <column name="IDENTITY_OBJECT_ID" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_creden_props" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <property name="textValue" + type="java.lang.String" + access="field" + lazy="false"> + <column name="TEXT" /> + </property> + <many-to-one name="type" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" + access="field" + fetch="join" + lazy="false"> + <column name="CREDENTIAL_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -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.HibernateIdentityObjectCredentialType" + table="jbid_io_creden_type"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,61 @@ +<?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.HibernateIdentityObjectRelationship" + table="jbid_io_rel"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <many-to-one name="fromIdentityObject" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join" + lazy="false"> + <column name="FROM_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="name" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" + access="field" + fetch="join" + lazy="false"> + <column name="NAME" + unique-key="id"/> + </many-to-one> + <many-to-one name="toIdentityObject" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join" + lazy="false"> + <column name="TO_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="type" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" + access="field" + fetch="join" + lazy="false"> + <column name="REL_TYPE" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_rel__props" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,44 @@ +<?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.HibernateIdentityObjectRelationshipName" + table="jbid_io_rel_name"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID"/> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + not-null="true" + unique="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_rel_name_props" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="join"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -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.HibernateIdentityObjectRelationshipType" + table="jbid_io_rel_type"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"></generator> + </id> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectType.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectType.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateIdentityObjectType.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,23 @@ +<?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.HibernateIdentityObjectType" + table="jbid_io_type"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateRealm.hbm.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateRealm.hbm.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/mappings/HibernateRealm.hbm.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -0,0 +1,33 @@ +<?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.HibernateRealm" + table="jbid_realm"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_real_props" + cascade="all, delete-orphan"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -173,34 +173,6 @@ <identity-object-type> <name>USER</name> <relationships> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>--> - <!--</relationship>--> </relationships> <credentials> <credential-type>PASSWORD</credential-type> Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -212,36 +212,7 @@ <supported-identity-object-types> <identity-object-type> <name>USER</name> - <relationships> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>--> - <!--</relationship>--> - </relationships> + <relationships/> <credentials> <credential-type>PASSWORD</credential-type> </credentials> Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2009-11-08 22:19:20 UTC (rev 914) +++ idm/trunk/pom.xml 2009-11-08 22:37:19 UTC (rev 915) @@ -27,9 +27,10 @@ <module>idm-testsuite</module> <module>integration</module> <module>idm-doc</module> - <module>example/simple</module> - <module>example/auth</module> - <module>example/auth-simple</module> + <!--TODO: fix--> + <!--<module>example/simple</module>--> + <!--<module>example/auth</module>--> + <!--<module>example/auth-simple</module>--> </modules> <profiles>