Author: mpodolin Date: 2010-03-16 10:17:26 -0400 (Tue, 16 Mar 2010) New Revision: 2278 Modified: portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateRealm.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: EPP initial productization changes Modified: portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-16 14:17:26 UTC (rev 2278) @@ -133,7 +133,8 @@ addDependency(new Project("org.picketlink.idm", "picketlink-idm-spi", "jar", idmVersion)). addDependency(new Project("org.picketlink.idm", "picketlink-idm-hibernate", "jar", idmVersion)). addDependency(new Project("org.picketlink.idm", "picketlink-idm-ldap", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion)); + addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion)). + addDependency(new Project("org.hibernate", "hibernate-jbosscache2", "jar", "3.3.2.GA"));; module.component.applicationRegistry = new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version). Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" table="jbid_io"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -16,7 +16,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="IDENTITY_OBJECT_ID" /> </key> @@ -27,7 +27,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="IDENTITY_OBJECT_ID" /> </key> @@ -37,7 +37,7 @@ inverse="true" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="FROM_IDENTITY" /> </key> @@ -65,7 +65,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> @@ -85,7 +85,7 @@ inverse="true" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="TO_IDENTITY" /> </key> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" table="jbid_io_attr"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -37,7 +37,7 @@ access="field" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="TEXT_ATTR_VALUE_ID"/> <element type="string" column="ATTR_VALUE"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" table="jbid_attr_bin_value"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" table="jbid_io_creden"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" @@ -35,7 +35,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" table="jbid_creden_bin_value"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" table="jbid_io_creden_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" table="jbid_io_rel"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -51,7 +51,7 @@ cascade="all, delete-orphan" fetch="subselect" lazy="extra"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" table="jbid_io_rel_name"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" @@ -25,7 +25,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" table="jbid_io_rel_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" table="jbid_io_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateRealm.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateRealm.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/mappings/HibernateRealm.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateRealm" table="jbid_realm"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -24,7 +24,7 @@ cascade="all, delete-orphan" fetch="subselect" lazy="extra"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" table="jbid_io"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -16,7 +16,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="IDENTITY_OBJECT_ID" /> </key> @@ -27,7 +27,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="IDENTITY_OBJECT_ID" /> </key> @@ -37,7 +37,7 @@ inverse="true" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="FROM_IDENTITY" /> </key> @@ -65,7 +65,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> @@ -85,7 +85,7 @@ inverse="true" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key> <column name="TO_IDENTITY" /> </key> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" table="jbid_io_attr"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -37,7 +37,7 @@ access="field" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="TEXT_ATTR_VALUE_ID"/> <element type="string" column="ATTR_VALUE"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" table="jbid_attr_bin_value"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" table="jbid_io_creden"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" @@ -35,7 +35,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" table="jbid_creden_bin_value"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" table="jbid_io_creden_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" table="jbid_io_rel"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -51,7 +51,7 @@ cascade="all, delete-orphan" fetch="subselect" lazy="extra"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" table="jbid_io_rel_name"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" @@ -25,7 +25,7 @@ cascade="all, delete-orphan" lazy="extra" fetch="subselect"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" table="jbid_io_rel_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" table="jbid_io_type"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -4,7 +4,7 @@ <hibernate-mapping> <class name="org.picketlink.idm.impl.model.hibernate.HibernateRealm" table="jbid_realm"> - <cache usage="read-write"/> + <cache usage="transactional"/> <id name="id" type="java.lang.Long" access="field"> @@ -24,7 +24,7 @@ cascade="all, delete-orphan" fetch="subselect" lazy="extra"> - <cache usage="read-write"/> + <cache usage="transactional"/> <key column="PROP_ID"/> <map-key type="string" column="PROP_NAME"/> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -127,36 +127,4 @@ </init-params> </component-plugin> </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>${gatein.jcr.datasource.name}${container.name.suffix}</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="${portal.container.gatein.jcr.datasource.driver}"/> - <property name="url" value="${portal.container.gatein.jcr.datasource.url}"/> - <property name="username" value="${portal.container.gatein.jcr.datasource.username}"/> - <property name="password" value="${portal.container.gatein.jcr.datasource.password}"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - </configuration> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-16 08:26:17 UTC (rev 2277) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-16 14:17:26 UTC (rev 2278) @@ -38,12 +38,13 @@ <properties-param> <name>hibernate.properties</name> <description>Default Hibernate Service</description> + <property name="hibernate.cache.region.jbc2.query.localonly" value="true" /> + <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" /> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> <property name="hibernate.show_sql" value="false"/> <property name="hibernate.current_session_context_class" value="thread"/> <property name="hibernate.cache.use_second_level_cache" value="true"/> <property name="hibernate.cache.use_query_cache" value="true"/> - <!--CHANGEME HashtableCacheProvider shold not be used in production env--> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> <property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/> <property name="hibernate.connection.autocommit" value="true"/> <!-- @@ -200,38 +201,6 @@ </component> <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>${gatein.idm.datasource.name}${container.name.suffix}</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="${portal.container.gatein.idm.datasource.driver}"/> - <property name="url" value="${portal.container.gatein.idm.datasource.url}"/> - <property name="username" value="${portal.container.gatein.idm.datasource.username}"/> - <property name="password" value="${portal.container.gatein.idm.datasource.password}"/> - - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> <target-component>org.exoplatform.services.database.HibernateService</target-component> <component-plugin> <name>add.hibernate.mapping</name>