jboss-identity-commits
November 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 196 discussions
JBoss Identity SVN: r952 - in idm/trunk/idm-testsuite/src/test: resources/datasources and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-16 00:49:48 -0500 (Mon, 16 Nov 2009)
New Revision: 952
Modified:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
Log:
- credentials for sybase
Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-14 12:47:20 UTC (rev 951)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-16 05:49:48 UTC (rev 952)
@@ -30,6 +30,8 @@
import org.jboss.unit.api.pojo.annotations.Test;
import org.hibernate.Session;
import org.hibernate.Query;
+import org.hibernate.criterion.Projection;
+import org.hibernate.criterion.Projections;
import java.util.*;
@@ -130,6 +132,19 @@
assertEquals(3, user1.getAttributes().size());
+ int binaryCount = ((Integer)session.createCriteria(HibernateBinaryValue.class).
+ setProjection(Projections.rowCount()).uniqueResult()).intValue();
+
+ assertEquals(2,binaryCount);
+
+ session.delete(user1);
+
+ binaryCount = ((Integer)session.createCriteria(HibernateBinaryValue.class).
+ setProjection(Projections.rowCount()).uniqueResult()).intValue();
+
+ assertEquals(0,binaryCount);
+
+
commit();
}
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-14 12:47:20 UTC (rev 951)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-16 05:49:48 UTC (rev 952)
@@ -56,8 +56,8 @@
<datasource-name>sybase-15-0-3_8kb</datasource-name>
<connection-url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/identity</connection-url>
<driver-class>com.sybase.jdbc3.jdbc.SybDriver</driver-class>
- <user-name>identity</user-name>
- <password>identity</password>
+ <user-name>jbidentity</user-name>
+ <password>jbidentity</password>
</datasource>
<datasource>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-14 12:47:20 UTC (rev 951)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-16 05:49:48 UTC (rev 952)
@@ -12,6 +12,14 @@
<value>true</value>
</property>
<property>
+ <name>hibernate.use_sql_comments</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>hibernate.format_sql</name>
+ <value>true</value>
+ </property>
+ <property>
<name>hibernate.auto_close_session</name>
<value>true</value>
</property>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r951 - in idm/trunk: parent and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-14 07:47:20 -0500 (Sat, 14 Nov 2009)
New Revision: 951
Modified:
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
idm/trunk/parent/pom.xml
Log:
- more hudson changes
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-14 11:39:07 UTC (rev 950)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-14 12:47:20 UTC (rev 951)
@@ -30,29 +30,50 @@
<!--<user-name>jbidentity</user-name>-->
<!--<password>jbidentity</password>-->
<!--</datasource>-->
- <datasource>
- <datasource-name>sybase152-jtds</datasource-name>
- <connection-url>jdbc:jtds:sybase://dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url>
- <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
+ <!--<datasource>-->
+ <!--<datasource-name>sybase-15-0-2_8kb-jtds</datasource-name>-->
+ <!--<connection-url>jdbc:jtds:sybase://dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url>-->
+ <!--<driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>-->
+ <!--<user-name>jbidentity</user-name>-->
+ <!--<password>jbidentity</password>-->
+ <!--</datasource>-->
+
+ <datasource>
+ <datasource-name>sybase-15-0-2_8kb</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>sybase152</datasource-name>
- <connection-url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url>
+ <datasource-name>sybase-15-0-2_2kb</datasource-name>
+ <connection-url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/jbidentity</connection-url>
<driver-class>com.sybase.jdbc3.jdbc.SybDriver</driver-class>
<user-name>jbidentity</user-name>
<password>jbidentity</password>
</datasource>
+ <datasource>
+ <datasource-name>sybase-15-0-3_8kb</datasource-name>
+ <connection-url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/identity</connection-url>
+ <driver-class>com.sybase.jdbc3.jdbc.SybDriver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
<datasource>
- <datasource-name>db291</datasource-name>
+ <datasource-name>db2-9-1</datasource-name>
<connection-url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</connection-url>
<driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
</datasource>
+ <datasource>
+ <datasource-name>db2-9-7</datasource-name>
+ <connection-url>vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</connection-url>
+ <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
<datasource>
<datasource-name>oracle10g-local</datasource-name>
@@ -96,7 +117,7 @@
</datasource>
<datasource>
- <datasource-name>postgresql8</datasource-name>
+ <datasource-name>postgresql8-2-4</datasource-name>
<connection-url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:identity</connection-url>
<driver-class>org.postgresql.Driver</driver-class>
<user-name>identity</user-name>
@@ -166,7 +187,7 @@
</datasource>
<datasource>
- <datasource-name>mysql4</datasource-name>
+ <datasource-name>mysql4-1-22</datasource-name>
<connection-url>jdbc:mysql://dev01.qa.atl.jboss.com/identity</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>identity</user-name>
@@ -174,14 +195,14 @@
</datasource>
<datasource>
- <datasource-name>mysql51</datasource-name>
+ <datasource-name>mysql5-1-36</datasource-name>
<connection-url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/identity?jdbcCompliantTrunca...</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
</datasource>
<datasource>
- <datasource-name>mysql50</datasource-name>
+ <datasource-name>mysql5-0-79-2</datasource-name>
<connection-url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/identity?jdbcCompliantTrunca...</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>identity</user-name>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-14 11:39:07 UTC (rev 950)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-14 12:47:20 UTC (rev 951)
@@ -185,7 +185,7 @@
</configuration>
<!-- The mysql 4 configuration -->
<configuration>
- <configuration-name>mysql4</configuration-name>
+ <configuration-name>mysql4-1-22</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -204,7 +204,7 @@
</configuration>
<!-- The mysql 5 configuration -->
<configuration>
- <configuration-name>mysql50</configuration-name>
+ <configuration-name>mysql5-0-79-2</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -213,7 +213,7 @@
</properties>
</configuration>
<configuration>
- <configuration-name>mysql51</configuration-name>
+ <configuration-name>mysql5-1-36</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -232,7 +232,7 @@
</configuration>
<!-- The postgresql 8 configuration -->
<configuration>
- <configuration-name>postgresql8</configuration-name>
+ <configuration-name>postgresql8-2-4</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -249,26 +249,53 @@
</property>
</properties>
</configuration>
- <configuration>
- <configuration-name>sybase152</configuration-name>
- <properties>
- <property>
- <name>hibernate.dialect</name>
- <value>org.hibernate.dialect.SybaseDialect</value>
- </property>
- </properties>
- </configuration>
+ <configuration>
+ <configuration-name>sybase-15-0-2_8kb</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SybaseDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <configuration>
+ <configuration-name>sybase-15-0-2_2kb</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SybaseDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <configuration>
+ <configuration-name>sybase-15-0-3_8kb</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SybaseDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <!--<configuration>-->
+ <!--<configuration-name>sybase152-jtds</configuration-name>-->
+ <!--<properties>-->
+ <!--<property>-->
+ <!--<name>hibernate.dialect</name>-->
+ <!--<value>org.hibernate.dialect.SybaseDialect</value>-->
+ <!--</property>-->
+ <!--</properties>-->
+ <!--</configuration>-->
<configuration>
- <configuration-name>sybase152-jtds</configuration-name>
+ <configuration-name>db2-9-1</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
- <value>org.hibernate.dialect.SybaseDialect</value>
+ <value>org.hibernate.dialect.DB2Dialect</value>
</property>
</properties>
</configuration>
- <configuration>
- <configuration-name>db291</configuration-name>
+ <configuration>
+ <configuration-name>db2-9-7</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-14 11:39:07 UTC (rev 950)
+++ idm/trunk/parent/pom.xml 2009-11-14 12:47:20 UTC (rev 951)
@@ -175,11 +175,11 @@
<!--Sybase-->
<profile>
- <id>hudson-sybase152</id>
+ <id>hudson-sybase-15-0-2_8kb</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>sybase152</value>
+ <value>sybase-15-0-2_8kb</value>
</property>
</activation>
<dependencies>
@@ -191,15 +191,49 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>hudson-sybase-15-0-2_2kb</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>sybase-15-0-2_2kb</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-sybase-15-0-3_8kb</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>sybase-15-0-3_8kb</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
<!--DB2-->
<profile>
- <id>hudson-db291</id>
+ <id>hudson-db2-9-1</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>db291</value>
+ <value>db2-9-1</value>
</property>
</activation>
<dependencies>
@@ -217,6 +251,29 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>hudson-db2-9-7</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>db2-9-7</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.8.47</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.8.47</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
<!--MS SQLServer-->
@@ -258,11 +315,11 @@
<!--PostgreSQL-->
<profile>
- <id>hudson-postgresql8</id>
+ <id>hudson-postgresql8-2-4</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>postgresql8</value>
+ <value>postgresql8-2-4</value>
</property>
</activation>
<dependencies>
@@ -279,11 +336,11 @@
<!--MySQL-->
<profile>
- <id>hudson-mysql4</id>
+ <id>hudson-mysql4-1-22</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>mysql4</value>
+ <value>mysql4-1-22</value>
</property>
</activation>
<dependencies>
@@ -296,11 +353,11 @@
</dependencies>
</profile>
<profile>
- <id>hudson-mysql50</id>
+ <id>hudson-mysql5-0-79-2</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>mysql50</value>
+ <value>mysql5-0-79-2</value>
</property>
</activation>
<dependencies>
@@ -313,11 +370,11 @@
</dependencies>
</profile>
<profile>
- <id>hudson-mysql51</id>
+ <id>hudson-mysql5-1-36</id>
<activation>
<property>
<name>dataSourceName</name>
- <value>mysql51</value>
+ <value>mysql5-1-36</value>
</property>
</activation>
<dependencies>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r950 - idm/trunk/parent.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-14 06:39:07 -0500 (Sat, 14 Nov 2009)
New Revision: 950
Modified:
idm/trunk/parent/pom.xml
Log:
- cleanup
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-14 11:24:34 UTC (rev 949)
+++ idm/trunk/parent/pom.xml 2009-11-14 11:39:07 UTC (rev 950)
@@ -332,121 +332,88 @@
<!--Unused drivers:-->
- <profile>
- <id>hudson-postgresql-83</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-604</version>
- <classifier>jdbc3</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hudson-postgresql-83-jdbc4</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-604</version>
- <classifier>jdbc4</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hudson-db2jcc-357</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.57.86</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.57.86</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hudson-db2jcc-31</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hudson-ojdbc6</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
<!--<profile>-->
- <!--<id>provided-jdbc-driver</id>-->
+ <!--<id>hudson-postgresql-83</id>-->
<!--<dependencies>-->
<!--<dependency>-->
- <!--<groupId>privided</groupId>-->
- <!--<artifactId>jdbc-driver</artifactId>-->
- <!--<version>NA</version>-->
- <!--<scope>system</scope>-->
- <!--<systemPath>${provided.jdbc.driver.path}</systemPath>-->
+ <!--<groupId>postgresql</groupId>-->
+ <!--<artifactId>postgresql</artifactId>-->
+ <!--<version>8.3-604</version>-->
+ <!--<classifier>jdbc3</classifier>-->
+ <!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
<!--<profile>-->
- <!--<id>provided-jdbc-driver2</id>-->
+ <!--<id>hudson-postgresql-83-jdbc4</id>-->
<!--<dependencies>-->
<!--<dependency>-->
- <!--<groupId>privided</groupId>-->
- <!--<artifactId>jdbc-driver2</artifactId>-->
- <!--<version>NA</version>-->
- <!--<scope>system</scope>-->
- <!--<systemPath>${provided.jdbc.driver.path2}</systemPath>-->
+ <!--<groupId>postgresql</groupId>-->
+ <!--<artifactId>postgresql</artifactId>-->
+ <!--<version>8.3-604</version>-->
+ <!--<classifier>jdbc4</classifier>-->
+ <!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
<!--<profile>-->
- <!--<id>provided-jdbc-driver3</id>-->
+ <!--<id>hudson-db2jcc-357</id>-->
<!--<dependencies>-->
<!--<dependency>-->
- <!--<groupId>privided</groupId>-->
- <!--<artifactId>jdbc-driver3</artifactId>-->
- <!--<version>NA</version>-->
- <!--<scope>system</scope>-->
- <!--<systemPath>${provided.jdbc.driver.path3}</systemPath>-->
+ <!--<groupId>com.ibm</groupId>-->
+ <!--<artifactId>db2jcc</artifactId>-->
+ <!--<version>3.57.86</version>-->
+ <!--<scope>test</scope>-->
<!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>com.ibm</groupId>-->
+ <!--<artifactId>db2jcc_license_cu</artifactId>-->
+ <!--<version>3.57.86</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
<!--<profile>-->
- <!--<id>provided-jdbc-driver4</id>-->
+ <!--<id>hudson-db2jcc-31</id>-->
<!--<dependencies>-->
<!--<dependency>-->
+ <!--<groupId>com.ibm</groupId>-->
+ <!--<artifactId>db2jcc</artifactId>-->
+ <!--<version>3.1.57</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>com.ibm</groupId>-->
+ <!--<artifactId>db2jcc_license_cu</artifactId>-->
+ <!--<version>3.1.57</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+ <!--<profile>-->
+ <!--<id>hudson-ojdbc6</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>com.oracle</groupId>-->
+ <!--<artifactId>ojdbc6</artifactId>-->
+ <!--<version>11.1.0.7.0</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+
+ <!--Useful to pass additional driver from FS-->
+
+ <!--<profile>-->
+ <!--<id>provided-jdbc-driver</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
<!--<groupId>privided</groupId>-->
- <!--<artifactId>jdbc-driver4</artifactId>-->
+ <!--<artifactId>jdbc-driver</artifactId>-->
<!--<version>NA</version>-->
<!--<scope>system</scope>-->
- <!--<systemPath>${provided.jdbc.driver.path4}</systemPath>-->
+ <!--<systemPath>${provided.jdbc.driver.path}</systemPath>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r949 - idm/trunk/parent.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-14 06:24:34 -0500 (Sat, 14 Nov 2009)
New Revision: 949
Modified:
idm/trunk/parent/pom.xml
Log:
- rearrange maven profiles for hudson jdbc drivers
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-14 10:39:29 UTC (rev 948)
+++ idm/trunk/parent/pom.xml 2009-11-14 11:24:34 UTC (rev 949)
@@ -82,6 +82,11 @@
<profile>
<id>hudson-jdbc-drivers</id>
+ <activation>
+ <property>
+ <name>hudson-jdbc-drivers</name>
+ </property>
+ </activation>
<repositories>
<repository>
<id>qa-jdbc-drivers</id>
@@ -95,8 +100,17 @@
</repository>
</repositories>
</profile>
+
+ <!--Oracle-->
+
<profile>
- <id>hudson-ojdbc14</id>
+ <id>hudson-oracle9i</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>oracle9i</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
@@ -107,18 +121,30 @@
</dependencies>
</profile>
<profile>
- <id>hudson-jconnect</id>
+ <id>hudson-oracle10g</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>oracle10g</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.2.0.4</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>hudson-ojdbc5</id>
+ <id>hudson-oracle11R1</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>oracle11R1</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
@@ -129,35 +155,53 @@
</dependencies>
</profile>
<profile>
- <id>hudson-ojdbc6</id>
+ <id>hudson-oracle11R1-RAC</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>oracle11R1-RAC</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
+ <artifactId>ojdbc5</artifactId>
<version>11.1.0.7.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
+
+ <!--Sybase-->
+
<profile>
- <id>hudson-db2jcc-31</id>
+ <id>hudson-sybase152</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>sybase152</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</profile>
+
+ <!--DB2-->
+
<profile>
- <id>hudson-db2jcc-38</id>
+ <id>hudson-db291</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>db291</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>com.ibm</groupId>
@@ -173,25 +217,34 @@
</dependency>
</dependencies>
</profile>
+
+ <!--MS SQLServer-->
+
<profile>
- <id>hudson-db2jcc-357</id>
+ <id>hudson-sqlserver2005</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>sqlserver2005</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.57.86</version>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>2.0.1008.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.57.86</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</profile>
<profile>
- <id>hudson-msjdbc</id>
+ <id>hudson-sqlserver2008</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>sqlserver2008</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
@@ -201,8 +254,17 @@
</dependency>
</dependencies>
</profile>
+
+ <!--PostgreSQL-->
+
<profile>
- <id>hudson-postgresql-82</id>
+ <id>hudson-postgresql8</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>postgresql8</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>postgresql</groupId>
@@ -213,100 +275,181 @@
</dependency>
</dependencies>
</profile>
+
+ <!--MySQL-->
+
<profile>
- <id>hudson-postgresql-83</id>
+ <id>hudson-mysql4</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>mysql4</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-604</version>
- <classifier>jdbc3</classifier>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.8</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>hudson-postgresql-83-jdbc4</id>
+ <id>hudson-mysql50</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>mysql50</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-604</version>
- <classifier>jdbc4</classifier>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.8</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>hudson-mysql-508</id>
+ <id>hudson-mysql51</id>
+ <activation>
+ <property>
+ <name>dataSourceName</name>
+ <value>mysql51</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.0.8</version>
+ <version>5.1.7</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
+
+
+ <!--Unused drivers:-->
<profile>
- <id>hudson-mysql-517</id>
+ <id>hudson-postgresql-83</id>
<dependencies>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.7</version>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-604</version>
+ <classifier>jdbc3</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>provided-jdbc-driver</id>
+ <id>hudson-postgresql-83-jdbc4</id>
<dependencies>
<dependency>
- <groupId>privided</groupId>
- <artifactId>jdbc-driver</artifactId>
- <version>NA</version>
- <scope>system</scope>
- <systemPath>${provided.jdbc.driver.path}</systemPath>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-604</version>
+ <classifier>jdbc4</classifier>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>provided-jdbc-driver2</id>
+ <id>hudson-db2jcc-357</id>
<dependencies>
<dependency>
- <groupId>privided</groupId>
- <artifactId>jdbc-driver2</artifactId>
- <version>NA</version>
- <scope>system</scope>
- <systemPath>${provided.jdbc.driver.path2}</systemPath>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.57.86</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.57.86</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
- <id>provided-jdbc-driver3</id>
+ <id>hudson-db2jcc-31</id>
<dependencies>
<dependency>
- <groupId>privided</groupId>
- <artifactId>jdbc-driver3</artifactId>
- <version>NA</version>
- <scope>system</scope>
- <systemPath>${provided.jdbc.driver.path3}</systemPath>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
- <id>provided-jdbc-driver4</id>
+ <id>hudson-ojdbc6</id>
<dependencies>
<dependency>
- <groupId>privided</groupId>
- <artifactId>jdbc-driver4</artifactId>
- <version>NA</version>
- <scope>system</scope>
- <systemPath>${provided.jdbc.driver.path4}</systemPath>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc6</artifactId>
+ <version>11.1.0.7.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
+
+ <!--<profile>-->
+ <!--<id>provided-jdbc-driver</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>privided</groupId>-->
+ <!--<artifactId>jdbc-driver</artifactId>-->
+ <!--<version>NA</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${provided.jdbc.driver.path}</systemPath>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+ <!--<profile>-->
+ <!--<id>provided-jdbc-driver2</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>privided</groupId>-->
+ <!--<artifactId>jdbc-driver2</artifactId>-->
+ <!--<version>NA</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${provided.jdbc.driver.path2}</systemPath>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+ <!--<profile>-->
+ <!--<id>provided-jdbc-driver3</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>privided</groupId>-->
+ <!--<artifactId>jdbc-driver3</artifactId>-->
+ <!--<version>NA</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${provided.jdbc.driver.path3}</systemPath>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+ <!--<profile>-->
+ <!--<id>provided-jdbc-driver4</id>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>privided</groupId>-->
+ <!--<artifactId>jdbc-driver4</artifactId>-->
+ <!--<version>NA</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${provided.jdbc.driver.path4}</systemPath>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
</profiles>
<repositories>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r948 - idm/trunk/idm-testsuite/src/test/resources/datasources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-14 05:39:29 -0500 (Sat, 14 Nov 2009)
New Revision: 948
Modified:
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
Log:
- update for hudson oracle setup
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-14 10:15:27 UTC (rev 947)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-14 10:39:29 UTC (rev 948)
@@ -150,13 +150,21 @@
</datasource>
<datasource>
- <datasource-name>oracle11</datasource-name>
+ <datasource-name>oracle11R1</datasource-name>
<connection-url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</connection-url>
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
</datasource>
+ <datasource>
+ <datasource-name>oracle11R1-RAC</datasource-name>
+ <connection-url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=qarac1.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</connection-url>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
+
<datasource>
<datasource-name>mysql4</datasource-name>
<connection-url>jdbc:mysql://dev01.qa.atl.jboss.com/identity</connection-url>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-14 10:15:27 UTC (rev 947)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-14 10:39:29 UTC (rev 948)
@@ -119,7 +119,7 @@
</configuration>
<!-- The oracle 10g configuration -->
<configuration>
- <configuration-name>oracle11</configuration-name>
+ <configuration-name>oracle11R1</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -132,6 +132,20 @@
<!--</property>-->
</properties>
</configuration>
+ <configuration>
+ <configuration-name>oracle11R1-RAC</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.Oracle10gDialect</value>
+ </property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <!--<property>-->
+ <!--<name>hibernate.cache.use_second_level_cache</name>-->
+ <!--<value>true</value>-->
+ <!--</property>-->
+ </properties>
+ </configuration>
<!-- The sqlserver configuration -->
<configuration>
<configuration-name>sqlserver2005</configuration-name>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r947 - in idm/trunk: example/auth/src/main/resources and 8 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-14 05:15:27 -0500 (Sat, 14 Nov 2009)
New Revision: 947
Added:
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml
Modified:
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml
idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml
idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml
idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml
idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java
idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java
idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml
idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml
Log:
- another take on binary data in schema
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -45,6 +45,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml
===================================================================
--- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,6 +46,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml
===================================================================
--- idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -67,6 +67,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml
===================================================================
--- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -48,6 +48,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<mapping resource="mappings/HibernateRealm.hbm.xml"/>
+ <mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>
<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>
Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml
===================================================================
--- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -51,6 +51,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
Added: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java
===================================================================
--- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java (rev 0)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateBinaryValue.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -0,0 +1,60 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2009, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+
+package org.jboss.identity.idm.impl.model.hibernate;
+
+public class HibernateBinaryValue
+{
+ private Long id;
+
+ private byte[] value = null;
+
+ public HibernateBinaryValue()
+ {
+ }
+
+ public HibernateBinaryValue(byte[] value)
+ {
+ this.value = value;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public byte[] getValue()
+ {
+ return value;
+ }
+
+ public void setValue(byte[] value)
+ {
+ this.value = value;
+ }
+}
Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java
===================================================================
--- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -48,7 +48,7 @@
private String type;
- private byte[] binaryValue = null;
+ private HibernateBinaryValue binaryValue = null;
private Set<String> textValues = new HashSet<String>();
@@ -108,12 +108,12 @@
this.type = newType;
}
- public byte[] getBinaryValue()
+ public HibernateBinaryValue getBinaryValue()
{
return binaryValue;
}
- public void setBinaryValue(byte[] binaryValue)
+ public void setBinaryValue(HibernateBinaryValue binaryValue)
{
this.binaryValue = binaryValue;
}
@@ -149,7 +149,7 @@
}
else if (type.equals(TYPE_BINARY))
{
- return getBinaryValue();
+ return getBinaryValue().getValue();
}
else
{
@@ -174,7 +174,7 @@
throw new IllegalArgumentException("byte[] value expected with a set type." + " Name=" + name + "; type=" + type);
}
- setBinaryValue((byte[])value);
+ setBinaryValue(new HibernateBinaryValue((byte[])value));
}
else
{
@@ -191,7 +191,7 @@
else if (type.equals(TYPE_BINARY))
{
Set vals = new HashSet();
- vals.add(getBinaryValue());
+ vals.add(getBinaryValue().getValue());
return vals;
}
else
Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java
===================================================================
--- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -46,7 +46,7 @@
private String textValue;
- private byte[] binaryValue;
+ private HibernateBinaryValue binaryValue;
private Map<String, String> properties = new HashMap<String, String>();
@@ -74,12 +74,12 @@
this.textValue = textValue;
}
- public byte[] getBinaryValue()
+ public HibernateBinaryValue getBinaryValue()
{
return binaryValue;
}
- public void setBinaryValue(byte[] binaryValue)
+ public void setBinaryValue(HibernateBinaryValue binaryValue)
{
this.binaryValue = binaryValue;
}
@@ -120,7 +120,7 @@
{
return textValue;
}
- return binaryValue;
+ return binaryValue.getValue();
}
public Object getEncodedValue()
Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -23,15 +23,7 @@
package org.jboss.identity.idm.impl.store.hibernate;
import org.jboss.identity.idm.common.exception.IdentityException;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm;
+import org.jboss.identity.idm.impl.model.hibernate.*;
import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl;
import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext;
import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
@@ -427,6 +419,7 @@
return config
.addResource("mappings/HibernateIdentityObject.hbm.xml")
+ .addResource("mappings/HibernateBinaryValue.hbm.xml")
.addResource("mappings/HibernateIdentityObjectAttribute.hbm.xml")
.addResource("mappings/HibernateIdentityObjectCredential.hbm.xml")
.addResource("mappings/HibernateIdentityObjectCredentialType.hbm.xml")
@@ -1796,7 +1789,9 @@
throw new IdentityException("Wrong attribute mapping. Attribute persisted as binary is mapped with: "
+ type + ". Attribute name: " + name);
}
- storeAttribute.setBinaryValue((byte[])attribute.getValue());
+ HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue());
+ getHibernateSession(ctx).persist(bv);
+ storeAttribute.setBinaryValue(bv);
}
else
{
@@ -1815,7 +1810,9 @@
}
else if (type.equals(HibernateIdentityObjectAttribute.TYPE_BINARY))
{
- newAttribute.setBinaryValue((byte[])attribute.getValue());
+ HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue());
+ getHibernateSession(ctx).persist(bv);
+ newAttribute.setBinaryValue(bv);
}
hibernateObject.addAttribute(newAttribute);
}
@@ -1962,7 +1959,9 @@
+ type + ". Attribute name: " + name);
}
- hibernateAttribute.setBinaryValue((byte[])hibernateAttribute.getValue());
+ HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue());
+ getHibernateSession(ctx).persist(bv);
+ hibernateAttribute.setBinaryValue(bv);
}
else
{
@@ -1993,7 +1992,9 @@
values.add((byte[])value);
}
hibernateAttribute = new HibernateIdentityObjectAttribute(hibernateObject, name, HibernateIdentityObjectAttribute.TYPE_BINARY);
- hibernateAttribute.setBinaryValue((byte[])attribute.getValue());
+ HibernateBinaryValue bv = new HibernateBinaryValue((byte[])attribute.getValue());
+ getHibernateSession(ctx).persist(bv);
+ hibernateAttribute.setBinaryValue(bv);
}
@@ -2181,7 +2182,7 @@
}
else if (value instanceof byte[] && hibernateCredential.getBinaryValue() != null)
{
- return Arrays.equals((byte[])value, hibernateCredential.getBinaryValue());
+ return Arrays.equals((byte[])value, hibernateCredential.getBinaryValue().getValue());
}
else
{
@@ -2247,7 +2248,9 @@
}
else if (value instanceof byte[])
{
- hibernateCredential.setBinaryValue((byte[])value);
+ HibernateBinaryValue bv = new HibernateBinaryValue((byte[])value);
+ getHibernateSession(ctx).persist(bv);
+ hibernateCredential.setBinaryValue(bv);
}
else
{
Copied: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml (from rev 943, idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml)
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml (rev 0)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateBinaryValue.hbm.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+ <class name="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue"
+ table="jbid_bin_value">
+ <cache usage="read-write"/>
+ <id name="id"
+ type="java.lang.Long"
+ access="field">
+ <column name="ATTRIBUTE_ID" />
+ <generator class="native"/>
+ </id>
+ <property name="value"
+ type="org.hibernate.type.PrimitiveByteArrayBlobType"
+ access="field"
+ lazy="true"
+ not-null="true">
+ <column name="VALUE" length="10240000"/>
+ </property>
+ </class>
+</hibernate-mapping>
Modified: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -42,13 +42,17 @@
<element type="string"
column="ATTR_VALUE"/>
</set>
- <property name="binaryValue"
- type="org.hibernate.type.PrimitiveByteArrayBlobType"
- access="field"
- lazy="true"
- not-null="true">
- <column name="BINARY_VALUE" length="10240000"/>
- </property>
+ <many-to-one name="binaryValue"
+ class="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue"
+ not-null="false"
+ lazy="proxy"
+ access="field"
+ fetch="select"
+ cascade="all">
+ <column name="BINARY_VALUE"
+ not-null="false"/>
+ </many-to-one>
+
</class>
</hibernate-mapping>
Modified: idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
===================================================================
--- idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -12,14 +12,16 @@
<column name="ID" />
<generator class="native"/>
</id>
- <property name="binaryValue"
- type="org.hibernate.type.PrimitiveByteArrayBlobType"
- access="field"
- lazy="false"
- not-null="true">
- <column name="BINARY_VAL"
- length="10240000" />
- </property>
+ <many-to-one name="binaryValue"
+ class="org.jboss.identity.idm.impl.model.hibernate.HibernateBinaryValue"
+ not-null="false"
+ lazy="proxy"
+ access="field"
+ fetch="select"
+ cascade="all">
+ <column name="BINARY_VALUE"
+ not-null="false"/>
+ </many-to-one>
<many-to-one name="identityObject"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -95,6 +95,7 @@
List<String> mappings = new LinkedList<String>();
mappings.add("mappings/HibernateIdentityObject.hbm.xml");
+ mappings.add("mappings/HibernateBinaryValue.hbm.xml");
mappings.add("mappings/HibernateIdentityObjectAttribute.hbm.xml");
mappings.add("mappings/HibernateIdentityObjectCredential.hbm.xml");
mappings.add("mappings/HibernateIdentityObjectCredentialType.hbm.xml");
Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -99,7 +99,7 @@
random.nextBytes(picture);
attr = new HibernateIdentityObjectAttribute(user1, "simple2", HibernateIdentityObjectAttribute.TYPE_BINARY);
- attr.setBinaryValue(picture);
+ attr.setBinaryValue(new HibernateBinaryValue(picture));
user1.addAttribute(attr);
commit();
@@ -117,7 +117,7 @@
attr = new HibernateIdentityObjectAttribute(user1, "simple3", HibernateIdentityObjectAttribute.TYPE_BINARY);
- attr.setBinaryValue(picture);
+ attr.setBinaryValue(new HibernateBinaryValue(picture));
user1.getAttributes().add(attr);
commit();
Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java
===================================================================
--- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-11-14 10:15:27 UTC (rev 947)
@@ -232,8 +232,8 @@
store.removeAttributes(ctx, user1, new String[]{"key1", "key2"});
assertNull(store.findIdentityObjectByUniqueAttribute(ctx, IdentityTypeEnum.USER, new SimpleAttribute("key1", new String[]{"toto"})));
-
+
commit();
}
Modified: idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -48,6 +48,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml
===================================================================
--- idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 00:08:02 UTC (rev 946)
+++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-14 10:15:27 UTC (rev 947)
@@ -49,6 +49,7 @@
<!-- all nessesary mappings are added programatically to the configuration in the store-->
<!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
<!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateBinaryValue.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
<!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r946 - in identity-federation/trunk/jboss-identity-webapps: idp-sig-no-val/src/main/webapp/WEB-INF and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-13 19:08:02 -0500 (Fri, 13 Nov 2009)
New Revision: 946
Added:
identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/WEB-INF/jbid-handlers.xml
Modified:
identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/jbid-handlers.xml
identity-federation/trunk/jboss-identity-webapps/idp-sig/src/main/webapp/WEB-INF/jbid-handlers.xml
identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/index.jsp
Log:
update web app files
Modified: identity-federation/trunk/jboss-identity-webapps/idp-sig/src/main/webapp/WEB-INF/jbid-handlers.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig/src/main/webapp/WEB-INF/jbid-handlers.xml 2009-11-13 22:28:07 UTC (rev 945)
+++ identity-federation/trunk/jboss-identity-webapps/idp-sig/src/main/webapp/WEB-INF/jbid-handlers.xml 2009-11-14 00:08:02 UTC (rev 946)
@@ -1,6 +1,8 @@
<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
<Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2SignatureValidationHandler"/>
<Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
<Handler class="org.jboss.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2SignatureGenerationHandler"/>
</Handlers>
Modified: identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/jbid-handlers.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/jbid-handlers.xml 2009-11-13 22:28:07 UTC (rev 945)
+++ identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/jbid-handlers.xml 2009-11-14 00:08:02 UTC (rev 946)
@@ -3,4 +3,5 @@
<Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
<Handler class="org.jboss.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2SignatureGenerationHandler"/>
</Handlers>
Added: identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/WEB-INF/jbid-handlers.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/WEB-INF/jbid-handlers.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/WEB-INF/jbid-handlers.xml 2009-11-14 00:08:02 UTC (rev 946)
@@ -0,0 +1,5 @@
+<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
+ <Handler class="org.jboss.identity.federation.web.handlers.saml2.SAML2SignatureGenerationHandler"/>
+</Handlers>
Modified: identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/index.jsp
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/index.jsp 2009-11-13 22:28:07 UTC (rev 945)
+++ identity-federation/trunk/jboss-identity-webapps/sales-sig/src/main/webapp/index.jsp 2009-11-14 00:08:02 UTC (rev 946)
@@ -9,5 +9,5 @@
<img src="piechart.gif"/>
<br/>
-<a href="logout.jsp">Click to LogOut</a>
+<a href="?GLO=true">Click to LogOut</a>
</div>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r945 - idm/trunk/parent.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-13 17:28:07 -0500 (Fri, 13 Nov 2009)
New Revision: 945
Modified:
idm/trunk/parent/pom.xml
Log:
- fix for postgresql jdbc drivers in hudson
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-13 19:34:14 UTC (rev 944)
+++ idm/trunk/parent/pom.xml 2009-11-13 22:28:07 UTC (rev 945)
@@ -208,6 +208,7 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.2-504</version>
+ <classifier>jdbc3</classifier>
<scope>test</scope>
</dependency>
</dependencies>
@@ -219,11 +220,24 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.3-604</version>
+ <classifier>jdbc3</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
+ <id>hudson-postgresql-83-jdbc4</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-604</version>
+ <classifier>jdbc4</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>hudson-mysql-508</id>
<dependencies>
<dependency>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r944 - in idm/trunk: idm-testsuite/src/test/resources/datasources and 1 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-13 14:34:14 -0500 (Fri, 13 Nov 2009)
New Revision: 944
Modified:
idm/trunk/idm-testsuite/pom.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
idm/trunk/parent/pom.xml
Log:
- changes for hudson
Modified: idm/trunk/idm-testsuite/pom.xml
===================================================================
--- idm/trunk/idm-testsuite/pom.xml 2009-11-13 17:10:29 UTC (rev 943)
+++ idm/trunk/idm-testsuite/pom.xml 2009-11-13 19:34:14 UTC (rev 944)
@@ -138,20 +138,7 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-604.jdbc3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>1.2.2</version>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-13 17:10:29 UTC (rev 943)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-11-13 19:34:14 UTC (rev 944)
@@ -31,7 +31,7 @@
<!--<password>jbidentity</password>-->
<!--</datasource>-->
<datasource>
- <datasource-name>sybase152</datasource-name>
+ <datasource-name>sybase152-jtds</datasource-name>
<connection-url>jdbc:jtds:sybase://dev77.qa.atl2.redhat.com:4100/jbidentity</connection-url>
<driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
<user-name>jbidentity</user-name>
@@ -39,7 +39,7 @@
</datasource>
<datasource>
- <datasource-name>sybase152-jconnect</datasource-name>
+ <datasource-name>sybase152</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>
@@ -104,20 +104,35 @@
</datasource>
<datasource>
- <datasource-name>sqlserver</datasource-name>
+ <datasource-name>sqlserver2005-jtds</datasource-name>
<connection-url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/identity</connection-url>
<driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
</datasource>
<datasource>
- <datasource-name>sqlserver2</datasource-name>
+ <datasource-name>sqlserver2005</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>sqlserver2008-jtds</datasource-name>
+ <connection-url>jdbc:jtds:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433/identity</connection-url>
+ <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
+ <datasource>
+ <datasource-name>sqlserver2008</datasource-name>
+ <connection-url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433;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>
<connection-url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</connection-url>
@@ -151,10 +166,17 @@
</datasource>
<datasource>
- <datasource-name>mysql5</datasource-name>
+ <datasource-name>mysql51</datasource-name>
<connection-url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/identity?jdbcCompliantTrunca...</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
</datasource>
+ <datasource>
+ <datasource-name>mysql50</datasource-name>
+ <connection-url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/identity?jdbcCompliantTrunca...</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
</datasources>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 17:10:29 UTC (rev 943)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 19:34:14 UTC (rev 944)
@@ -134,7 +134,7 @@
</configuration>
<!-- The sqlserver configuration -->
<configuration>
- <configuration-name>sqlserver</configuration-name>
+ <configuration-name>sqlserver2005</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -143,7 +143,7 @@
</properties>
</configuration>
<configuration>
- <configuration-name>sqlserver2</configuration-name>
+ <configuration-name>sqlserver2005-jtds</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -151,6 +151,24 @@
</property>
</properties>
</configuration>
+ <configuration>
+ <configuration-name>sqlserver2008</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.SQLServerDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <configuration>
+ <configuration-name>sqlserver2008-jtds</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>
@@ -172,7 +190,7 @@
</configuration>
<!-- The mysql 5 configuration -->
<configuration>
- <configuration-name>mysql5</configuration-name>
+ <configuration-name>mysql50</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
@@ -181,6 +199,15 @@
</properties>
</configuration>
<configuration>
+ <configuration-name>mysql51</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.MySQLInnoDBDialect</value>
+ </property>
+ </properties>
+ </configuration>
+ <configuration>
<configuration-name>mysql5-local</configuration-name>
<properties>
<property>
@@ -218,7 +245,7 @@
</properties>
</configuration>
<configuration>
- <configuration-name>sybase152-jconnect</configuration-name>
+ <configuration-name>sybase152-jtds</configuration-name>
<properties>
<property>
<name>hibernate.dialect</name>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-11-13 17:10:29 UTC (rev 943)
+++ idm/trunk/parent/pom.xml 2009-11-13 19:34:14 UTC (rev 944)
@@ -80,8 +80,172 @@
<!-- Profiles -->
<profiles>
-
<profile>
+ <id>hudson-jdbc-drivers</id>
+ <repositories>
+ <repository>
+ <id>qa-jdbc-drivers</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>hudson-ojdbc14</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.2.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-jconnect</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-ojdbc5</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-ojdbc6</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc6</artifactId>
+ <version>11.1.0.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-db2jcc-31</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-db2jcc-38</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.8.47</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.8.47</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-db2jcc-357</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.57.86</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.57.86</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-msjdbc</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>2.0.1008.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-postgresql-82</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-postgresql-83</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-604</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-mysql-508</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hudson-mysql-517</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>provided-jdbc-driver</id>
<dependencies>
<dependency>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r943 - in idm/trunk: idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate and 5 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-13 12:10:29 -0500 (Fri, 13 Nov 2009)
New Revision: 943
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/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/HibernateIdentityObjectRelationship.hbm.xml
idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.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/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/parent/logging.properties
Log:
- some perf improvements
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-13 17:10:29 UTC (rev 943)
@@ -41,12 +41,12 @@
"select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName";
public static final String findIdentityObjectsByTypeOrderedByNameAsc =
- "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName " +
- "order by o.name asc";
+ "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and " +
+ "o.identityType.name = :typeName order by o.name asc";
public static final String findIdentityObjectsByTypeOrderedByNameDesc =
- "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName " +
- "order by o.name desc";
+ "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and " +
+ "o.identityType.name = :typeName order by o.name desc";
public static final String countIdentityObjectsByType =
"select count(o.id) from HibernateIdentityObject o where o.realm.name = :realmName and o.identityType.name = :typeName";
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-13 17:10:29 UTC (rev 943)
@@ -71,6 +71,7 @@
import org.hibernate.*;
import org.hibernate.cfg.Configuration;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.Order;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -504,7 +505,8 @@
.setParameter("realmName", realm.getName())
.setParameter("name", name)
.setParameter("typeName", identityObjectType.getName())
- .list();
+ .setCacheable(true)
+ .list();
if (results.size() != 0)
{
@@ -592,6 +594,7 @@
.createQuery(HibernateIdentityObject.countIdentityObjectsByType)
.setParameter("typeName", jpaType.getName())
.setParameter("realmName", getRealmName(ctx))
+ .setCacheable(true)
.uniqueResult()).intValue();
}
catch (Exception e)
@@ -616,16 +619,17 @@
HibernateIdentityObject hibernateObject = null;
- Session hibernateSession = getHibernateSession(ctx);
-
try
{
hibernateObject = (HibernateIdentityObject)getHibernateSession(ctx).
- createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType)
- .setParameter("realmName", getRealmName(ctx))
- .setParameter("name", name)
- .setParameter("typeName", hibernateType.getName())
- .uniqueResult();
+ createCriteria(HibernateIdentityObject.class)
+ .add(Restrictions.eq("name", name))
+ .createAlias("realm", "rm")
+ .add(Restrictions.eq("rm.name", getRealmName(ctx)))
+ .createAlias("identityType", "type")
+ .add(Restrictions.eq("type.name", hibernateType.getName()))
+ .setCacheable(true)
+ .uniqueResult();
}
catch (Exception e)
{
@@ -674,49 +678,47 @@
try
{
- Query q = null;
+ Criteria hc = hibernateSession.createCriteria(HibernateIdentityObject.class)
+ .setCacheable(true)
+ .createAlias("realm", "rm")
+ .add(Restrictions.eq("rm.name", getRealmName(ctx)))
+ .createAlias("identityType", "type")
+ .add(Restrictions.eq("type.name", hibernateType.getName()));
if (criteria != null && criteria.isSorted())
{
if (criteria.isAscending())
{
- q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByTypeOrderedByNameAsc);
+ hc.addOrder(Order.asc("name"));
}
else
{
- q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByTypeOrderedByNameDesc);
+ hc.addOrder(Order.desc("name"));
}
}
- else
- {
- q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByType);
- }
if (criteria != null && criteria.isPaged())
{
if (criteria.getMaxResults() > 0)
{
- q.setMaxResults(criteria.getMaxResults());
+ hc.setMaxResults(criteria.getMaxResults());
}
- q.setFirstResult(criteria.getFirstResult());
+ hc.setFirstResult(criteria.getFirstResult());
}
- q.setParameter("realmName", getRealmName(ctx))
- .setParameter("typeName", hibernateType.getName());
-
if (criteria != null && criteria.getFilter() != null)
{
- q.setParameter("nameFilter", criteria.getFilter().replaceAll("\\*", "%"));
+ hc.add(Restrictions.like("name", criteria.getFilter().replaceAll("\\*", "%")));
}
else
{
- q.setParameter("nameFilter", "%");
+ hc.add(Restrictions.like("name", "%"));
}
- results = (List<IdentityObject>)q.list();
+ results = (List<IdentityObject>)hc.list();
Hibernate.initialize(results);
}
@@ -769,15 +771,9 @@
StringBuilder hqlString = new StringBuilder("");
-// if (orderByName)
-// {
-// hqlString.append(" orderBy ior.toIdentityObject.name");
-// if (ascending)
-// {
-// hqlString.append(" asc");
-// }
-// }
+
+
if (parent)
{
@@ -854,7 +850,7 @@
}
-
+ q.setCacheable(true);
results = q.list();
Hibernate.initialize(results);
@@ -2099,8 +2095,7 @@
}
else
{
- // No support for blob comparision
- return null;
+ queryString.append(" and :value = a.binaryValue");
}
@@ -2119,6 +2114,10 @@
i++;
}
}
+ else
+ {
+ q.setParameter("value", attribute.getValue());
+ }
List<HibernateIdentityObjectAttribute> attrs = (List<HibernateIdentityObjectAttribute>)q.list();
@@ -2149,13 +2148,14 @@
HibernateIdentityObjectCredential hibernateCredential = null;
- hibernateCredential = (HibernateIdentityObjectCredential)getHibernateSession(ctx).
- createQuery(HibernateIdentityObjectCredential.findIdentityObjectCredentialByIOAndTypeNAme).
- setParameter("typeName", credential.getType().getName()).
- setParameter("identityObject", hibernateObject).uniqueResult();
+ hibernateCredential = (HibernateIdentityObjectCredential)getHibernateSession(ctx)
+ .createCriteria(HibernateIdentityObjectCredential.class)
+ .createAlias("type", "t")
+ .add(Restrictions.eq("t.name", credential.getType().getName()))
+ .add(Restrictions.eq("identityObject", hibernateObject))
+ .setCacheable(true)
+ .uniqueResult();
-
-
if (hibernateCredential == null)
{
return false;
@@ -2355,12 +2355,14 @@
try
{
- Query q = hibernateSession.
- createQuery(HibernateIdentityObjectType.findIdentityObjectTypeByName)
- .setParameter("name", type.getName());
- hibernateType = (HibernateIdentityObjectType)q.uniqueResult();
+ Criteria crit = hibernateSession.createCriteria(HibernateIdentityObjectType.class)
+ .add(Restrictions.eq("name", type.getName()))
+ .setCacheable(true);
+ hibernateType = (HibernateIdentityObjectType)crit.uniqueResult();
+
+
if (hibernateType == null)
{
if (isAllowNotDefinedIdentityObjectTypes())
@@ -2368,7 +2370,7 @@
populateObjectTypes(hibernateSession, new String[]{type.getName()});
}
- hibernateType = (HibernateIdentityObjectType)q.uniqueResult();
+ hibernateType = (HibernateIdentityObjectType)crit.uniqueResult();
}
@@ -2395,12 +2397,16 @@
try
{
- hibernateObject = (HibernateIdentityObject)hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType)
- .setParameter("name", io.getName())
- .setParameter("typeName", io.getIdentityType().getName())
- .setParameter("realmName", getRealmName(ctx))
+
+ hibernateObject = (HibernateIdentityObject)hibernateSession.createCriteria(HibernateIdentityObject.class)
+ .add(Restrictions.eq("name", io.getName()))
+ .createAlias("identityType", "type")
+ .add(Restrictions.eq("type.name", io.getIdentityType().getName()))
+ .createAlias("realm", "rm")
+ .add(Restrictions.eq("rm.name", getRealmName(ctx)))
.setCacheable(true)
.uniqueResult();
+
}
catch (Exception e)
{
@@ -2419,9 +2425,10 @@
try
{
- relationshipType = (HibernateIdentityObjectRelationshipType)hibernateSession.
- createQuery(HibernateIdentityObjectRelationshipType.findIdentityObjectRelationshipTypeByName)
- .setParameter("name", iot.getName())
+
+ relationshipType = (HibernateIdentityObjectRelationshipType)hibernateSession
+ .createCriteria(HibernateIdentityObjectRelationshipType.class)
+ .add(Restrictions.eq("name", iot.getName()))
.setCacheable(true)
.uniqueResult();
}
@@ -2441,8 +2448,11 @@
try
{
- hibernateType = (HibernateIdentityObjectCredentialType)session.
- createCriteria(HibernateIdentityObjectCredentialType.class).add(Restrictions.eq("name", credentialType.getName())).uniqueResult();
+ hibernateType = (HibernateIdentityObjectCredentialType)session
+ .createCriteria(HibernateIdentityObjectCredentialType.class)
+ .add(Restrictions.eq("name", credentialType.getName()))
+ .setCacheable(true)
+ .uniqueResult();
}
catch (HibernateException e)
{
@@ -2501,7 +2511,9 @@
for (String typeName : typeNames)
{
HibernateIdentityObjectCredentialType hibernateType = (HibernateIdentityObjectCredentialType)hibernateSession.
- createCriteria(HibernateIdentityObjectCredentialType.class).add(Restrictions.eq("name", typeName)).uniqueResult();
+ createCriteria(HibernateIdentityObjectCredentialType.class)
+ .add(Restrictions.eq("name", typeName))
+ .uniqueResult();
if (hibernateType == null)
{
@@ -2545,8 +2557,11 @@
// If store is not realm aware return null to create/get objects accessible from other realms
if (!isRealmAware())
{
- realm = (HibernateRealm)hibernateSession.
- createCriteria(HibernateRealm.class).setCacheable(true).add(Restrictions.eq("name", DEFAULT_REALM_NAME)).setCacheable(true).uniqueResult();
+ realm = (HibernateRealm)hibernateSession.
+ createCriteria(HibernateRealm.class)
+ .add(Restrictions.eq("name", DEFAULT_REALM_NAME))
+ .setCacheable(true)
+ .uniqueResult();
if (realm == null)
{
@@ -2556,8 +2571,11 @@
}
else
{
- realm = (HibernateRealm)hibernateSession.
- createCriteria(HibernateRealm.class).add(Restrictions.eq("name", getRealmName(ctx))).setCacheable(true).uniqueResult();
+ realm = (HibernateRealm)hibernateSession.
+ createCriteria(HibernateRealm.class)
+ .add(Restrictions.eq("name", getRealmName(ctx)))
+ .setCacheable(true)
+ .uniqueResult();
// TODO: other way to not lazy initialize realm? special method called on every new session creation
if (realm == null)
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -15,7 +15,7 @@
inverse="true"
cascade="all, delete-orphan"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key>
<column name="IDENTITY_OBJECT_ID" />
@@ -26,7 +26,7 @@
inverse="true"
cascade="all, delete-orphan"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key>
<column name="IDENTITY_OBJECT_ID" />
@@ -36,7 +36,7 @@
<set name="fromRelationships"
inverse="true"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key>
<column name="FROM_IDENTITY" />
@@ -64,7 +64,7 @@
table="jbid_io_props"
cascade="all, delete-orphan"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
@@ -84,13 +84,12 @@
<set name="toRelationships"
inverse="true"
lazy="true"
- fetch="select">
+ fetch="subselect">
<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>
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -35,8 +35,8 @@
table="jbid_io_attr_text_values"
cascade="all, delete-orphan"
access="field"
- lazy="false"
- fetch="join">
+ lazy="true"
+ fetch="subselect">
<cache usage="read-write"/>
<key column="TEXT_ATTR_VALUE_ID"/>
<element type="string"
@@ -45,7 +45,7 @@
<property name="binaryValue"
type="org.hibernate.type.PrimitiveByteArrayBlobType"
access="field"
- lazy="false"
+ lazy="true"
not-null="true">
<column name="BINARY_VALUE" length="10240000"/>
</property>
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -24,7 +24,7 @@
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
fetch="select"
- lazy="false">
+ lazy="proxy">
<column name="IDENTITY_OBJECT_ID"
not-null="true"
unique-key="id" />
@@ -33,7 +33,7 @@
table="jbid_io_creden_props"
cascade="all, delete-orphan"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -15,7 +15,7 @@
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
fetch="select"
- lazy="false">
+ lazy="proxy">
<column name="FROM_IDENTITY"
not-null="true"
unique-key="id"/>
@@ -24,7 +24,7 @@
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"
access="field"
fetch="join"
- lazy="false">
+ lazy="proxy">
<column name="NAME"
unique-key="id"/>
</many-to-one>
@@ -32,7 +32,7 @@
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"
access="field"
fetch="select"
- lazy="false">
+ lazy="proxy">
<column name="TO_IDENTITY"
not-null="true"
unique-key="id"/>
@@ -41,7 +41,7 @@
class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"
access="field"
fetch="select"
- lazy="false">
+ lazy="proxy">
<column name="REL_TYPE"
not-null="true"
unique-key="id" />
@@ -49,7 +49,7 @@
<map name="properties"
table="jbid_io_rel_props"
cascade="all, delete-orphan"
- fetch="select"
+ fetch="subselect"
lazy="true">
<cache usage="read-write"/>
<key column="PROP_ID"/>
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -25,7 +25,7 @@
table="jbid_io_rel_name_props"
cascade="all, delete-orphan"
lazy="true"
- fetch="select">
+ fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
@@ -37,7 +37,8 @@
<many-to-one name="realm"
class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"
access="field"
- fetch="join">
+ fetch="select"
+ lazy="proxy">
<column name="REALM"
not-null="true"
unique-key="id"/>
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -22,7 +22,7 @@
<map name="properties"
table="jbid_real_props"
cascade="all, delete-orphan"
- fetch="select"
+ fetch="subselect"
lazy="true">
<cache usage="read-write"/>
<key column="PROP_ID"/>
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-13 17:10:29 UTC (rev 943)
@@ -113,6 +113,7 @@
public void stop() throws Exception
{
+ hibernateSupport.getSessionFactory().getStatistics().logSummary();
hibernateSupport.stop();
dataSourceSupport.stop();
connectionManagerSupport.stop();
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -9,7 +9,7 @@
</property>
<property>
<name>hibernate.show_sql</name>
- <value>false</value>
+ <value>true</value>
</property>
<property>
<name>hibernate.auto_close_session</name>
@@ -43,6 +43,10 @@
<name>hibernate.jdbc.batch_size</name>
<value>0</value>
</property>
+ <property>
+ <name>hibernate.generate_statistics</name>
+ <value>true</value>
+ </property>
</properties>
</configuration>
<!-- The hsqldb configuration -->
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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -28,20 +28,21 @@
<hibernate-configuration>
<session-factory>
- <property name="hibernate.show_sql">false</property>
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">false</property>
+ <property name="hibernate.generate_statistics">true</property>
+ <property name="hibernate.show_sql">false</property>
+ <property name="cache.use_second_level_cache">true</property>
+ <property name="cache.use_query_cache">false</property>
- <property name="current_session_context_class">thread</property>
+ <property name="current_session_context_class">thread</property>
- <!--<property name="connection.datasource"></property>-->
+ <!--<property name="connection.datasource"></property>-->
- <property name="hibernate.connection.url">jdbc:hsqldb:mem:unit-testing-jpa1</property>
- <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
- <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
- <property name="hibernate.hbm2ddl.auto">create-drop</property>
- <property name="hibernate.connection.username">sa</property>
- <property name="hibernate.connection.password"></property>
+ <property name="hibernate.connection.url">jdbc:hsqldb:mem:unit-testing-jpa1</property>
+ <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+ <property name="hibernate.hbm2ddl.auto">create-drop</property>
+ <property name="hibernate.connection.username">sa</property>
+ <property name="hibernate.connection.password"></property>
</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-13 16:48:50 UTC (rev 942)
+++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-13 17:10:29 UTC (rev 943)
@@ -28,6 +28,7 @@
<hibernate-configuration>
<session-factory>
+ <property name="hibernate.generate_statistics">true</property>
<property name="hibernate.show_sql">false</property>
<property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">false</property>
Modified: idm/trunk/parent/logging.properties
===================================================================
--- idm/trunk/parent/logging.properties 2009-11-13 16:48:50 UTC (rev 942)
+++ idm/trunk/parent/logging.properties 2009-11-13 17:10:29 UTC (rev 943)
@@ -33,9 +33,9 @@
#myapp.business.level=CONFIG
#myapp.data.level=SEVERE
-#org.jboss.identity.idm.level=FINE
-org.jboss.identity.idm.impl.cache.level=FINER
+org.jboss.identity.idm.level=FINER
+
# Handlers
# -----------------------------------------
16 years, 6 months
- 1
- 0