[exo-jcr-commits] exo-jcr SVN: r4694 - core/trunk/exo.core.component.document/src/main/resources/conf and 41 other directories.

Author: nfilotto Date: 2011-08-03 07:06:54 -0400 (Wed, 03 Aug 2011) New Revision: 4694 Added: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0_OLD.xsd kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1_OLD.xsd kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2_OLD.xsd kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-00.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-19.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-20.xml Modified: core/trunk/exo.core.component.database/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.db.xml core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.hsql.xml core/trunk/exo.core.component.document/src/main/resources/conf/configuration.xml core/trunk/exo.core.component.document/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/activedirectory-service-configuration.xml core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/ldap-service-configuration.xml core/trunk/exo.core.component.organization.api/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/activedirectory-organization-configuration.xml core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/hibernate-organization-configuration.xml core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/jdbc-organization-configuration.xml core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/ldap-organization-configuration.xml core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/activedirectory-organization-configuration.xml core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/hibernate-organization-configuration.xml core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/ldap-organization-configuration.xml core/trunk/exo.core.component.script.groovy/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.security.core/src/main/resources/conf/portal/configuration.xml core/trunk/exo.core.component.xml-processing/src/main/resources/conf/configuration.xml core/trunk/exo.core.component.xml-processing/src/main/resources/conf/portal/configuration.xml jcr/trunk/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml jcr/trunk/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml jcr/trunk/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/configuration.xml jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java jcr/trunk/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml jcr/trunk/exo.jcr.component.statistics/src/main/resources/conf/configuration.xml jcr/trunk/exo.jcr.component.webdav/src/main/resources/conf/portal/configuration.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/conversationstate-when-membership-changed.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/statistics.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/service-configuration-in-detail.xml jcr/trunk/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.commons/src/main/resources/conf/configuration.xml kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/configuration.xml kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.component.common/src/main/resources/conf/configuration.xml kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/generic-configuration.xml kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/jboss-configuration.xml kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java kernel/trunk/exo.kernel.container/src/main/resources/conf/configuration.xml kernel/trunk/exo.kernel.container/src/main/resources/conf/portal/configuration.xml kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0.xsd kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2.xsd kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_0.java kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_1.java kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_2.java kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-01.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-02.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-03.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-04.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-05.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-06.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-07.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-08.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-09.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-10.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-11.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-12.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-13.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-14.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-15.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-16.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-17.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-01.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-02.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-03.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-04.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-05.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-06.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-07.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-08.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-09.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-10.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-11.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-12.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-13.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-14.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-15.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-16.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-18.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-01.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-02.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-03.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-04.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-05.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-06.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-07.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-08.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-09.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-10.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-11.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-12.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-13.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-14.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-15.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-16.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-17.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-18.xml kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-19.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/resources/conf/configuration.xml ws/trunk/exo.ws.rest.core/src/main/resources/conf/portal/configuration.xml ws/trunk/exo.ws.rest.ext/src/main/resources/conf/portal/configuration.xml Log: EXOJCR-1465: The namespace used in the configuration files is misspelled 1. Fix added in the kernel in order to support both wrong and correct spelling 2. All the config files under src/main/resources have been fixed Modified: core/trunk/exo.core.component.database/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.database/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.database/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- component> <key>org.exoplatform.services.database.HibernateService</key> Modified: core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.db.xml =================================================================== --- core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.db.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.db.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> Modified: core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.hsql.xml =================================================================== --- core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.hsql.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.database/src/main/resources/conf/portal/jdbcexo-configuration.hsql.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> Modified: core/trunk/exo.core.component.document/src/main/resources/conf/configuration.xml =================================================================== --- core/trunk/exo.core.component.document/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.document/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- component> <key>org.exoplatform.services.document.diff.DiffAlgorithm</key> Modified: core/trunk/exo.core.component.document/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.document/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.document/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -10,8 +10,8 @@ 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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.document.DocumentReaderService</key> Modified: core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/activedirectory-service-configuration.xml =================================================================== --- core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/activedirectory-service-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/activedirectory-service-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> Modified: core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,7 +19,7 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <import>classpath:/conf/portal/ldap-service-configuration.xml</import> </configuration> \ No newline at end of file Modified: core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/ldap-service-configuration.xml =================================================================== --- core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/ldap-service-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.ldap/src/main/resources/conf/portal/ldap-service-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> Modified: core/trunk/exo.core.component.organization.api/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.api/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.security.Authenticator</key> <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> Modified: core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/activedirectory-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/activedirectory-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/activedirectory-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> Modified: core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/hibernate-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/hibernate-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/hibernate-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.hibernate.OrganizationServiceImpl</type> Modified: core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/jdbc-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/jdbc-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/jdbc-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.database.impl.ExoCacheProvider</key> <type>org.exoplatform.services.database.impl.ExoCacheProvider</type> Modified: core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/ldap-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/ldap-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.jdbc/src/main/resources/conf/portal/ldap-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> Modified: core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/activedirectory-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/activedirectory-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/activedirectory-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -20,8 +20,8 @@ --> <configuration> - <component 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> <component-plugins> Modified: core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> <component-plugin> Modified: core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/hibernate-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/hibernate-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/hibernate-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.hibernate.OrganizationServiceImpl</type> Modified: core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/ldap-organization-configuration.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/ldap-organization-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.organization.ldap/src/main/resources/conf/portal/ldap-organization-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> Modified: core/trunk/exo.core.component.script.groovy/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.script.groovy/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.script.groovy.GroovyScriptInstantiator</type> Modified: core/trunk/exo.core.component.security.core/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.security.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.security.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.security.IdentityRegistry</type> Modified: core/trunk/exo.core.component.xml-processing/src/main/resources/conf/configuration.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.xml-processing/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.xml.resolving.impl.XMLResolvingServiceImpl</type> <component-plugins> Modified: core/trunk/exo.core.component.xml-processing/src/main/resources/conf/portal/configuration.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ core/trunk/exo.core.component.xml-processing/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.xml.transform.impl.html.TidyTransformerServiceImpl</type> </component> Modified: jcr/trunk/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: jcr/trunk/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: jcr/trunk/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml =================================================================== --- jcr/trunk/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -20,12 +20,12 @@ import org.exoplatform.services.jcr.access.AccessControlEntry; import org.exoplatform.services.jcr.access.DynamicIdentity; -import org.exoplatform.services.jcr.access.SystemIdentity; import org.exoplatform.services.jcr.core.ExtendedSession; import org.exoplatform.services.jcr.core.ManageableRepository; import org.exoplatform.services.jcr.core.SessionLifecycleListener; import org.exoplatform.services.security.ConversationState; import org.exoplatform.services.security.Identity; +import org.exoplatform.services.security.IdentityConstants; import org.exoplatform.services.security.MembershipEntry; import java.util.HashMap; @@ -70,6 +70,8 @@ private String currentWorkspace; private boolean closed; + + private ConversationState conversationState; /** * Creates SessionProvider for certain identity. @@ -84,6 +86,18 @@ } /** + * Creates SessionProvider for a dynamic identity. + * + * @param membershipEntries the expected memberships + */ + private SessionProvider(HashSet<MembershipEntry> membershipEntries) + { + this(false); + Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries); + this.conversationState = new ConversationState(id); + } + + /** * Internal constructor. * * @param isSystem @@ -112,7 +126,7 @@ */ public static SessionProvider createAnonimProvider() { - Identity id = new Identity(SystemIdentity.ANONIM, new HashSet<MembershipEntry>()); + Identity id = new Identity(IdentityConstants.ANONIM, new HashSet<MembershipEntry>()); return new SessionProvider(new ConversationState(id)); } @@ -130,11 +144,7 @@ { membershipEntries.add(ace.getMembershipEntry()); } - - Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries); - ConversationState conversationState = new ConversationState(id); - ConversationState.setCurrent(conversationState); - return new SessionProvider(conversationState); + return new SessionProvider(membershipEntries); } } @@ -168,8 +178,7 @@ if (session == null) { - ConversationState conversationState = ConversationState.getCurrent(); - if (conversationState != null && conversationState.getIdentity().getUserId().equals(DynamicIdentity.DYNAMIC)) + if (conversationState != null) { session = (ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity() Modified: jcr/trunk/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.jcr.ext.app.ThreadLocalSessionProviderService</type> Modified: jcr/trunk/exo.jcr.component.statistics/src/main/resources/conf/configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.statistics/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.component.statistics/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -7,8 +7,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type> Modified: jcr/trunk/exo.jcr.component.webdav/src/main/resources/conf/portal/configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.component.webdav/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.webdav.lnkproducer.LnkProducer</key> Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/conversationstate-when-membership-changed.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/conversationstate-when-membership-changed.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/conversationstate-when-membership-changed.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;target-component&gt;org.exoplatform.services.organization.OrganizationService&lt;/target-component&gt; ..... Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/statistics.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/statistics.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/statistics.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -269,8 +269,8 @@ into the list of parameter values of the init param called <emphasis>targetInterfaces</emphasis>.</para> - <programlisting language="xml">&lt;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"&gt; + <programlisting language="xml">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;component&gt; &lt;type&gt;org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig&lt;/type&gt; Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -594,8 +594,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the PortalContainerConfig --&gt; &lt;target-component&gt;org.exoplatform.container.definition.PortalContainerConfig&lt;/target-component&gt; @@ -760,8 +760,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;component&gt; &lt;!-- The full qualified name of the PortalContainerConfig --&gt; &lt;type&gt;org.exoplatform.container.definition.PortalContainerConfig&lt;/type&gt; @@ -1021,8 +1021,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the PortalContainerConfig --&gt; &lt;target-component&gt;org.exoplatform.container.definition.PortalContainerConfig&lt;/target-component&gt; @@ -1200,8 +1200,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the PortalContainerConfig --&gt; &lt;target-component&gt;org.exoplatform.container.definition.PortalContainerConfig&lt;/target-component&gt; @@ -1336,8 +1336,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;import&gt;war:/conf/sample-ext/common/common-configuration.xml&lt;/import&gt; &lt;import&gt;war:/conf/sample-ext/jcr/jcr-configuration.xml&lt;/import&gt; &lt;import&gt;war:/conf/sample-ext/portal/portal-configuration.xml&lt;/import&gt; @@ -1361,8 +1361,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;component&gt; &lt;key&gt;org.exoplatform.services.database.HibernateService&lt;/key&gt; &lt;jmx-name&gt;database:type=HibernateService&lt;/jmx-name&gt; @@ -1419,8 +1419,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the RepositoryServiceConfiguration --&gt; &lt;target-component&gt;org.exoplatform.services.jcr.config.RepositoryServiceConfiguration&lt;/target-component&gt; @@ -1529,8 +1529,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the ResourceBundleService --&gt; &lt;target-component&gt;org.exoplatform.services.resources.ResourceBundleService&lt;/target-component&gt; @@ -1651,8 +1651,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the UserPortalConfigService --&gt; &lt;target-component&gt;org.exoplatform.portal.config.UserPortalConfigService&lt;/target-component&gt; @@ -1743,8 +1743,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the ExtensibleFilter --&gt; &lt;target-component&gt;org.exoplatform.web.filter.ExtensibleFilter&lt;/target-component&gt; @@ -1867,8 +1867,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;external-component-plugins&gt; &lt;!-- The full qualified name of the ListenerService --&gt; &lt;target-component&gt;org.exoplatform.services.listener.ListenerService&lt;/target-component&gt; Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -30,12 +30,12 @@ <title>Kernel configuration namespace</title> <para>To be effective, the namespace URI - <uri>http://www.exoplaform.org/xml/ns/kernel_1_2.xsd</uri> must be target + <uri>http://www.exoplatform.org/xml/ns/kernel_1_2.xsd</uri> must be target namespace of the XML configuration file.</para> <programlisting language="xml">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"&gt; ... @@ -48,8 +48,8 @@ <programlisting language="xml">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"&gt; &lt;import&gt;${db.configuration.path}/db.xml&lt;/import&gt; &lt;import&gt;${java.io.tmpdir}/bindfile.xml&lt;/import&gt; @@ -1059,8 +1059,8 @@ <para>You can find below an example of how to use the variables:</para> - <programlisting language="xml">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"&gt; + <programlisting language="xml">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"&gt; &lt;component&gt; &lt;type&gt;org.exoplatform.container.TestPortalContainer$MyComponent&lt;/type&gt; &lt;init-params&gt; Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -103,8 +103,8 @@ <programlisting language="xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; &lt;configuration xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; - xsi:schemaLocation=&quot;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&quot; - xmlns=&quot;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&quot;... + xsi:schemaLocation=&quot;http://www.exoplatform.org/xml/ns/kernel_1_0... http://www.exoplatform.org/xml/ns/kernel_1_0.xsd&quot; + xmlns=&quot;http://www.exoplatform.org/xml/ns/kernel_1_0.xsd&quot... &lt;component&gt; &lt;type&gt;org.exoplatform.services.scheduler.impl.QuartzSheduler&lt;/type&gt; @@ -267,8 +267,8 @@ <programlisting language="xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; &lt;configuration xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; - xsi:schemaLocation=&quot;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&quot; - xmlns=&quot;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&quot;... + xsi:schemaLocation=&quot;http://www.exoplatform.org/xml/ns/kernel_1_0... http://www.exoplatform.org/xml/ns/kernel_1_0.xsd&quot; + xmlns=&quot;http://www.exoplatform.org/xml/ns/kernel_1_0.xsd&quot... &lt;component&gt; &lt;type&gt;org.exoplatform.services.scheduler.impl.QuartzSheduler&lt;/type&gt; Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/service-configuration-in-detail.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/service-configuration-in-detail.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/service-configuration-in-detail.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -102,8 +102,8 @@ <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF8"?&gt; &lt;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"&gt; + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"&gt; &lt;component&gt; &lt;key&gt;com.laverdad.services.ArticleStatsService&lt;/key&gt; &lt;type&gt;com.laverdad.services.ArticleStatsServiceImpl&lt;/type&gt; @@ -112,7 +112,7 @@ <note> <para>You are correctly using the namespace of the configuration - schema ( <uri>http://www.exoplaform.org/xml/ns/kernel_1_1.xsd</uri>). + schema ( <uri>http://www.exoplatform.org/xml/ns/kernel_1_1.xsd</uri>). Most of the configuration schema is explained in this article, therefore you do not need to open and understand the schema. For backward compatibility it is not necessary to declare the Modified: jcr/trunk/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ jcr/trunk/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.command.impl.CommandService</target-component> Modified: kernel/trunk/exo.kernel.commons/src/main/resources/conf/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.commons/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- component> <key>org.exoplatform.commons.utils.ExoExpression</key> Modified: kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.cache.CacheService</key> Modified: kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- component> <key>org.exoplatform.services.cache.CacheService</key> Modified: kernel/trunk/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.command.impl.CommandService</key> Modified: kernel/trunk/exo.kernel.component.common/src/main/resources/conf/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.common/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.log.LogConfigurationInitializer</key> Modified: kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.listener.ListenerService</key> Modified: kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/generic-configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/generic-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/generic-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.transaction.TransactionService</key> Modified: kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/jboss-configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/jboss-configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.common/src/main/resources/conf/portal/jboss-configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,6 +19,6 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> </configuration> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.cache.ExoCacheFactory</key> <type>org.exoplatform.services.cache.impl.infinispan.ExoCacheFactoryImpl</type> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.cache.ExoCacheFactory</key> <type>org.exoplatform.services.cache.impl.jboss.ExoCacheFactoryImpl</type> Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -103,9 +103,9 @@ + "XML declaration similar to\n" + "<configuration\n" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" - + " xsi:schemaLocation=\"http://www.exoplaform.org/xml/ns/kernel_1_1.xsd " - + "http://www.exoplaform.org/xml/ns/kernel_1_1.xsd\"\n" - + " xmlns=\"http://www.exoplaform.org/xml/ns/kernel_1_1.xsd\">&q...); + + " xsi:schemaLocation=\"http://www.exoplatform.org/xml/ns/kernel_1_1.xsd " + + "http://www.exoplatform.org/xml/ns/kernel_1_1.xsd\"\n" + + " xmlns=\"http://www.exoplatform.org/xml/ns/kernel_1_1.xsd\">&...); } else { Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -34,13 +34,22 @@ { /** . */ - public static final String KERNEL_1_0_URI = "http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"; + public static final String KERNEL_1_0_URI = "http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"; + + // We keep it for backward compatibility + public static final String KERNEL_1_0_URI_OLD = "http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"; /** . */ - public static final String KERNEL_1_1_URI = "http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"; + public static final String KERNEL_1_1_URI = "http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"; + + // We keep it for backward compatibility + public static final String KERNEL_1_1_URI_OLD = "http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"; /** . */ - public static final String KERNEL_1_2_URI = "http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"; + public static final String KERNEL_1_2_URI = "http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"; + + // We keep it for backward compatibility + public static final String KERNEL_1_2_URI_OLD = "http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"; /** * All the namespaces related to the kernel @@ -53,6 +62,10 @@ tmp.add(KERNEL_1_0_URI); tmp.add(KERNEL_1_1_URI); tmp.add(KERNEL_1_2_URI); + // we add the namespaces badly spelled for backward compatibility + tmp.add(KERNEL_1_0_URI_OLD); + tmp.add(KERNEL_1_1_URI_OLD); + tmp.add(KERNEL_1_2_URI_OLD); KERNEL_NAMESPACES_SET = Collections.unmodifiableSet(tmp); } @@ -65,6 +78,10 @@ resourceMap.put(KERNEL_1_0_URI, "org/exoplatform/container/configuration/kernel-configuration_1_0.xsd"); resourceMap.put(KERNEL_1_1_URI, "org/exoplatform/container/configuration/kernel-configuration_1_1.xsd"); resourceMap.put(KERNEL_1_2_URI, "org/exoplatform/container/configuration/kernel-configuration_1_2.xsd"); + // we add the namespaces badly spelled for backward compatibility + resourceMap.put(KERNEL_1_0_URI_OLD, "org/exoplatform/container/configuration/kernel-configuration_1_0_OLD.xsd"); + resourceMap.put(KERNEL_1_1_URI_OLD, "org/exoplatform/container/configuration/kernel-configuration_1_1_OLD.xsd"); + resourceMap.put(KERNEL_1_2_URI_OLD, "org/exoplatform/container/configuration/kernel-configuration_1_2_OLD.xsd"); resolver = new EntityResolverImpl(Namespaces.class.getClassLoader(), resourceMap); } @@ -73,7 +90,7 @@ */ public static String[] getKernelNamespaces() { - return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI}; + return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI, KERNEL_1_0_URI_OLD, KERNEL_1_1_URI_OLD, KERNEL_1_2_URI_OLD}; } /** Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -53,6 +53,7 @@ // All the kernel namespaces but KERNEL_1_0_URI Set<String> tmp = new LinkedHashSet<String>(Namespaces.KERNEL_NAMESPACES_SET); tmp.remove(Namespaces.KERNEL_1_0_URI); + tmp.remove(Namespaces.KERNEL_1_0_URI_OLD); kernelWithProfileURIs = Collections.unmodifiableSet(tmp); } Modified: kernel/trunk/exo.kernel.container/src/main/resources/conf/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <container-lifecycle-plugin> <type>org.exoplatform.container.monitor.jvm.AddJVMComponentsToRootContainer</type> Modified: kernel/trunk/exo.kernel.container/src/main/resources/conf/portal/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <!-- <component> Modified: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0.xsd 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema - targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + targetNamespace="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" Added: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0_OLD.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0_OLD.xsd (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_0_OLD.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:element name="configuration" type="configurationType"/> + + <xsd:complexType name="baseObjectType"> + <xsd:choice> + <xsd:element name="string" type="xsd:string"/> + <xsd:element name="int" type="xsd:int"/> + <xsd:element name="long" type="xsd:long"/> + <xsd:element name="boolean" type="xsd:boolean"/> + <xsd:element name="date" type="xsd:date"/> + <xsd:element name="double" type="xsd:double"/> + <xsd:element name="map" type="mapType"/> + <xsd:element name="collection" type="collectionType"/> + <xsd:element name="native-array" type="nativeArraytype"/> + <xsd:element name="object" type="objectType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="valueType"> + <xsd:complexContent> + <xsd:extension base="baseObjectType"/> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="entryType"> + <xsd:sequence> + <xsd:element name="key" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="value" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="mapType"> + <xsd:sequence> + <xsd:element name="entry" type="entryType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="collectionType"> + <xsd:sequence> + <xsd:element name="value" type="valueType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + <xsd:attribute name="item-type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="nativeArraytype"> + <xsd:complexContent> + <xsd:extension base="baseObjectType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="array" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="fieldType"> + <xsd:complexContent > + <xsd:extension base="baseObjectType"> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectType"> + <xsd:sequence> + <xsd:element name="field" type="fieldType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="value" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="paramType" abstract="true"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="valueParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="valuesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="propertiesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="object" type="objectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="initParamsType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="object-param" type="objectParamType"/> + <xsd:element name="properties-param" type="propertiesParamType"/> + <xsd:element name="value-param" type="valueParamType"/> + <xsd:element name="values-param" type="valuesParamType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="componentPluginType"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="set-method" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="priority" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="externalComponentPluginType"> + <xsd:sequence> + <xsd:element name="target-component" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="containerLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="manageableComponentsType"> + <xsd:sequence> + <xsd:element name="component-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="manageable-components" type="manageableComponentsType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentType"> + <xsd:sequence> + <xsd:element name="key" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="jmx-name" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="show-deploy-info" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="multi-instance" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="component-plugins" minOccurs="0" maxOccurs="1"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="configurationType"> + <xsd:sequence> + <xsd:element name="container-lifecycle-plugin" type="containerLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component-lifecycle-plugin" type="componentLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component" type="componentType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="external-component-plugins" type="externalComponentPluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="import" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="remove-configuration" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +</xsd:schema> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema - targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + targetNamespace="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" Added: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1_OLD.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1_OLD.xsd (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1_OLD.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,236 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:element name="configuration" type="configurationType"/> + + <xsd:complexType abstract="true" name="profilesdElementType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="baseObjectType"> + <xsd:choice> + <xsd:element name="string" type="xsd:string"/> + <xsd:element name="int" type="xsd:int"/> + <xsd:element name="long" type="xsd:long"/> + <xsd:element name="boolean" type="xsd:boolean"/> + <xsd:element name="date" type="xsd:date"/> + <xsd:element name="double" type="xsd:double"/> + <xsd:element name="map" type="mapType"/> + <xsd:element name="collection" type="collectionType"/> + <xsd:element name="native-array" type="nativeArraytype"/> + <xsd:element name="object" type="objectType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="entryType"> + <xsd:sequence> + <xsd:element name="key" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="value" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="mapType"> + <xsd:sequence> + <xsd:element name="entry" type="entryType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="collectionType"> + <xsd:sequence> + <xsd:element name="value" minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="baseObjectType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + <xsd:attribute name="item-type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="nativeArraytype"> + <xsd:complexContent> + <xsd:extension base="baseObjectType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="array" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="fieldType"> + <xsd:complexContent > + <xsd:extension base="baseObjectType"> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectType"> + <xsd:sequence> + <xsd:element name="field" minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="fieldType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="value" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="paramType" abstract="true"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="valueParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="valuesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="propertiesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="object" type="objectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="initParamsType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="object-param" type="objectParamType"/> + <xsd:element name="properties-param" type="propertiesParamType"/> + <xsd:element name="value-param" type="valueParamType"/> + <xsd:element name="values-param" type="valuesParamType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="componentPluginType"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="set-method" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="priority" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="externalComponentPluginType"> + <xsd:sequence> + <xsd:element name="target-component" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="containerLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="manageableComponentsType"> + <xsd:sequence> + <xsd:element name="component-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="manageable-components" type="manageableComponentsType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentType"> + <xsd:sequence> + <xsd:element name="key" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="jmx-name" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="show-deploy-info" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="multi-instance" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="component-plugins" minOccurs="0" maxOccurs="1"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="configurationType"> + <xsd:sequence> + <xsd:element name="container-lifecycle-plugin" type="containerLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component-lifecycle-plugin" type="componentLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component" type="componentType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="external-component-plugins" type="externalComponentPluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="import" type="importType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="remove-configuration" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="importType"> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +</xsd:schema> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2.xsd 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema - targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" + targetNamespace="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" Added: kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2_OLD.xsd =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2_OLD.xsd (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_2_OLD.xsd 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:element name="configuration" type="configurationType"/> + + <xsd:complexType abstract="true" name="profilesdElementType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="baseObjectType"> + <xsd:choice> + <xsd:element name="string" type="xsd:string"/> + <xsd:element name="int" type="xsd:int"/> + <xsd:element name="long" type="xsd:long"/> + <xsd:element name="boolean" type="xsd:boolean"/> + <xsd:element name="date" type="xsd:date"/> + <xsd:element name="double" type="xsd:double"/> + <xsd:element name="map" type="mapType"/> + <xsd:element name="collection" type="collectionType"/> + <xsd:element name="native-array" type="nativeArraytype"/> + <xsd:element name="object" type="objectType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="entryType"> + <xsd:sequence> + <xsd:element name="key" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="value" type="baseObjectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="mapType"> + <xsd:sequence> + <xsd:element name="entry" type="entryType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="collectionType"> + <xsd:sequence> + <xsd:element name="value" minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="baseObjectType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required"/> + <xsd:attribute name="item-type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="nativeArraytype"> + <xsd:complexContent> + <xsd:extension base="baseObjectType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="array" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="fieldType"> + <xsd:complexContent > + <xsd:extension base="baseObjectType"> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectType"> + <xsd:sequence> + <xsd:element name="field" minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="fieldType"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="value" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="paramType" abstract="true"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="valueParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="valuesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="propertiesParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="objectParamType"> + <xsd:complexContent> + <xsd:extension base="paramType"> + <xsd:sequence> + <xsd:element name="object" type="objectType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="initParamsType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="object-param" type="objectParamType"/> + <xsd:element name="properties-param" type="propertiesParamType"/> + <xsd:element name="value-param" type="valueParamType"/> + <xsd:element name="values-param" type="valuesParamType"/> + </xsd:choice> + </xsd:complexType> + + <xsd:complexType name="componentPluginType"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="set-method" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="priority" type="xsd:int" minOccurs="0" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="externalComponentPluginType"> + <xsd:sequence> + <xsd:element name="target-component" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="containerLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="priority" type="xsd:int" minOccurs="0" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="manageableComponentsType"> + <xsd:sequence> + <xsd:element name="component-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentLifecyclePluginType"> + <xsd:sequence> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="manageable-components" type="manageableComponentsType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="componentType"> + <xsd:sequence> + <xsd:element name="key" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="jmx-name" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="show-deploy-info" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="multi-instance" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="component-plugins" minOccurs="0" maxOccurs="1"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="component-plugin" type="componentPluginType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="configurationType"> + <xsd:sequence> + <xsd:element name="container-lifecycle-plugin" type="containerLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component-lifecycle-plugin" type="componentLifecyclePluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="component" type="componentType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="external-component-plugins" type="externalComponentPluginType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="import" type="importType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="remove-configuration" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="importType"> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="profiles" type="xsd:string"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +</xsd:schema> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_0.java =================================================================== --- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_0.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_0.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -18,7 +18,6 @@ */ package org.exoplatform.container.configuration; -import org.exoplatform.container.configuration.ConfigurationUnmarshaller; import org.exoplatform.test.BasicTestCase; import java.io.File; @@ -58,6 +57,6 @@ fail("Was not expecting such exception " + e.getMessage()); } } - assertEquals(17, count); + assertEquals(18, count); } } Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_1.java =================================================================== --- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_1.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_1.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -18,7 +18,6 @@ */ package org.exoplatform.container.configuration; -import org.exoplatform.container.configuration.ConfigurationUnmarshaller; import org.exoplatform.test.BasicTestCase; import java.io.File; @@ -58,6 +57,6 @@ fail("Was not expecting such exception " + e.getMessage()); } } - assertEquals(18, count); + assertEquals(19, count); } } \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_2.java =================================================================== --- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_2.java 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestXSD_1_2.java 2011-08-03 11:06:54 UTC (rev 4694) @@ -57,6 +57,6 @@ fail("Was not expecting such exception " + e.getMessage()); } } - assertEquals(19, count); + assertEquals(20, count); } } \ No newline at end of file Added: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-00.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-00.xml (rev 0) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-00.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,224 @@ +<?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. + +--> +<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.portal.config.DataStorage</key> + <type>org.exoplatform.portal.config.jcr.DataStorageImpl</type> + </component> + + <component> + <key>org.exoplatform.portal.application.UserGadgetStorage</key> + <type>org.exoplatform.portal.application.jcr.UserGadgetStorageImpl</type> + </component> + + <component> + <key>org.exoplatform.portal.layout.PortalLayoutService</key> + <type>org.exoplatform.portal.layout.jcr.PortalLayoutServiceImpl</type> + <init-params> + <value-param> + <name>template.location</name> + <description>Location of container templates</description> + <value>war:/conf/portal/template/containers</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + + <value-param> + <name>portal.creator.groups</name> + <description>groups with membership type have permission to manage portal</description> + <value>*:/platform/administrators,*:/organization/management/executive-board</value> + </value-param> + + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>access.control.workspace</name> + <description>groups with memberships that have the right to access the User Control Workspace</description> + <value>*:/platform/administrators,*:/organization/management/executive-board</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>classic</string></value> + </collection> + </field> + <field name="ownerType"><string>portal</string></field> + <field name="templateLocation"><string>war:/conf/portal</string></field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>platform/administrators</string></value> + <value><string>platform/users</string></value> + <value><string>platform/guests</string></value> + <value><string>organization/management/executive-board</string></value> + </collection> + </field> + <field name="ownerType"><string>group</string></field> + <field name="templateLocation"><string>war:/conf/portal</string></field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>marry</string></value> + <value><string>demo</string></value> + </collection> + </field> + <field name="ownerType"><string>user</string></field> + <field name="templateLocation"><string>war:/conf/portal</string></field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"><string>war:/conf/portal/template/pages</string></field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> + + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + + <component-plugin> + <name>user.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.UserPortalConfigListener</type> + </component-plugin> + + <component-plugin> + <name>group.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.GroupPortalConfigListener</type> + </component-plugin> + + <component-plugin> + <name>ecm.new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NewUserListener</type> + <description>description</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig"> + <field name="repository"><string>repository</string></field> + <field name="workspaces"> + <collection type="java.util.ArrayList"> + <value><string>collaboration</string></value> + </collection> + </field> + <field name="jcrPaths"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath"> + <field name="alias"><string>userApplicationData</string></field> + <field name="path"><string>ApplicationData</string></field> + <field name="nodeType"><string>nt:unstructured</string></field> + <field name="permissions"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission"> + <field name="identity"><string>*:/platform/administrators</string></field> + <field name="read"><string>true</string></field> + <field name="addNode"><string>true</string></field> + <field name="setProperty"><string>true</string></field> + <field name="remove"><string>true</string></field> + </object> + </value> + </collection> + </field> + <field name="mixinTypes"> + <collection type="java.util.ArrayList"> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + +</configuration> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-01.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-01.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-01.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.portal.config.DataStorage</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-02.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-02.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-02.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.application.gadget.GadgetRegistryService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-03.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-03.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-03.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-04.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-04.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-04.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-05.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-05.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-05.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-06.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-06.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-06.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-07.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-07.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-07.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-08.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-08.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-08.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.mail.MailService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-09.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-09.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-09.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-10.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-10.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-10.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-11.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-11.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-11.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.database.HibernateService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-12.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-12.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-12.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.portletcontainer.PortletContainerConf</type> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-13.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-13.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-13.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-14.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-14.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-14.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.security.SecurityService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-15.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-15.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-15.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.log.LogConfigurationInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-16.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-16.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-16.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-17.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-17.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_0/sample-configuration-17.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-01.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-01.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-01.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.portal.config.DataStorage</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-02.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-02.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-02.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.application.gadget.GadgetRegistryService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-03.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-03.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-03.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-04.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-04.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-04.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-05.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-05.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-05.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-06.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-06.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-06.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-07.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-07.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-07.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-08.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-08.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-08.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.mail.MailService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-09.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-09.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-09.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-10.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-10.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-10.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-11.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-11.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-11.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.database.HibernateService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-12.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-12.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-12.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <type>org.exoplatform.services.portletcontainer.PortletContainerConf</type> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-13.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-13.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-13.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-14.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-14.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-14.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.security.SecurityService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-15.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-15.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-15.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.log.LogConfigurationInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-16.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-16.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-16.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-18.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-18.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-18.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd http://www.exoplatform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_1.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Added: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-19.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-19.xml (rev 0) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-19.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,95 @@ +<?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. + +--> +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + </component> + + <component profiles="a"> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + </component> + + <component profiles="a,b"> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + </component> + + <component> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + <init-params> + <object-param> + <name>object</name> + <object type="object"></object> + </object-param> + <object-param profiles="a"> + <name>object</name> + <object type="object"></object> + </object-param> + <object-param profiles="a,b"> + <name>object</name> + <object type="object"></object> + </object-param> + <properties-param> + <name>properties</name> + </properties-param> + <properties-param profiles="a"> + <name>properties</name> + </properties-param> + <properties-param profiles="a,b"> + <name>properties</name> + </properties-param> + <value-param> + <name>value</name> + <value>value</value> + </value-param> + <value-param profiles="a"> + <name>value</name> + <value>value</value> + </value-param> + <value-param profiles="a,b"> + <name>value</name> + <value>value</value> + </value-param> + <values-param> + <name>values</name> + </values-param> + <values-param profiles="a"> + <name>values</name> + </values-param> + <values-param profiles="a,b"> + <name>values</name> + </values-param> + </init-params> + </component> + + <import>import_1</import> + <import profiles="a">import_1</import> + <import profiles="a,b">import_1</import> + +</configuration> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-01.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-01.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-01.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.portal.config.DataStorage</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-02.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-02.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-02.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.application.gadget.GadgetRegistryService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-03.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-03.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-03.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-04.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-04.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-04.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-05.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-05.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-05.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-06.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-06.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-06.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-07.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-07.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-07.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-08.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-08.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-08.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.mail.MailService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-09.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-09.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-09.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-10.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-10.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-10.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-11.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-11.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-11.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.database.HibernateService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-12.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-12.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-12.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <type>org.exoplatform.services.portletcontainer.PortletContainerConf</type> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-13.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-13.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-13.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-14.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-14.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-14.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.security.SecurityService</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-15.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-15.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-15.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.log.LogConfigurationInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-16.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-16.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-16.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-17.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-17.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-17.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-18.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-18.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-18.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -21,8 +21,8 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> Modified: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-19.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-19.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-19.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -7,8 +7,10 @@ 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_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> <container-lifecycle-plugin> <type>org.exoplatform.container.TestExoContainer$MyContainerLifecyclePlugin1</type> </container-lifecycle-plugin> Added: kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-20.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-20.xml (rev 0) +++ kernel/trunk/exo.kernel.container/src/test/resources/xsd_1_2/sample-configuration-20.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -0,0 +1,29 @@ +<?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. + --> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + <container-lifecycle-plugin> + <type>org.exoplatform.container.TestExoContainer$MyContainerLifecyclePlugin1</type> + </container-lifecycle-plugin> + <container-lifecycle-plugin> + <name>MyContainerLifecyclePlugin2</name> + <type>org.exoplatform.container.TestExoContainer$MyContainerLifecyclePlugin2</type> + <description>The description of the plugin</description> + <priority>10</priority> + <init-params> + <value-param> + <name>param</name> + <description>a test parameter</description> + <value>value</value> + </value-param> + </init-params> + </container-lifecycle-plugin> + +</configuration> \ No newline at end of file Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/resources/conf/configuration.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/resources/conf/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/resources/conf/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <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"> + xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <key>InjectingBean</key> Modified: ws/trunk/exo.ws.rest.core/src/main/resources/conf/portal/configuration.xml =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ ws/trunk/exo.ws.rest.core/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <component> <type>org.exoplatform.services.rest.impl.ApplicationRegistry</type> </component> Modified: ws/trunk/exo.ws.rest.ext/src/main/resources/conf/portal/configuration.xml =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/resources/conf/portal/configuration.xml 2011-08-03 10:23:08 UTC (rev 4693) +++ ws/trunk/exo.ws.rest.ext/src/main/resources/conf/portal/configuration.xml 2011-08-03 11:06:54 UTC (rev 4694) @@ -19,8 +19,8 @@ 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"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"> <external-component-plugins> <target-component>org.exoplatform.services.rest.impl.RequestHandlerImpl</target-component> <component-plugin>