Author: bdaw
Date: 2009-11-12 18:28:01 -0500 (Thu, 12 Nov 2009)
New Revision: 933
Added:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
Modified:
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
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
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
Log:
- some more schema work
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-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-12
23:28:01 UTC (rev 933)
@@ -68,11 +68,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.hibernate.Criteria;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
+import org.hibernate.*;
import org.hibernate.cfg.Configuration;
import org.hibernate.criterion.Restrictions;
@@ -721,6 +717,7 @@
results = (List<IdentityObject>)q.list();
+ Hibernate.initialize(results);
}
catch (Exception e)
@@ -858,7 +855,8 @@
- results = q.list();
+ results = q.list();
+ Hibernate.initialize(results);
}
@@ -961,8 +959,6 @@
HibernateIdentityObject toIO = safeGet(ctx, toIdentity);
HibernateIdentityObjectRelationshipType type =
getHibernateIdentityObjectRelationshipType(ctx, relationshipType);
- //getSupportedFeatures().isRelationshipTypeSupported(fromIO.getIdentityType(),
toIO.getIdentityType(), relationshipType);
-
org.hibernate.Query query = null;
if (name == null)
@@ -994,17 +990,14 @@
}
- List results = query.list();
+ HibernateIdentityObjectRelationship relationship =
(HibernateIdentityObjectRelationship)query.uniqueResult();
- if (results == null)
+ if (relationship == null)
{
throw new IdentityException("Relationship not present in the store");
}
- HibernateIdentityObjectRelationship relationship =
(HibernateIdentityObjectRelationship)results.iterator().next();
-
-
- try
+ try
{
fromIO.getFromRelationships().remove(relationship);
toIO.getToRelationships().remove(relationship);
@@ -1029,6 +1022,7 @@
.setParameter("IO2", hio2);
List results = query.list();
+ Hibernate.initialize(results);
for (Iterator iterator = results.iterator(); iterator.hasNext();)
{
@@ -1079,6 +1073,7 @@
List<HibernateIdentityObjectRelationship> results = query.list();
+ Hibernate.initialize(results);
return new HashSet<IdentityObjectRelationship>(results);
}
@@ -1127,6 +1122,8 @@
List<HibernateIdentityObjectRelationship> results = criteria.list();
+ Hibernate.initialize(results);
+
return new HashSet<IdentityObjectRelationship>(results);
}
@@ -1179,8 +1176,11 @@
try
{
- HibernateIdentityObjectRelationshipName hiorn =
(HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName)
- .setParameter("name",
name).setParameter("realmName", getRealmName(ctx)).uniqueResult();
+ HibernateIdentityObjectRelationshipName hiorn =
(HibernateIdentityObjectRelationshipName)hibernateSession
+
.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName)
+ .setParameter("name", name)
+ .setParameter("realmName", getRealmName(ctx))
+ .uniqueResult();
if (hiorn == null)
{
@@ -1191,6 +1191,8 @@
createCriteria(HibernateIdentityObjectRelationship.class)
.add(Restrictions.eq("name", hiorn)).setCacheable(true).list();
+ Hibernate.initialize(rels);
+
//Remove all present usages
for (HibernateIdentityObjectRelationship rel : rels)
{
@@ -1260,6 +1262,8 @@
List<String> results = (List<String>)q.list();
+ Hibernate.initialize(results);
+
names = new HashSet<String>(results);
}
@@ -1318,6 +1322,8 @@
List<String> results = (List<String>)q.list();
+ Hibernate.initialize(results);
+
names = new HashSet<String>(results);
}
@@ -1354,6 +1360,8 @@
throw new IdentityException("Relationship name doesn't
exist");
}
+ Hibernate.initialize(hiorn.getProperties());
+
return new HashMap<String, String>(hiorn.getProperties());
}
@@ -1412,6 +1420,9 @@
throw new IdentityException("Relationship name doesn't
exist");
}
+ Hibernate.initialize(hiorn.getProperties());
+
+
for (String property : properties)
{
hiorn.getProperties().remove(property);
@@ -1464,6 +1475,8 @@
{
HibernateIdentityObjectRelationship hibernateRelationship =
(HibernateIdentityObjectRelationship)query.uniqueResult();
+ Hibernate.initialize(hibernateRelationship.getProperties());
+
return new HashMap<String,
String>(hibernateRelationship.getProperties());
}
catch (HibernateException e)
@@ -1564,6 +1577,8 @@
{
HibernateIdentityObjectRelationship hibernateRelationship =
(HibernateIdentityObjectRelationship)query.uniqueResult();
+ Hibernate.initialize(hibernateRelationship.getProperties());
+
for (String property : properties)
{
hibernateRelationship.getProperties().remove(property);
@@ -1597,6 +1612,8 @@
Set<HibernateIdentityObjectAttribute> storeAttributes =
hibernateObject.getAttributes();
+ Hibernate.initialize(storeAttributes);
+
// Remap the names
for (HibernateIdentityObjectAttribute attribute : storeAttributes)
{
@@ -1626,6 +1643,7 @@
Set<HibernateIdentityObjectAttribute> storeAttributes =
hibernateObject.getAttributes();
+ Hibernate.initialize(storeAttributes);
// Remap the names
@@ -1734,6 +1752,8 @@
HibernateIdentityObject hibernateObject = safeGet(ctx, identity);
+ Hibernate.initialize(hibernateObject.getAttributes());
+
for (String name : mappedAttributes.keySet())
{
IdentityObjectAttribute attribute = mappedAttributes.get(name);
@@ -1896,6 +1916,8 @@
HibernateIdentityObject hibernateObject = safeGet(ctx, identity);
+ Hibernate.initialize(hibernateObject.getAttributes());
+
for (String name : mappedAttributes.keySet())
{
IdentityObjectAttribute attribute = mappedAttributes.get(name);
@@ -2023,6 +2045,8 @@
HibernateIdentityObject hibernateObject = safeGet(ctx, identity);
+ Hibernate.initialize(hibernateObject.getAttributes());
+
for (String attr : mappedAttributes)
{
hibernateObject.removeAttribute(attr);
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -13,7 +13,9 @@
</id>
<set name="attributes"
inverse="true"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key>
<column name="IDENTITY_OBJECT_ID" />
@@ -22,7 +24,9 @@
</set>
<set name="credentials"
inverse="true"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key>
<column name="IDENTITY_OBJECT_ID" />
@@ -30,7 +34,9 @@
<one-to-many
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"
/>
</set>
<set name="fromRelationships"
- inverse="true">
+ inverse="true"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key>
<column name="FROM_IDENTITY" />
@@ -48,14 +54,17 @@
</many-to-one>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
not-null="true"
unique-key="id"/>
</property>
<map name="properties"
table="jbid_io_props"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
@@ -67,13 +76,15 @@
<many-to-one name="realm"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"
access="field"
- fetch="join">
+ fetch="select">
<column name="REALM"
not-null="true"
unique-key="id"/>
</many-to-one>
<set name="toRelationships"
- inverse="true">
+ inverse="true"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key>
<column name="TO_IDENTITY" />
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-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -35,7 +35,8 @@
table="jbid_io_attr_text_values"
cascade="all, delete-orphan"
access="field"
- lazy="false">
+ lazy="false"
+ fetch="join">
<cache usage="read-write"/>
<key column="TEXT_ATTR_VALUE_ID"/>
<element type="string"
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-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -23,7 +23,7 @@
<many-to-one name="identityObject"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
- fetch="join"
+ fetch="select"
lazy="false">
<column name="IDENTITY_OBJECT_ID"
not-null="true"
@@ -31,7 +31,9 @@
</many-to-one>
<map name="properties"
table="jbid_io_creden_props"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -14,7 +14,8 @@
</id>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
unique="true" />
</property>
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -14,7 +14,7 @@
<many-to-one name="fromIdentityObject"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
- fetch="join"
+ fetch="select"
lazy="false">
<column name="FROM_IDENTITY"
not-null="true"
@@ -31,7 +31,7 @@
<many-to-one name="toIdentityObject"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
- fetch="join"
+ fetch="select"
lazy="false">
<column name="TO_IDENTITY"
not-null="true"
@@ -40,7 +40,7 @@
<many-to-one name="type"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"
access="field"
- fetch="join"
+ fetch="select"
lazy="false">
<column name="REL_TYPE"
not-null="true"
@@ -48,7 +48,9 @@
</many-to-one>
<map name="properties"
table="jbid_io_rel_props"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ fetch="select"
+ lazy="true">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -14,7 +14,8 @@
</id>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
not-null="true"
unique="true"
@@ -22,7 +23,9 @@
</property>
<map name="properties"
table="jbid_io_rel_name_props"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ lazy="true"
+ fetch="select">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
@@ -39,6 +42,6 @@
not-null="true"
unique-key="id"/>
</many-to-one>
-
+
</class>
</hibernate-mapping>
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -13,7 +13,8 @@
</id>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
not-null="true"
unique="true" />
Modified:
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml
===================================================================
---
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectType.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -5,7 +5,6 @@
<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">
@@ -14,7 +13,8 @@
</id>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
not-null="true"
unique="true" />
Modified: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-12
19:15:59 UTC (rev 932)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -13,14 +13,17 @@
</id>
<property name="name"
type="java.lang.String"
- access="field">
+ access="field"
+ lazy="false">
<column name="NAME"
not-null="true"
unique-key="id"/>
</property>
<map name="properties"
table="jbid_real_props"
- cascade="all, delete-orphan">
+ cascade="all, delete-orphan"
+ fetch="select"
+ lazy="true">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java
===================================================================
---
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-11-12
19:15:59 UTC (rev 932)
+++
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-11-12
23:28:01 UTC (rev 933)
@@ -308,6 +308,8 @@
new SimpleAttribute("picture", new byte[][]{picture}),
};
+
assertNull(session.getAttributesManager().findUserByUniqueAttribute("picture",
picture));
+
session.getAttributesManager().addAttributes(bdawidowUser, userInfo);
attributes = session.getAttributesManager().getAttributes(bdawidowUser);
Added:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
===================================================================
---
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
(rev 0)
+++
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-12
23:28:01 UTC (rev 933)
@@ -0,0 +1,137 @@
+/*
+* 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.store.hibernate;
+
+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;
+import org.jboss.unit.api.pojo.annotations.Create;
+import org.jboss.unit.api.pojo.annotations.Test;
+import org.hibernate.Session;
+import org.hibernate.Query;
+
+import java.util.*;
+
+
+/**
+ * Simple test to show binary/blob issues in database
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw
Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class EvilBinaryTestCase extends IdentityTestPOJO
+{
+ public EvilBinaryTestCase()
+ {
+ }
+
+
+ @Create
+ public void setUp() throws Exception
+ {
+ super.start();
+ }
+
+ @Destroy
+ public void tearDown() throws Exception
+ {
+ super.stop();
+ }
+
+ @Test
+ public void testBinary() throws Exception
+ {
+ begin();
+
+ Session session = getSessionFactory().getCurrentSession();
+
+
+ HibernateRealm realm = new HibernateRealm("default");
+ session.persist(realm);
+
+ HibernateIdentityObjectType userType = new
HibernateIdentityObjectType("User");
+ session.persist(userType);
+ 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");
+
+ HibernateIdentityObjectAttribute attr = new HibernateIdentityObjectAttribute(user1,
"simple1", HibernateIdentityObjectAttribute.TYPE_TEXT);
+ attr.setTextValues(values1);
+ user1.getAttributes().add(attr);
+
+ commit();
+
+ begin();
+
+ session = getSessionFactory().getCurrentSession();
+
+ user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new
Long(user1.getId()));
+
+ Random random = new Random();
+
+ // Small
+ byte[] picture = new byte[4];
+ random.nextBytes(picture);
+
+ attr = new HibernateIdentityObjectAttribute(user1, "simple2",
HibernateIdentityObjectAttribute.TYPE_BINARY);
+ attr.setBinaryValue(picture);
+ user1.addAttribute(attr);
+
+ commit();
+
+ begin();
+
+ session = getSessionFactory().getCurrentSession();
+
+ user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new
Long(user1.getId()));
+
+ // 900 kilobytes
+ picture = new byte[921600];
+// picture = new byte[2];
+ random.nextBytes(picture);
+
+
+ attr = new HibernateIdentityObjectAttribute(user1, "simple3",
HibernateIdentityObjectAttribute.TYPE_BINARY);
+ attr.setBinaryValue(picture);
+ user1.getAttributes().add(attr);
+
+ commit();
+
+ begin();
+
+ session = getSessionFactory().getCurrentSession();
+
+ user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new
Long(user1.getId()));
+
+ assertEquals(3, user1.getAttributes().size());
+
+ commit();
+
+ }
+
+}
\ No newline at end of file
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-12
19:15:59 UTC (rev 932)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -38,6 +38,14 @@
<password>jbidentity</password>
</datasource>
+ <datasource>
+ <datasource-name>sybase152-jconnect</datasource-name>
+
<connection-url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url>
+ <driver-class>com.sybase.jdbc3.jdbc.SybDriver</driver-class>
+ <user-name>jbidentity</user-name>
+ <password>jbidentity</password>
+ </datasource>
+
<datasource>
<datasource-name>db291</datasource-name>
<connection-url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</connection-url>
@@ -102,6 +110,13 @@
<user-name>identity</user-name>
<password>identity</password>
</datasource>
+ <datasource>
+ <datasource-name>sqlserver2</datasource-name>
+
<connection-url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918;databaseName=identity</connection-url>
+
<driver-class>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
<datasource>
<datasource-name>oracle9i</datasource-name>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-12
19:15:59 UTC (rev 932)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-12
23:28:01 UTC (rev 933)
@@ -138,6 +138,15 @@
</property>
</properties>
</configuration>
+ <configuration>
+ <configuration-name>sqlserver2</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SQLServerDialect</value>
+ </property>
+ </properties>
+ </configuration>
<!-- The mysql 4 configuration -->
<configuration>
<configuration-name>mysql4</configuration-name>
@@ -205,6 +214,15 @@
</properties>
</configuration>
<configuration>
+ <configuration-name>sybase152-jconnect</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SybaseDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <configuration>
<configuration-name>db291</configuration-name>
<properties>
<property>