jboss-identity-commits
November 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 196 discussions
JBoss Identity SVN: r922 - idm/trunk/idm-hibernate/src/main/resources/mappings.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-09 14:21:21 -0500 (Mon, 09 Nov 2009)
New Revision: 922
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
Log:
- different try for binary 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-09 18:52:07 UTC (rev 921)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-09 19:21:21 UTC (rev 922)
@@ -42,7 +42,7 @@
column="ATTR_VALUE"/>
</set>
<property name="binaryValue"
- type="binary"
+ type="clob"
access="field"
lazy="false"
not-null="true">
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-09 18:52:07 UTC (rev 921)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-09 19:21:21 UTC (rev 922)
@@ -13,9 +13,10 @@
<generator class="native"/>
</id>
<property name="binaryValue"
- type="binary"
+ type="clob"
access="field"
- lazy="false">
+ lazy="false"
+ not-null="true">
<column name="BINARY_VAL"
length="10240000" />
</property>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r921 - identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust.
by jboss-identity-commits＠lists.jboss.org
Author: beve
Date: 2009-11-09 13:52:07 -0500 (Mon, 09 Nov 2009)
New Revision: 921
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SamlCredential.java
Log:
Work for https://jira.jboss.org/jira/browse/JBID-214 "SamlCredential: assertionToElement should throw ProcessingException"
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SamlCredential.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SamlCredential.java 2009-11-09 18:02:04 UTC (rev 920)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SamlCredential.java 2009-11-09 18:52:07 UTC (rev 921)
@@ -34,7 +34,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.jboss.identity.federation.core.wstrust.exceptions.SamlCredentialParseException;
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.exceptions.ParsingException;
import org.jboss.identity.federation.core.exceptions.ProcessingException;
@@ -78,7 +77,7 @@
return assertion;
}
- public Element getAssertionAsElement() throws SamlCredentialParseException
+ public Element getAssertionAsElement() throws ProcessingException
{
return SamlCredential.assertionToElement(assertion);
}
@@ -110,7 +109,7 @@
return "SamlCredential[" + assertion + "]";
}
- public static Element assertionToElement(final String assertion) throws SamlCredentialParseException
+ public static Element assertionToElement(final String assertion) throws ProcessingException
{
try
{
@@ -119,16 +118,12 @@
}
catch (final ConfigurationException e)
{
- throw new SamlCredentialParseException(e);
+ throw new ProcessingException(e);
}
catch (final ParsingException e)
{
- throw new SamlCredentialParseException(e);
+ throw new ProcessingException(e);
}
- catch (final ProcessingException e)
- {
- throw new SamlCredentialParseException(e);
- }
}
public static String assertionToString(final Element assertion)
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r920 - idm/trunk/idm-hibernate/src/main/resources/mappings.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-09 13:02:04 -0500 (Mon, 09 Nov 2009)
New Revision: 920
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
Log:
- length for binary attribute
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-09 17:13:00 UTC (rev 919)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-09 18:02:04 UTC (rev 920)
@@ -46,7 +46,7 @@
access="field"
lazy="false"
not-null="true">
- <column name="BINARY_VALUE"/>
+ <column name="BINARY_VALUE" length="10240000"/>
</property>
</class>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r919 - in idm/trunk/idm-hibernate/src/main: resources/mappings and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-09 12:13:00 -0500 (Mon, 09 Nov 2009)
New Revision: 919
Modified:
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
Log:
- fix the build
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-09 16:00:13 UTC (rev 918)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-09 17:13:00 UTC (rev 919)
@@ -27,6 +27,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Collection;
+import java.util.Collections;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -115,12 +116,13 @@
public Set<String> getTextValues()
{
- return textValues;
+ return Collections.unmodifiableSet(textValues);
}
public void setTextValues(Set<String> textValues)
{
- this.textValues = textValues;
+ this.textValues.clear();
+ this.textValues.addAll(textValues);
}
public void addTextValue(String value)
@@ -180,7 +182,7 @@
{
if (type.equals(TYPE_TEXT))
{
- return getTextValues();
+ return Collections.unmodifiableSet(getTextValues());
}
else if (type.equals(TYPE_BINARY))
{
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-09 16:00:13 UTC (rev 918)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-09 17:13:00 UTC (rev 919)
@@ -34,6 +34,7 @@
<set name="textValues"
table="jbid_io_attr_text_values"
cascade="all, delete-orphan"
+ access="field"
lazy="false">
<cache usage="read-write"/>
<key column="TEXT_ATTR_VALUE_ID"/>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r918 - in idm/trunk: idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate and 3 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-09 11:00:13 -0500 (Mon, 09 Nov 2009)
New Revision: 918
Added:
idm/trunk/idm-hibernate/src/main/resources/mappings/
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml
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-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml
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/store/hibernate/HibernateIdentityStoreImpl.java
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java
Log:
- missing mappings files
- more schema tweaks
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-09 13:12:00 UTC (rev 917)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-09 16:00:13 UTC (rev 918)
@@ -47,7 +47,7 @@
private String type;
- private Set<byte[]> binaryValues = new HashSet<byte[]>();
+ private byte[] binaryValue = null;
private Set<String> textValues = new HashSet<String>();
@@ -103,21 +103,16 @@
this.type = newType;
}
- public Set<byte[]> getBinaryValues()
+ public byte[] getBinaryValue()
{
- return binaryValues;
+ return binaryValue;
}
- public void setBinaryValues(Set<byte[]> binaryValues)
+ public void setBinaryValue(byte[] binaryValue)
{
- this.binaryValues = binaryValues;
+ this.binaryValue = binaryValue;
}
- public void addBinValue(byte[] value)
- {
- getBinaryValues().add(value);
- }
-
public Set<String> getTextValues()
{
return textValues;
@@ -148,14 +143,7 @@
}
else if (type.equals(TYPE_BINARY))
{
- if (getBinaryValues().size() > 0)
- {
- return getBinaryValues().iterator().next();
- }
- else
- {
- return null;
- }
+ return getBinaryValue();
}
else
{
@@ -180,7 +168,7 @@
throw new IllegalArgumentException("byte[] value expected with a set type");
}
- addBinValue((byte[])value);
+ setBinaryValue((byte[])value);
}
else
{
@@ -196,7 +184,9 @@
}
else if (type.equals(TYPE_BINARY))
{
- return getBinaryValues();
+ Set vals = new HashSet();
+ vals.add(getBinaryValue());
+ return vals;
}
else
{
@@ -212,7 +202,11 @@
}
else if (type.equals(TYPE_BINARY))
{
- return getBinaryValues().size();
+ if (getBinaryValue() != null)
+ {
+ return 1;
+ }
+ return 0;
}
else
{
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-09 13:12:00 UTC (rev 917)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-09 16:00:13 UTC (rev 918)
@@ -1725,6 +1725,11 @@
+ attribute.getName() + " / " + value);
}
}
+ if (type.equals(IdentityObjectAttributeMetaData.BINARY_TYPE) && attribute.getValues().size() > 1)
+ {
+ throw new IdentityException("Cannot add binary type attribute with more than one value - this implementation" +
+ "support only single value binary attributes: " + attribute.getName() );
+ }
}
}
@@ -1775,13 +1780,9 @@
+ type + ". Attribute name: " + name);
}
- Set<byte[]> v = new HashSet<byte[]>();
- for (Object value : attribute.getValues())
- {
- v.add((byte[])value);
- }
- storeAttribute.setBinaryValues(v);
+
+ storeAttribute.setBinaryValue((byte[])attribute.getValue());
}
else
{
@@ -1870,7 +1871,13 @@
throw new IdentityException("Cannot add binary type attribute with not byte[] type value: "
+ attribute.getName() + " / " + value);
}
+
}
+ if (type.equals(IdentityObjectAttributeMetaData.BINARY_TYPE) && attribute.getValues().size() > 1)
+ {
+ throw new IdentityException("Cannot add binary type attribute with more than one value - this implementation" +
+ "support only single value binary attributes: " + attribute.getName() );
+ }
}
}
@@ -1924,13 +1931,7 @@
+ type + ". Attribute name: " + name);
}
- Set<byte[]> mergedValues = new HashSet<byte[]>(hibernateAttribute.getValues());
- for (Object value : attribute.getValues())
- {
- mergedValues.add((byte[])value);
- }
-
- hibernateAttribute.setBinaryValues(mergedValues);
+ hibernateAttribute.setBinaryValue((byte[])hibernateAttribute.getValue());
}
else
{
@@ -1961,7 +1962,7 @@
values.add((byte[])value);
}
hibernateAttribute = new HibernateIdentityObjectAttribute(hibernateObject, name, HibernateIdentityObjectAttribute.TYPE_BINARY);
- hibernateAttribute.setBinaryValues(values);
+ hibernateAttribute.setBinaryValue((byte[])attribute.getValue());
}
Added: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -0,0 +1,52 @@
+<?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="ATTRIBUTE_TYPE"/>
+ </property>
+ <set name="textValues"
+ table="jbid_io_attr_text_values"
+ cascade="all, delete-orphan"
+ lazy="false">
+ <cache usage="read-write"/>
+ <key column="TEXT_ATTR_VALUE_ID"/>
+ <element type="string"
+ column="ATTR_VALUE"/>
+ </set>
+ <property name="binaryValue"
+ type="binary"
+ access="field"
+ lazy="false"
+ not-null="true">
+ <column name="BINARY_VALUE"/>
+ </property>
+
+ </class>
+</hibernate-mapping>
Added: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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="binary"
+ 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-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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"/>
+ </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-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-09 16:00:13 UTC (rev 918)
@@ -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/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-09 13:12:00 UTC (rev 917)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-11-09 16:00:13 UTC (rev 918)
@@ -47,6 +47,7 @@
import org.hibernate.SessionFactory;
import java.util.Map;
+import java.util.Random;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -186,6 +187,56 @@
}
+ public void testBinaryAttributes() throws Exception
+ {
+ begin();
+
+ IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER);
+ IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER);
+
+ flush();
+
+ IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{
+ new SimpleAttribute("key1", new String[]{"val1", "val2", "val3"}),
+ new SimpleAttribute("key2", new String[]{"val1", "val2", "val3", "val4"})
+ };
+
+ store.addAttributes(ctx, user1, attrs);
+
+ Random random = new Random();
+
+ // 900 kilobytes
+ byte[] picture1 = new byte[921600];
+ random.nextBytes(picture1);
+ byte[] picture2 = new byte[921600];
+ random.nextBytes(picture2);
+
+ attrs = new IdentityObjectAttribute[]{
+ new SimpleAttribute("key1", new byte[][]{picture1}),
+ };
+
+ store.addAttributes(ctx, user1, attrs);
+
+ attrs = new IdentityObjectAttribute[]{
+ new SimpleAttribute("key2", new byte[][]{picture1, picture2}),
+ };
+
+ store.addAttributes(ctx, user1, attrs);
+
+ attrs = new IdentityObjectAttribute[]{
+ new SimpleAttribute("key1", new byte[][]{picture2}),
+ };
+
+ store.updateAttributes(ctx, user1, attrs);
+
+ store.removeAttributes(ctx, user1, new String[]{"key1", "key2"});
+
+ assertNull(store.findIdentityObjectByUniqueAttribute(ctx, IdentityTypeEnum.USER, new SimpleAttribute("key1", new String[]{"toto"})));
+
+
+ commit();
+ }
+
@Test
public void testAttributes() throws Exception
{
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r917 - in idm/trunk: assembly/src/main/config and 17 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-09 08:12:00 -0500 (Mon, 09 Nov 2009)
New Revision: 917
Removed:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java
idm/trunk/idm-testsuite/src/test/resources/mappings/
Modified:
idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml
idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.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/pom.xml
idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java
idm/trunk/example/simple/src/test/resources/example-mixed-config.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-doc/ReferenceGuide/en/ReferenceGuide.xml
idm/trunk/idm-hibernate/pom.xml
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/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/HibernateTestSupport.java
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml
idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml
idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml
idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java
idm/trunk/parent/pom.xml
idm/trunk/pom.xml
Log:
- cleanup of hibernate annotations leftovers
Modified: idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -32,21 +32,18 @@
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -32,21 +32,18 @@
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -31,21 +31,18 @@
<property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property>
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -31,21 +31,18 @@
<property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -31,21 +31,18 @@
<property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -31,21 +31,18 @@
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -31,21 +31,18 @@
<property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
<property name="hibernate.format_sql">true</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,21 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,21 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,21 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,17 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,18 @@
<property name="hibernate.connection.username">@jdbc.username@</property>
<property name="hibernate.connection.password">@jdbc.password@</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -37,22 +37,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -37,22 +37,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -37,22 +37,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -37,22 +37,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -42,22 +42,18 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
-
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -60,20 +60,18 @@
- <!--Mapping classes-->
- <!--all nessesary mappings are added programatically to the configuration-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- Mapping classes -->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: idm/trunk/example/simple/pom.xml
===================================================================
--- idm/trunk/example/simple/pom.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/simple/pom.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -55,46 +55,27 @@
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-core</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-hibernate</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-ldap</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-cache</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -123,13 +104,13 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
- <version>1.2</version>
+ <version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.3.2.GA</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java
===================================================================
--- idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -28,12 +28,11 @@
import org.jboss.identity.idm.api.User;
import org.jboss.identity.idm.api.Attribute;
import org.jboss.identity.idm.api.AttributeDescription;
-import org.jboss.identity.idm.api.Group;
import org.jboss.identity.idm.api.cfg.IdentityConfiguration;
import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl;
import org.jboss.identity.idm.impl.api.SimpleAttribute;
import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
+import org.hibernate.cfg.Configuration;
import java.util.logging.Logger;
import java.util.Collection;
@@ -72,7 +71,7 @@
IdentityConfiguration identityConfiguration = new IdentityConfigurationImpl().
configure(new File("src/test/resources/example-db-inject-sf-config.xml"));
- SessionFactory hibernateSessionFactory = new AnnotationConfiguration().configure("hibernate-jboss-identity-classes.cfg.xml")
+ SessionFactory hibernateSessionFactory = new Configuration().configure("hibernate-jboss-identity-classes.cfg.xml")
.buildSessionFactory();
identityConfiguration.getIdentityConfigurationRegistry().register(hibernateSessionFactory, "registeredSessionFactory1");
Modified: idm/trunk/example/simple/src/test/resources/example-mixed-config.xml
===================================================================
--- idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -118,9 +118,13 @@
<options>
<option>
<name>hibernateConfiguration</name>
- <value>hibernate-jboss-identity.cfg.xml</value>
+ <value>hibernate-jboss-identity-classes.cfg.xml</value>
</option>
<option>
+ <name>addHibernateMappings</name>
+ <value>false</value>
+ </option>
+ <option>
<name>populateRelationshipTypes</name>
<value>true</value>
</option>
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -46,19 +46,16 @@
<!-- Mapping classes -->
<!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation-->
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>
+ <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -48,18 +48,17 @@
<property name="hibernate.connection.password"></property>
<!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration -->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>-->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>-->
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml
===================================================================
--- idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -1236,7 +1236,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">addMappedClasses</emphasis>
+ <emphasis role="bold">addHibernateMappings</emphasis>
- of set to true all annotated hibernate model classes will be added
to the hibernate configuration before SessionFactory is created</para>
</listitem>
@@ -1374,7 +1374,7 @@
]]>
</programlisting>
<para>
- In case 'addMappedClasses' option is not set to true hibernate configuration need to list all
+ In case 'addHibernateMappings' option is not set to true hibernate configuration need to list all
annotated model classes:
</para>
<programlisting>
Modified: idm/trunk/idm-hibernate/pom.xml
===================================================================
--- idm/trunk/idm-hibernate/pom.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/pom.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -40,11 +40,6 @@
<artifactId>hibernate-core</artifactId>
<version>3.3.2.GA</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
<!--Javassist as Hibernate's bytecode provider-->
<dependency>
<groupId>javassist</groupId>
@@ -71,14 +66,7 @@
<version>1.2.14</version>
</dependency>
-
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.0.2.GA</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -28,24 +28,6 @@
import java.util.*;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CollectionOfElements;
-
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -27,22 +27,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-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 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -24,14 +24,6 @@
import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Column;
-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 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -28,21 +28,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-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 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -25,21 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CollectionOfElements;
-
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -24,14 +24,6 @@
import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-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 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -22,16 +22,6 @@
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.Table;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.jboss.identity.idm.spi.model.IdentityObjectType;
/**
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -25,19 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-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 $
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -73,9 +73,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
+import org.hibernate.cfg.Configuration;
import org.hibernate.criterion.Restrictions;
-//import javax.persistence.Persistence;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -107,7 +106,7 @@
public static final String HIBERNATE_CONFIGURATION = "hibernateConfiguration";
- public static final String ADD_MAPPED_CLASSES = "addMappedClasses";
+ public static final String ADD_HIBERNATE_MAPPINGS = "addHibernateMappings";
public static final String HIBERNATE_SESSION_FACTORY_JNDI_NAME = "hibernateSessionFactoryJNDIName";
@@ -380,7 +379,7 @@
String sfRegistryName = configurationContext.getStoreConfigurationMetaData().
getOptionSingleValue(HIBERNATE_SESSION_FACTORY_REGISTRY_NAME);
String addMappedClasses = configurationContext.getStoreConfigurationMetaData().
- getOptionSingleValue(ADD_MAPPED_CLASSES);
+ getOptionSingleValue(ADD_HIBERNATE_MAPPINGS);
String hibernateConfiguration = configurationContext.getStoreConfigurationMetaData().
getOptionSingleValue(HIBERNATE_CONFIGURATION);
@@ -419,7 +418,7 @@
try
{
- AnnotationConfiguration config = new AnnotationConfiguration().configure(hibernateConfiguration);
+ Configuration config = new Configuration().configure(hibernateConfiguration);
if (addMappedClasses != null && addMappedClasses.equals("false"))
@@ -429,15 +428,17 @@
else
{
- return config.addAnnotatedClass(HibernateIdentityObject.class)
- .addAnnotatedClass(HibernateIdentityObjectAttribute.class)
- .addAnnotatedClass(HibernateIdentityObjectCredential.class)
- .addAnnotatedClass(HibernateIdentityObjectCredentialType.class)
- .addAnnotatedClass(HibernateIdentityObjectRelationship.class)
- .addAnnotatedClass(HibernateIdentityObjectRelationshipName.class)
- .addAnnotatedClass(HibernateIdentityObjectRelationshipType.class)
- .addAnnotatedClass(HibernateIdentityObjectType.class)
- .addAnnotatedClass(HibernateRealm.class).buildSessionFactory();
+ return config
+ .addResource("mappings/HibernateIdentityObject.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectAttribute.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectCredential.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectCredentialType.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectRelationship.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectRelationshipName.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectRelationshipType.hbm.xml")
+ .addResource("mappings/HibernateIdentityObjectType.hbm.xml")
+ .addResource("mappings/HibernateRealm.hbm.xml")
+ .buildSessionFactory();
}
}
catch (Exception e)
Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -25,7 +25,7 @@
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType;
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType;
import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
+import org.hibernate.cfg.Configuration;
import java.util.logging.Logger;
import java.sql.Connection;
@@ -74,8 +74,7 @@
try
{
logger.info("Building JPA EntityManager for unit tests");
- //emFactory = (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit);
- sessionFactory = new AnnotationConfiguration().configure(hibernateConfiguration).buildSessionFactory();
+ sessionFactory = new Configuration().configure(hibernateConfiguration).buildSessionFactory();
}
catch (Exception ex)
{
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:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -22,22 +22,11 @@
package org.jboss.identity.idm.impl;
-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.test.HibernateAnnotationsSupport;
import org.jboss.portal.test.framework.embedded.ConnectionManagerSupport;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
import org.jboss.portal.test.framework.embedded.HibernateSupport;
import org.jboss.portal.test.framework.embedded.JNDISupport;
import org.jboss.portal.test.framework.embedded.TransactionManagerSupport;
-import org.jboss.unit.api.pojo.annotations.Parameter;
import java.util.LinkedList;
import java.util.List;
@@ -104,20 +93,6 @@
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> mappings = new LinkedList<String>();
mappings.add("mappings/HibernateIdentityObject.hbm.xml");
mappings.add("mappings/HibernateIdentityObjectAttribute.hbm.xml");
@@ -163,34 +138,26 @@
return getHibernateSupport().getSessionFactory();
}
-
-
-
- @Parameter(name="dataSourceName")
public void setDataSourceName(String dataSourceName)
{
this.dataSourceName = dataSourceName;
}
- @Parameter(name="hibernateConfig")
public void setHibernateConfig(String hibernateConfig)
{
this.hibernateConfig = hibernateConfig;
}
- @Parameter(name="datasources")
public void setDatasources(String datasources)
{
this.datasources = datasources;
}
- @Parameter(name="identityConfig")
public void setIdentityConfig(String identityConfig)
{
this.identityConfig = identityConfig;
}
- @Parameter(name="realmName")
public void setRealmName(String realmName)
{
this.realmName = realmName;
Deleted: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -1,88 +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.test;
-
-import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.AnnotationConfiguration;
-
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public class HibernateAnnotationsSupport extends HibernateSupport
-{
-
- @Override
- protected void createConfiguration()
- {
- AnnotationConfiguration cfg = new AnnotationConfiguration();
-
- //
- for (Iterator i = mappings.iterator(); i.hasNext();)
- {
- String mapping = (String)i.next();
- log.debug("Adding annotated enitity " + mapping);
- try
- {
- Class mappedClass = Class.forName(mapping);
- cfg.addAnnotatedClass(mappedClass);
- }
- catch (ClassNotFoundException e)
- {
- throw new IllegalArgumentException("Cannot find mapped class: " + mapping, e);
- }
-
- }
-
- //
- Properties props = new Properties();
- for (Iterator i = config.getProperties().entrySet().iterator();i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- String key = (String)entry.getKey();
- String value = (String)entry.getValue();
- log.debug("Adding property " + key + " = " + value);
- cfg.setProperty(key, value);
- }
- cfg.addProperties(props);
-
- // todo : make this configurable somehow
- cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS");
-
- //
- if (jndiName != null)
- {
- log.debug("Setting jndi name to " + jndiName);
- cfg.setProperty("hibernate.session_factory_name", jndiName);
- }
-
- //
- this.settings = cfg.buildSettings();
- this.cfg = cfg;
- }
-}
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -9,7 +9,7 @@
</property>
<property>
<name>hibernate.show_sql</name>
- <value>true</value>
+ <value>false</value>
</property>
<property>
<name>hibernate.auto_close_session</name>
Modified: idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -43,18 +43,5 @@
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
- <!-- Mapping classes -->
-
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>
- <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -44,18 +44,17 @@
<property name="hibernate.connection.password"></property>
<!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration -->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>-->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>-->
</session-factory>
</hibernate-configuration>
\ No newline at end of file
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-08 22:45:12 UTC (rev 916)
+++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -44,19 +44,17 @@
<property name="hibernate.connection.password"></property>
<!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration -->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>-->
- <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>-->
+ <!-- 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/HibernateIdentityObject.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>-->
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java
===================================================================
--- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-09 13:12:00 UTC (rev 917)
@@ -16,7 +16,6 @@
import javax.transaction.TransactionManager;
import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.resolver.DialectFactory;
@@ -200,7 +199,7 @@
if (hibernateConfigLocation == null) {
throw new Exception ("Couldn't find the hibernate configuration file");
}
- Configuration configuration = new AnnotationConfiguration().configure(hibernateConfigLocation);
+ Configuration configuration = new Configuration().configure(hibernateConfigLocation);
logger.fine("starting to populate the schema from file [" + hibernateConfigLocation + "]");
HibernatePopulator hibernatePopulator = new HibernatePopulator(doChecking, setupLocation, configuration);
hibernatePopulator.populateSchema();
@@ -231,7 +230,7 @@
private void deployHibernateSessionFactory(InitialContext context)
throws NamingException, IdentityException {
- hibernateSessionFactory = new AnnotationConfiguration().configure(hibernateConfigLocation).buildSessionFactory();
+ hibernateSessionFactory = new Configuration().configure(hibernateConfigLocation).buildSessionFactory();
if (hibernateSessionFactoryJNDIName != null) {
context.bind(hibernateSessionFactoryJNDIName, hibernateSessionFactory);
logger.info("Bind the Hibernate Session Factory in JNDI of " + hibernateSessionFactoryJNDIName);
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/parent/pom.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -164,11 +164,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-11-08 22:45:12 UTC (rev 916)
+++ idm/trunk/pom.xml 2009-11-09 13:12:00 UTC (rev 917)
@@ -27,10 +27,9 @@
<module>idm-testsuite</module>
<module>integration</module>
<module>idm-doc</module>
- <!--TODO: fix-->
- <!--<module>example/simple</module>-->
- <!--<module>example/auth</module>-->
- <!--<module>example/auth-simple</module>-->
+ <module>example/simple</module>
+ <module>example/auth</module>
+ <module>example/auth-simple</module>
</modules>
<profiles>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r916 - identity-federation/trunk/jboss-identity-web.
by jboss-identity-commits＠lists.jboss.org
Author: marcelkolsteren
Date: 2009-11-08 17:45:12 -0500 (Sun, 08 Nov 2009)
New Revision: 916
Modified:
identity-federation/trunk/jboss-identity-web/pom.xml
Log:
Fixed erroneous POM file (removed two floating dots).
Modified: identity-federation/trunk/jboss-identity-web/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-web/pom.xml 2009-11-08 22:37:19 UTC (rev 915)
+++ identity-federation/trunk/jboss-identity-web/pom.xml 2009-11-08 22:45:12 UTC (rev 916)
@@ -43,7 +43,7 @@
</excludes>
<forkMode>pertest</forkMode>
<argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
+ <useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
@@ -71,7 +71,7 @@
</includes>
<forkMode>pertest</forkMode>
<argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
+ <useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r915 - in idm/trunk: idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate and 5 other directories.
by jboss-identity-commits＠lists.jboss.org
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>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r914 - identity-federation/trunk/jboss-identity-webapps/employee-post-sig.
by jboss-identity-commits＠lists.jboss.org
Author: marcelkolsteren
Date: 2009-11-08 17:19:20 -0500 (Sun, 08 Nov 2009)
New Revision: 914
Removed:
identity-federation/trunk/jboss-identity-webapps/employee-post-sig/.project
identity-federation/trunk/jboss-identity-webapps/employee-post-sig/.settings/
Log:
Removed .settings and .project from employee-post-sig project (should be in svn:ignore).
Deleted: identity-federation/trunk/jboss-identity-webapps/employee-post-sig/.project
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/employee-post-sig/.project 2009-11-06 18:12:48 UTC (rev 913)
+++ identity-federation/trunk/jboss-identity-webapps/employee-post-sig/.project 2009-11-08 22:19:20 UTC (rev 914)
@@ -1,13 +0,0 @@
-<projectDescription>
- <name>employee-post-sig</name>
- <comment>JBoss Identity Samples contains the samples for Federated Identity Needs.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r913 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-06 13:12:48 -0500 (Fri, 06 Nov 2009)
New Revision: 913
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAML2HandlerChainFactory.java
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
Log:
bring in factory
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-11-06 17:42:49 UTC (rev 912)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-11-06 18:12:48 UTC (rev 913)
@@ -21,6 +21,8 @@
*/
package org.jboss.identity.federation.bindings.tomcat.idp;
+import static org.jboss.identity.federation.core.util.StringUtil.isNotNull;
+
import java.io.IOException;
import java.io.InputStream;
import java.security.GeneralSecurityException;
@@ -52,6 +54,7 @@
import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.exceptions.ParsingException;
+import org.jboss.identity.federation.core.exceptions.ProcessingException;
import org.jboss.identity.federation.core.handler.config.Handlers;
import org.jboss.identity.federation.core.impl.DelegatedAttributeManager;
import org.jboss.identity.federation.core.interfaces.AttributeManager;
@@ -64,8 +67,8 @@
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
import org.jboss.identity.federation.core.saml.v2.exceptions.IssueInstantMissingException;
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
+import org.jboss.identity.federation.core.saml.v2.factories.SAML2HandlerChainFactory;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
@@ -76,6 +79,7 @@
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler.HANDLER_TYPE;
import org.jboss.identity.federation.core.saml.v2.util.HandlerUtil;
+import org.jboss.identity.federation.core.util.StringUtil;
import org.jboss.identity.federation.saml.v2.SAML2Object;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.jboss.identity.federation.saml.v2.protocol.StatusResponseType;
@@ -88,9 +92,7 @@
import org.jboss.identity.federation.web.util.RedirectBindingUtil;
import org.w3c.dom.Document;
-import static org.jboss.identity.federation.core.util.StringUtil.isNotNull;
-
/**
* Generic Web Browser SSO valve for the IDP
*
@@ -126,6 +128,8 @@
private Context context = null;
+ private transient String samlHandlerChainClass = null;
+
//Set a list of attributes we are interested in separated by comma
public void setAttributeList(String attribList)
{
@@ -171,8 +175,13 @@
{
throw new RuntimeException(e);
}
+ }
+
+ public void setSamlHandlerChainClass(String samlHandlerChainClass)
+ {
+ this.samlHandlerChainClass = samlHandlerChainClass;
}
-
+
@Override
public void invoke(Request request, Response response) throws IOException, ServletException
{
@@ -774,7 +783,17 @@
started = true;
//Get the chain from config
- chain = new DefaultSAML2HandlerChain();
+ if(StringUtil.isNullOrEmpty(samlHandlerChainClass))
+ chain = SAML2HandlerChainFactory.createChain();
+ else
+ try
+ {
+ chain = SAML2HandlerChainFactory.createChain(this.samlHandlerChainClass);
+ }
+ catch (ProcessingException e1)
+ {
+ throw new LifecycleException(e1);
+ }
String configFile = GeneralConstants.CONFIG_FILE_LOCATION;
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-11-06 17:42:49 UTC (rev 912)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-11-06 18:12:48 UTC (rev 913)
@@ -35,13 +35,15 @@
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.core.config.SPType;
+import org.jboss.identity.federation.core.exceptions.ProcessingException;
import org.jboss.identity.federation.core.handler.config.Handlers;
-import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.factories.SAML2HandlerChainFactory;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2Handler;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChain;
import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.util.HandlerUtil;
+import org.jboss.identity.federation.core.util.StringUtil;
import org.jboss.identity.federation.web.constants.GeneralConstants;
import org.jboss.identity.federation.web.util.ConfigurationUtil;
@@ -63,6 +65,8 @@
protected String configFile = GeneralConstants.CONFIG_FILE_LOCATION;
protected transient SAML2HandlerChain chain = null;
+
+ protected transient String samlHandlerChainClass = null;
public BaseFormAuthenticator()
{
@@ -79,6 +83,12 @@
this.configFile = configFile;
}
+
+ public void setSamlHandlerChainClass(String samlHandlerChainClass)
+ {
+ this.samlHandlerChainClass = samlHandlerChainClass;
+ }
+
/**
* Perform validation os the request object
* @param request
@@ -113,8 +123,19 @@
if(is == null)
throw new RuntimeException(configFile + " missing");
- //Get the chain from config
- chain = new DefaultSAML2HandlerChain();
+ //Get the chain from config
+ if(StringUtil.isNullOrEmpty(samlHandlerChainClass))
+ chain = SAML2HandlerChainFactory.createChain();
+ else
+ try
+ {
+ chain = SAML2HandlerChainFactory.createChain(this.samlHandlerChainClass);
+ }
+ catch (ProcessingException e1)
+ {
+ throw new LifecycleException(e1);
+ }
+
try
{
spConfiguration = ConfigurationUtil.getSPConfiguration(is);
@@ -126,9 +147,7 @@
{
throw new RuntimeException(e);
}
-
- //Get the chain from config
- chain = new DefaultSAML2HandlerChain();
+
try
{
//Get the handlers
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAML2HandlerChainFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAML2HandlerChainFactory.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAML2HandlerChainFactory.java 2009-11-06 18:12:48 UTC (rev 913)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.federation.core.saml.v2.factories;
+
+import org.jboss.identity.federation.core.exceptions.ProcessingException;
+import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
+import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerChain;
+
+/**
+ * Creates {@code SAML2HandlerChain}
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Nov 6, 2009
+ */
+public class SAML2HandlerChainFactory
+{
+ public static SAML2HandlerChain createChain()
+ {
+ return new DefaultSAML2HandlerChain();
+ }
+
+ public static SAML2HandlerChain createChain(String fqn) throws ProcessingException
+ {
+ if(fqn == null)
+ throw new IllegalArgumentException("fqn is null");
+ ClassLoader tcl = SecurityActions.getContextClassLoader();
+
+ try
+ {
+ return (SAML2HandlerChain) tcl.loadClass(fqn).newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new ProcessingException("Cannot create chain:",e);
+ }
+ }
+}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-11-06 17:42:49 UTC (rev 912)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-11-06 18:12:48 UTC (rev 913)
@@ -72,9 +72,9 @@
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
import org.jboss.identity.federation.core.saml.v2.exceptions.AssertionExpiredException;
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
+import org.jboss.identity.federation.core.saml.v2.factories.SAML2HandlerChainFactory;
import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChain;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerChainConfig;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerRequest;
import org.jboss.identity.federation.core.saml.v2.impl.DefaultSAML2HandlerResponse;
@@ -88,6 +88,7 @@
import org.jboss.identity.federation.core.saml.v2.util.AssertionUtil;
import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
import org.jboss.identity.federation.core.saml.v2.util.HandlerUtil;
+import org.jboss.identity.federation.core.util.StringUtil;
import org.jboss.identity.federation.core.util.XMLSignatureUtil;
import org.jboss.identity.federation.saml.v2.SAML2Object;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
@@ -134,7 +135,7 @@
private IRoleValidator roleValidator = new DefaultRoleValidator();
- private String logOutPage = GeneralConstants.LOGOUT_PAGE_NAME;
+ private String logOutPage = GeneralConstants.LOGOUT_PAGE_NAME;
public void destroy()
{
@@ -464,9 +465,21 @@
options.put("ROLES", roles);
}
this.roleValidator.intialize(options);
+
+ String samlHandlerChainClass = filterConfig.getInitParameter("SAML_HANDLER_CHAIN_CLASS");
- //Get the chain from config
- chain = new DefaultSAML2HandlerChain();
+ //Get the chain from config
+ if(StringUtil.isNullOrEmpty(samlHandlerChainClass))
+ chain = SAML2HandlerChainFactory.createChain();
+ else
+ try
+ {
+ chain = SAML2HandlerChainFactory.createChain(samlHandlerChainClass);
+ }
+ catch (ProcessingException e1)
+ {
+ throw new ServletException(e1);
+ }
try
{
//Get the handlers
16 years, 6 months
- 1
- 0