[gatein-commits] gatein SVN: r7821 - in portal/trunk: component/common/src/main/java/conf and 91 other directories.

Author: ndkhoiits Date: 2011-10-21 07:27:14 -0400 (Fri, 21 Oct 2011) New Revision: 7821 Modified: portal/trunk/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml portal/trunk/component/common/src/main/java/conf/configuration.xml portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml portal/trunk/component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganization-configuration.xml portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml portal/trunk/component/management/src/main/resources/conf/portal/configuration.xml portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml portal/trunk/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml portal/trunk/component/portal/src/test/resources/jibx/simple-navigation.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/TestImport1-configuration.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/platform/administrators/group.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/template/group/group.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/user/root/pages.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/user/root/pages.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/navigation/configuration.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/configuration.xml portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/platform/administrators/group.xml portal/trunk/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml portal/trunk/docs/reference-guide/en-US/modules/Advanced/Foundations.xml portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/jcr-configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web/web-inf-extension-configuration.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common/common-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/jcr-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml portal/trunk/gadgets/gwtGadgets/src/main/webapp/WEB-INF/gadget.xml portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/portlet-container-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/remindpwd-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/component-plugins-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/webui/core/src/test/resources/conf/portal/test-configuration.xml portal/trunk/webui/portal/src/test/resources/conf/portal/test-configuration.xml portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml Log: GTNPORTAL-2202 Change the target xsd on xml file Modified: portal/trunk/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml =================================================================== --- portal/trunk/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <key>org.exoplatform.application.registry.ApplicationRegistryService</key> Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.container.PropertyConfigurator</key> Modified: portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <key>org.exoplatform.commons.chromattic.ChromatticManager</key> <type>org.exoplatform.commons.chromattic.ChromatticManager</type> Modified: portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <key>org.exoplatform.commons.scope.ScopeManager</key> <type>org.exoplatform.commons.scope.ScopeManager</type> Modified: portal/trunk/component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml =================================================================== --- portal/trunk/component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <component> Modified: portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganization-configuration.xml =================================================================== --- portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganization-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganization-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> Modified: portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml =================================================================== --- portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <key>org.exoplatform.services.log.LogConfigurationInitializer</key> Modified: portal/trunk/component/management/src/main/resources/conf/portal/configuration.xml =================================================================== --- portal/trunk/component/management/src/main/resources/conf/portal/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/management/src/main/resources/conf/portal/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.gatein.management.api.ManagementService</key> Modified: portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <key>org.exoplatform.commons.scope.ScopeManager</key> Modified: portal/trunk/component/portal/src/test/resources/jibx/simple-navigation.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/jibx/simple-navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/jibx/simple-navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>1</priority> <page-nodes> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/TestImport1-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/TestImport1-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/TestImport1-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -18,8 +18,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/platform/administrators/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/platform/administrators/group.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/platform/administrators/group.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>platform/administrators</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/template/group/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/template/group/group.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/conf/group/template/group/group.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/user/root/pages.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/user/root/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/user/root/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,7 +22,7 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> </page-set> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/user/root/pages.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/user/root/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/user/root/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ --> -<page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> +<page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>dashboard1</name> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/navigation/configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/navigation/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/navigation/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> Modified: portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/platform/administrators/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/platform/administrators/group.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/mop/user/group/platform/administrators/group.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>platform/administrators</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml =================================================================== --- portal/trunk/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.cache.CacheService</key> Modified: portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml =================================================================== --- portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> <type>org.exoplatform.container.definition.PortalContainerConfig</type> Modified: portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml =================================================================== --- portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <component> <type>org.exoplatform.component.test.CustomService</type> Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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.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"> <component> <key>org.exoplatform.services.idgenerator.IDGeneratorService</key> Modified: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> Modified: portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <external-component-plugins> <target-component>org.exoplatform.portal.resource.compressor.ResourceCompressor</target-component> Modified: portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.portal.resource.SkinService</key> Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -19,8 +19,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/docs/reference-guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- portal/trunk/docs/reference-guide/en-US/modules/Advanced/Foundations.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/docs/reference-guide/en-US/modules/Advanced/Foundations.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -76,9 +76,9 @@ <?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.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"> <component> <key>org.exoplatform.services.database.HibernateService</key> <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> @@ -106,9 +106,9 @@ <?xml version="1.0" encoding="UTF-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.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"> <external-component-plugins> <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> @@ -139,9 +139,9 @@ <para>An example configuration.xml that 'outsources' its content into several files:</para> <programlisting role="XML"><![CDATA[ <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.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"> <import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import> <import>war:/conf/sample-ext/portal/portal-configuration.xml</import> @@ -171,9 +171,9 @@ <?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.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"> <component> <key>org.exoplatform.services.database.HibernateService</key> @@ -401,9 +401,9 @@ <?xml version="1.0" encoding="UTF-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.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"> <external-component-plugins> <!-- The full qualified name of the PortalContainerConfig --> Modified: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -40,8 +40,8 @@ <area coords="22" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl" /> </areaspec> <programlisting>&#60;configuration xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34; - xsi:schemaLocation=&#34;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&#34; - xmlns=&#34;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&#34;&a...; + xsi:schemaLocation=&#34;http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd&#34; + xmlns=&#34;http://www.exoplaform.org/xml/ns/kernel_1_2.xsd&#34;&a...; &#60;component&#62; &#60;key&#62;org.exoplatform.services.organization.idm.PicketLinkIDMService&#60;/key&#62; Modified: portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml =================================================================== --- portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -258,8 +258,8 @@ <programlisting role="XML"><![CDATA[<portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>classic</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> @@ -393,8 +393,8 @@ <programlisting role="XML"><![CDATA[<page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>homepage</name> Modified: portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> +<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"> <external-component-plugins> <!-- The full qualified name of the PortalContainerConfig --> <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <import>war:/conf/sample-ext/common/common-configuration.xml</import> <import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import> <import>war:/conf/sample-ext/portal/portal-configuration.xml</import> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the ResourceBundleService --> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/jcr-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/jcr-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the RepositoryServiceConfiguration --> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -21,8 +21,8 @@ --> <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>samplePage</name> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the UserPortalConfigService --> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web/web-inf-extension-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web/web-inf-extension-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/web/web-inf-extension-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the ListenerService --> <target-component>org.exoplatform.services.listener.ListenerService</target-component> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the PortalContainerConfig --> <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <import>war:/conf/sample-portal/common/common-configuration.xml</import> <import>war:/conf/sample-portal/jcr/jcr-configuration.xml</import> <import>war:/conf/sample-portal/portal/portal-configuration.xml</import> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common/common-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common/common-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/common/common-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the ResourceBundleService --> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/jcr-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/jcr-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the RepositoryServiceConfiguration --> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>samplePage</name> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the UserPortalConfigService --> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <external-component-plugins> <!-- The full qualified name of the ListenerService --> <target-component>org.exoplatform.services.listener.ListenerService</target-component> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,7 +22,7 @@ <gadgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gadgets_1_0" xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> <gadget name="Todo"> Modified: portal/trunk/gadgets/gwtGadgets/src/main/webapp/WEB-INF/gadget.xml =================================================================== --- portal/trunk/gadgets/gwtGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/gadgets/gwtGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,11 +22,11 @@ <gadgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gadgets_1_0" xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> <gadget name="SiteExportImport"> <path>/exportimport/Application.gadget.xml</path> </gadget> -</gadgets> \ No newline at end of file +</gadgets> Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- GadgetPortlet skins --> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- OrganizationPortlet skins --> Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- BannerPortlet skins --> Modified: portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <!-- Skin sample --> <portlet-skin> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.web.security.security.CookieTokenService</key> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.jboss.cache.transaction.TransactionManagerLookup</key> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/portlet-container-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/portlet-container-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/portlet-container-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.portal.pc.ExoKernelIntegration</key> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/remindpwd-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/remindpwd-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/remindpwd-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.web.security.security.RemindPasswordTokenService</key> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -20,8 +20,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"> +<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"> <component> <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.security.SecurityService</key> <type>org.exoplatform.services.security.impl.SecurityServiceImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/resource-compressor-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/component-plugins-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/component-plugins-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/component-plugins-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <!-- ============================================================================= --> <!-- M A I L S E R V I C E --> <!-- ============================================================================= --> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.hibernate.OrganizationServiceImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.organization.OrganizationService</key> <type>org.exoplatform.services.organization.jdbc.OrganizationServiceImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <component> <key>org.exoplatform.services.ldap.LDAPService</key> <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,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.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"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> <component-plugin> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -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.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"> <component> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>5</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -16,8 +16,8 @@ --> <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>newStaff</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>2</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>9</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>sitemap</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>8</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>mylink-blog</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>*:@owner@</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <container template="system:/groovy/portal/webui/container/UIToolbarContainer.gtmpl"> <access-permissions>*:/platform/users</access-permissions> <container id="StarToolBarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>1</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>1</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> </container> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <portlet-application> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,7 +22,7 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> </page> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,7 +22,7 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> </page-set> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <!-- The default dashboard page --> <page> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/webui/core/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- portal/trunk/webui/core/src/test/resources/conf/portal/test-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/webui/core/src/test/resources/conf/portal/test-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,6 +22,6 @@ <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.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> Modified: portal/trunk/webui/portal/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- portal/trunk/webui/portal/src/test/resources/conf/portal/test-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/webui/portal/src/test/resources/conf/portal/test-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -22,6 +22,6 @@ <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.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> Modified: portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -23,8 +23,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.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"> <external-component-plugins> <!-- The full qualified name of the PortalContainerConfig --> <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> Modified: portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -24,8 +24,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.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"> <component> <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -24,8 +24,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.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"> <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import profiles="jboss">war:/conf/wsrp/jcr-configuration.xml</import> </configuration> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -23,8 +23,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.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"> <external-component-plugins> <!-- The full qualified name of the RepositoryServiceConfiguration --> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -24,8 +24,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <priority>2</priority> <page-nodes> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-10-21 11:23:26 UTC (rev 7820) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-10-21 11:27:14 UTC (rev 7821) @@ -24,8 +24,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.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"> <component> <key>org.gatein.integration.wsrp.WSRPServiceIntegration</key>