Author: bdaw Date: 2010-03-04 15:42:21 -0500 (Thu, 04 Mar 2010) New Revision: 1986 Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml Removed: portal/trunk/component/identity/src/main/java/conf/portal/hibernate-jbidm.cfg.xml portal/trunk/component/identity/src/main/java/conf/portal/jboss-idm-configuration.xml Modified: portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml Log: - Enable PLIDM API caching - PLIDM update - some xml clenaup Deleted: portal/trunk/component/identity/src/main/java/conf/portal/hibernate-jbidm.cfg.xml =================================================================== --- portal/trunk/component/identity/src/main/java/conf/portal/hibernate-jbidm.cfg.xml 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/component/identity/src/main/java/conf/portal/hibernate-jbidm.cfg.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -1,45 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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. - ---> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory> - - <property name="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="connection.datasource"></property>--> - - <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbidm</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: portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml =================================================================== --- portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -2,17 +2,17 @@ <!-- Copyright (C) 2009 eXo Platform SAS. - + 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 Deleted: portal/trunk/component/identity/src/main/java/conf/portal/jboss-idm-configuration.xml =================================================================== --- portal/trunk/component/identity/src/main/java/conf/portal/jboss-idm-configuration.xml 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/component/identity/src/main/java/conf/portal/jboss-idm-configuration.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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. - ---> - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> - <init-params> - <value-param> - <name>config</name> - <value>conf/portal/idm-config.xml</value> - </value-param> - <value-param> - <name>jndiName</name> - <value></value> - </value-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.database.HibernateService</target-component> - <component-plugin> - <name>add.hibernate.mapping</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> - <init-params> - <values-param> - <name>hibernate.mapping</name> - <value>mappings/HibernateRealm.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> - <value>mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> - <value>mappings/HibernateIdentityObject.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredential.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectAttribute.hbm.xml</value> - <value>mappings/HibernateIdentityObjectType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationship.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - - -</configuration> Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-04 20:42:21 UTC (rev 1986) @@ -131,7 +131,8 @@ addDependency(new Project("org.picketlink.idm", "picketlink-idm-api", "jar", idmVersion)). 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-ldap", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion)); module.component.applicationRegistry = new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version). Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/pom.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -46,7 +46,7 @@ <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version> - <org.picketlink.idm>1.1.0.Beta6</org.picketlink.idm> + <org.picketlink.idm>1.1.0.Beta8</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta09</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.0-CR03</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> + +</jbosscache> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-03-04 18:21:47 UTC (rev 1985) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-03-04 20:42:21 UTC (rev 1986) @@ -30,6 +30,16 @@ <identity-type-mappings> <user-mapping>USER</user-mapping> </identity-type-mappings> + <options> + <option> + <name>cache.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</name> + <value>picketlink-idm/jboss-cache.xml</value> + </option> + </options> </realm> <realm> <id>realm_portal</id> @@ -37,6 +47,16 @@ <identity-type-mappings> <user-mapping>USER</user-mapping> </identity-type-mappings> + <options> + <option> + <name>cache.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</name> + <value>picketlink-idm/jboss-cache.xml</value> + </option> + </options> </realm> <realm> <id>realm_sample-portal</id> @@ -44,6 +64,16 @@ <identity-type-mappings> <user-mapping>USER</user-mapping> </identity-type-mappings> + <options> + <option> + <name>cache.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</name> + <value>picketlink-idm/jboss-cache.xml</value> + </option> + </options> </realm> </realms> <repositories>