Author: julien_viet Date: 2009-12-11 04:25:57 -0500 (Fri, 11 Dec 2009) New Revision: 989 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml Log: - update unit test for organization based components - add a dependency of PicketLinkIDMServiceImpl on InitialContextInitializer to be able to use JNDI setup from this service Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2009-12-11 09:25:57 UTC (rev 989) @@ -25,6 +25,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.database.HibernateService; +import org.exoplatform.services.naming.InitialContextInitializer; import org.picketlink.idm.api.IdentitySession; import org.picketlink.idm.api.IdentitySessionFactory; import org.picketlink.idm.api.cfg.IdentityConfiguration; @@ -69,7 +70,11 @@ { } - public PicketLinkIDMServiceImpl(InitParams initParams, HibernateService hibernateService, ConfigurationManager confManager) throws Exception + public PicketLinkIDMServiceImpl( + InitParams initParams, + HibernateService hibernateService, + ConfigurationManager confManager, + InitialContextInitializer dependency) throws Exception { ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION); ValueParam jndiName = initParams.getValueParam(PARAM_JNDI_NAME_OPTION); Modified: portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml =================================================================== --- portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -58,7 +58,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/> + <property name="url" value="jdbc:hsqldb:file:${basedir}/target/temp/hsqldb"/> <property name="username" value="sa"/> <property name="password" value=""/> </properties-param> Modified: portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -34,12 +34,12 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/system"/> + <property name="swap-directory" value="${basedir}/target/temp/jcr/swap/system"/> </properties> <value-storages> <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/system"/> + <property name="path" value="${basedir}/target/temp/jcr/values/system"/> </properties> <filters> <filter property-type="Binary"/> @@ -61,14 +61,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/system"/> + <property name="index-dir" value="${basedir}/target/temp/jcr/jcrlucenedb/system"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/system"/> + <property name="path" value="${basedir}/target/temp/jcr/lock/system"/> </properties> </persister> </lock-manager> @@ -83,12 +83,12 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-test"/> + <property name="swap-directory" value="${basedir}/target/temp/jcr/swap/portal-test"/> </properties> <value-storages> <value-storage id="portal-test" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/portal-test"/> + <property name="path" value="${basedir}/target/temp/jcr/values/portal-test"/> </properties> <filters> <filter property-type="Binary"/> @@ -110,14 +110,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-test"/> + <property name="index-dir" value="${basedir}/target/temp/jcr/jcrlucenedb/portal-test"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/portal-test"/> + <property name="path" value="${basedir}/target/temp/jcr/lock/portal-test"/> </properties> </persister> </lock-manager> Modified: portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -77,11 +77,14 @@ <!--CHANGEME HashtableCacheProvider shold not be used in production env--> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:file:./target/temp/data/exodb${container.name.suffix}"/> +<!-- + <property name="hibernate.connection.url" value="jdbc:hsqldb:file:${basedir}/target/temp/organization"/> <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> <property name="hibernate.connection.autocommit" value="true"/> <property name="hibernate.connection.username" value="sa"/> <property name="hibernate.connection.password" value=""/> +--> + <property name="hibernate.connection.datasource" value="jdbcexo"/> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> <property name="hibernate.c3p0.min_size" value="5"/> <property name="hibernate.c3p0.max_size" value="20"/>