Author: julien_viet Date: 2009-12-06 16:39:10 -0500 (Sun, 06 Dec 2009) New Revision: 954 Added: portal/trunk/component/test/core/ portal/trunk/component/test/core/pom.xml portal/trunk/component/test/core/src/ portal/trunk/component/test/jcr/ portal/trunk/component/test/jcr/pom.xml portal/trunk/component/test/jcr/src/ portal/trunk/component/test/jcr/src/main/ portal/trunk/component/test/jcr/src/main/java/ portal/trunk/component/test/jcr/src/main/resources/ portal/trunk/component/test/jcr/src/main/resources/conf/ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml Removed: portal/trunk/component/common/src/main/java/conf/ portal/trunk/component/test/core/src/main/resources/conf/jcr/ portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/ portal/trunk/component/test/src/ Modified: portal/trunk/component/common/pom.xml portal/trunk/component/test/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml Log: split the test configuration into units to have a finer granularity Modified: portal/trunk/component/common/pom.xml =================================================================== --- portal/trunk/component/common/pom.xml 2009-12-06 21:03:39 UTC (rev 953) +++ portal/trunk/component/common/pom.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -64,12 +64,19 @@ <dependency> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test</artifactId> + <artifactId>exo.portal.component.test.core</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> Copied: portal/trunk/component/test/core/pom.xml (from rev 953, portal/trunk/component/test/pom.xml) =================================================================== --- portal/trunk/component/test/core/pom.xml (rev 0) +++ portal/trunk/component/test/core/pom.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -0,0 +1,63 @@ +<!-- + ~ 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. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test.core</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Core Test</name> + + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + +</project> Copied: portal/trunk/component/test/core/src (from rev 953, portal/trunk/component/test/src) Added: portal/trunk/component/test/jcr/pom.xml =================================================================== --- portal/trunk/component/test/jcr/pom.xml (rev 0) +++ portal/trunk/component/test/jcr/pom.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -0,0 +1,68 @@ +<!-- + ~ 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. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test.jcr</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Core Test JCR</name> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + +</project> Added: portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml (rev 0) +++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -0,0 +1,183 @@ +<?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.idgenerator.IDGeneratorService</key> + <type>org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl</type> + </component> + + <component> + <type>org.exoplatform.services.security.IdentityRegistry</type> + </component> + + <component> + <key>org.exoplatform.services.document.DocumentReaderService</key> + <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type> + <component-plugins> + <component-plugin> + <name>pdf.document.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.PDFDocumentReader</type> + <description>to read the pdf inputstream</description> + <init-params> + <values-param> + <name>document.known.types</name> + <description>description</description> + <value>application/pdf</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSWord</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSWordDocumentReader</type> + <description>to read the ms word inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSWord</name> + <description>description</description> + <value>application/msword</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSExcel</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSExcelDocumentReader</type> + <description>to read the ms excel inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSExcel</name> + <description>description</description> + <value>application/excel</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSOutlook</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSOutlookDocumentReader</type> + <description>to read the ms outlook inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSOutlook</name> + <description>description</description> + <value>application/vnd.ms-outlook</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>PPTdocument.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.PPTDocumentReader</type> + <description>to read the ms ppt inputstream</description> + <init-params> + <values-param> + <name>document.known.typesPPT</name> + <description>description</description> + <value>application/ppt</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerHTML</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.HTMLDocumentReader</type> + <description>to read the html inputstream</description> + <init-params> + <values-param> + <name>document.known.typesHTML</name> + <description>description</description> + <value>text/html</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerXML</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.XMLDocumentReader</type> + <description>to read the xml inputstream</description> + <init-params> + <values-param> + <name>document.known.typesXML</name> + <description>description</description> + <value>text/xml</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>TPdocument.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.TextPlainDocumentReader</type> + <description>to read the plain text inputstream</description> + <init-params> + <values-param> + <name>document.known.typesTextPlain</name> + <description>description</description> + <value>text/plain</value> + </values-param> + <!-- values-param> + <name>defaultEncoding</name> + <description>description</description> + <value>UTF-8</value> + </values-param --> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerOO</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.OpenOfficeDocumentReader</type> + <description>to read the OO inputstream</description> + </component-plugin> + + </component-plugins> + </component> + + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>jar:/conf/jcr/repository-configuration.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + +</configuration> Added: 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 (rev 0) +++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -0,0 +1,129 @@ +<!-- + ~ 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. + --> + +<repository-service default-repository="repository"> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-test"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + + <!-- System --> + <workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo"/> + <property name="dialect" value="hsqldb"/> + <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"/> + </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"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="../temp/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"/> + </properties> + </persister> + </lock-manager> + </workspace> + + <!-- Portal system data --> + <workspace name="portal-test"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo"/> + <property name="dialect" value="hsqldb"/> + <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"/> + </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"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="../temp/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"/> + </properties> + </persister> + </lock-manager> + </workspace> + + </workspaces> + </repository> + </repositories> +</repository-service> Modified: portal/trunk/component/test/pom.xml =================================================================== --- portal/trunk/component/test/pom.xml 2009-12-06 21:03:39 UTC (rev 953) +++ portal/trunk/component/test/pom.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -18,60 +18,21 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.test</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Test</name> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test</artifactId> + <packaging>pom</packaging> + <name>GateIn Portal Test Component</name> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> + <modules> + <module>core</module> + <module>jcr</module> + </modules> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> - </project> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-06 21:03:39 UTC (rev 953) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -101,4 +101,9 @@ </object-param> </init-params> </component> + + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> </configuration> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2009-12-06 21:03:39 UTC (rev 953) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2009-12-06 21:39:10 UTC (rev 954) @@ -39,54 +39,4 @@ </init-params> </component> - <component> - <key>org.exoplatform.web.security.security.CookieTokenService</key> - <type>org.exoplatform.web.security.security.CookieTokenService</type> - <init-params> - <values-param> - <name>service.configuration</name> - <value>jcr-token</value> - <value>7</value> - <value>DAY</value> - </values-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.web.security.security.TransientTokenService</key> - <type>org.exoplatform.web.security.security.TransientTokenService</type> - <init-params> - <values-param> - <name>service.configuration</name> - <value>memory-token</value> - <value>1</value> - <value>MINUTE</value> - </values-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> - <component-plugin> - <name>chromattic</name> - <set-method>addLifeCycle</set-method> - <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> - <init-params> - <value-param> - <name>name</name> - <value>token</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-work</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.web.security.security.TokenContainer</value> - <value>org.exoplatform.web.security.security.TokenEntry</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - </configuration>