October 2011 - gatein-commits - Jboss List Archives

gatein SVN: r7824 - in components/wsrp/trunk/producer/src/main/java/org/gatein/registration: impl and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-10-21 07:37:12 -0400 (Fri, 21 Oct 2011) New Revision: 7824 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/DuplicateRegistrationException.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java Log: - GTNWSRP-251: now return the existing Registration if a consumer attempts to register with the same set of properties (more forgiving). Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/DuplicateRegistrationException.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/DuplicateRegistrationException.java 2011-10-21 11:35:13 UTC (rev 7823) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/DuplicateRegistrationException.java 2011-10-21 11:37:12 UTC (rev 7824) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -29,22 +29,39 @@ */ public class DuplicateRegistrationException extends RegistrationException { + private final Registration registration; + public DuplicateRegistrationException() { + registration = null; } public DuplicateRegistrationException(String message) { super(message); + registration = null; } public DuplicateRegistrationException(String message, Throwable cause) { super(message, cause); + registration = null; } public DuplicateRegistrationException(Throwable cause) { super(cause); + registration = null; } + + public DuplicateRegistrationException(String message, Throwable cause, Registration registration) + { + super(message, cause); + this.registration = registration; + } + + public Registration getExistingRegistration() + { + return registration; + } } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-10-21 11:35:13 UTC (rev 7823) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-10-21 11:37:12 UTC (rev 7824) @@ -23,6 +23,7 @@ package org.gatein.registration; +import org.gatein.registration.spi.ConsumerSPI; import org.gatein.registration.spi.RegistrationSPI; import javax.xml.namespace.QName; @@ -94,6 +95,8 @@ RegistrationSPI addRegistrationFor(String consumerId, Map<QName, Object> registrationProperties) throws RegistrationException; + RegistrationSPI addRegistrationFor(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException; + Collection<? extends ConsumerGroup> getConsumerGroups() throws RegistrationException; Registration getRegistration(String registrationId) throws RegistrationException; Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-21 11:35:13 UTC (rev 7823) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-21 11:37:12 UTC (rev 7824) @@ -148,6 +148,14 @@ + "' to add a Registration to..."); } + return addRegistrationFor(consumer, registrationProperties); + } + + public RegistrationSPI addRegistrationFor(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException + { + ParameterValidation.throwIllegalArgExceptionIfNull(consumer, "Consumer"); + ParameterValidation.throwIllegalArgExceptionIfNull(registrationProperties, "Registration properties"); + RegistrationSPI registration = internalCreateRegistration(consumer, registrationProperties); consumer.addRegistration(registration); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-21 11:35:13 UTC (rev 7823) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-21 11:37:12 UTC (rev 7824) @@ -26,6 +26,7 @@ import org.gatein.common.util.ParameterValidation; import org.gatein.registration.Consumer; import org.gatein.registration.ConsumerGroup; +import org.gatein.registration.DuplicateRegistrationException; import org.gatein.registration.InvalidConsumerDataException; import org.gatein.registration.NoSuchRegistrationException; import org.gatein.registration.Registration; @@ -35,6 +36,7 @@ import org.gatein.registration.RegistrationPersistenceManager; import org.gatein.registration.RegistrationPolicy; import org.gatein.registration.RegistrationStatus; +import org.gatein.registration.spi.ConsumerSPI; import org.gatein.registration.spi.RegistrationSPI; import org.gatein.wsrp.registration.PropertyDescription; import org.slf4j.Logger; @@ -115,12 +117,31 @@ String identity = policy.getConsumerIdFrom(consumerName, registrationProperties); // validate the registration information - policy.validateRegistrationDataFor(registrationProperties, identity, expectations, this); + try + { + policy.validateRegistrationDataFor(registrationProperties, identity, expectations, this); + } + catch (DuplicateRegistrationException e) + { + log.info("Consumer '" + consumerName + "' was already registered with the same set of registration properties."); + // check if the policy set the existing registration to be returned + final Registration existingRegistration = e.getExistingRegistration(); + if (existingRegistration != null) + { + return existingRegistration; + } + else + { + // if we didn't get a registration to return, just throw the exception + throw e; + } + } + Consumer consumer = getOrCreateConsumer(identity, createConsumerIfNeeded, consumerName); // create the actual registration - RegistrationSPI registration = persistenceManager.addRegistrationFor(identity, registrationProperties); + RegistrationSPI registration = persistenceManager.addRegistrationFor((ConsumerSPI)consumer, registrationProperties); // let the policy decide what the handle should be String handle = policy.createRegistrationHandleFor(registration.getPersistentKey()); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2011-10-21 11:35:13 UTC (rev 7823) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2011-10-21 11:37:12 UTC (rev 7824) @@ -170,7 +170,7 @@ if (registration.hasEqualProperties(registrationProperties)) { throw new DuplicateRegistrationException("Consumer named '" + consumer.getName() - + "' has already been registered with the same set of registration properties. Registration rejected!"); + + "' has already been registered with the same set of registration properties. Registration rejected!", null, registration); } } }

13 years, 2 months

1
0
0 / 0

gatein SVN: r7823 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-10-21 07:35:13 -0400 (Fri, 21 Oct 2011) New Revision: 7823 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/WSRPConsumer.java Log: - Removed now duplicated method from PortletInvoker. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/WSRPConsumer.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/WSRPConsumer.java 2011-10-21 11:34:26 UTC (rev 7822) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/WSRPConsumer.java 2011-10-21 11:35:13 UTC (rev 7823) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -109,12 +109,6 @@ * @return * @since 2.6 */ - boolean isActive(); - - /** - * @return - * @since 2.6 - */ boolean isRefreshNeeded(); /**

13 years, 2 months

1
0
0 / 0

gatein SVN: r7822 - components/wsrp/trunk.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-10-21 07:34:26 -0400 (Fri, 21 Oct 2011) New Revision: 7822 Modified: components/wsrp/trunk/pom.xml Log: - Updated gatein-dep to 1.1.0-GA, WCI to 2.1.0-GA and PC to 2.3.0-Beta08. - Added documentation to pom. Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-10-21 11:27:14 UTC (rev 7821) +++ components/wsrp/trunk/pom.xml 2011-10-21 11:34:26 UTC (rev 7822) @@ -27,6 +27,13 @@ <modelVersion>4.0.0</modelVersion> <name>GateIn WSRP</name> + <description>WSRP v1 and v2 implementation for GateIn.</description> + <url>http://www.jboss.org/gatein/</url> + <inceptionYear>2006</inceptionYear> + <issueManagement> + <system>jira</system> + <url>https://issues.jboss.org/browse/GTNWSRP</url> + </issueManagement> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -47,9 +54,9 @@ </scm> <properties> - <org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version> + <org.gatein.pc.version>2.3.0-Beta08</org.gatein.pc.version> <org.gatein.common.version>2.0.4-GA</org.gatein.common.version> - <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version> + <org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version> <jsf.version>1.2_12</jsf.version> <javax.xml.ws.version>2.1</javax.xml.ws.version> @@ -59,13 +66,45 @@ <org.mockito.version>1.8.5</org.mockito.version> </properties> + <organization> + <name>GateIn</name> + <url>http://www.gatein.org</url> + </organization> + + <licenses> + <license> + <name>LGPL, version 2.1</name> + <url>http://www.opensource.org/licenses/lgpl-license.php</url> + </license> + </licenses> + + <developers> + <developer> + <id>chris.laprun</id> + <name>Christophe Laprun</name> + <email>claprun(a)redhat.com</email> + <roles> + <role>Lead</role> + </roles> + </developer> + <developer> + <id>matt.wringe</id> + <name>Matt Wringe</name> + <email>mwringe(a)redhat.com</email> + <roles> + <role>Developer</role> + </roles> + </developer> + </developers> + + <dependencyManagement> <dependencies>  <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta06</version> + <version>1.1.0-GA</version> <type>pom</type> <scope>import</scope> </dependency>

13 years, 2 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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-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-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-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-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>  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><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.idm.PicketLinkIDMService</key> 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>  <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>  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>  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>  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>  <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>  <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>  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>  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>  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>  <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">  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">  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">  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">  <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">    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">  <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>  <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>  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>

13 years, 2 months

1
0
0 / 0

gatein SVN: r7820 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer/spi and 2 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-10-21 07:23:26 -0400 (Fri, 21 Oct 2011) New Revision: 7820 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerCache.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java Log: - InMemoryConsumerCache should now properly check if a ProducerInfo needs to be updated from persistence before being returned. - Added markAsModifiedNow method on ConsumerCache. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-10-21 11:00:18 UTC (rev 7819) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-10-21 11:23:26 UTC (rev 7820) @@ -252,6 +252,11 @@ startOrStopConsumer(consumer, false, true); } + public long getPersistedLastModifiedForProducerInfoWith(String id) + { + return loadProducerInfo(id).getLastModified(); + } + public synchronized String updateProducerInfo(ProducerInfo producerInfo) { ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo"); @@ -275,6 +280,8 @@ consumers.putConsumer(producerInfo.getId(), consumer); } + consumers.markAsModifiedNow(); + return oldId; } @@ -519,10 +526,15 @@ ProducerInfo info = infosFromStorage.next(); consumers.put(info.getId(), createAndActivateIfNeeded(info)); } - lastModified = System.currentTimeMillis(); + markAsModifiedNow(); setInvalidated(false); } + public void markAsModifiedNow() + { + lastModified = System.currentTimeMillis(); + } + public Collection<WSRPConsumer> getConsumers() { refreshIfNeeded(); @@ -534,8 +546,8 @@ // try cache first WSRPConsumer consumer = consumers.get(id); - // if we didn't find the consumer in cache, try to load it from JCR - if (consumer == null) + // if consumer is not in cache or has been modified after the cache was last updated, load it from JCR + if (consumer == null || lastModified < getPersistedLastModifiedForProducerInfoWith(id)) { ProducerInfo info = loadProducerInfo(id); if (info != null) @@ -548,21 +560,21 @@ public WSRPConsumer removeConsumer(String id) { - lastModified = System.currentTimeMillis(); + markAsModifiedNow(); return consumers.remove(id); } public void putConsumer(String id, WSRPConsumer consumer) { consumers.put(id, consumer); - lastModified = System.currentTimeMillis(); + markAsModifiedNow(); } public void clear() { consumers.clear(); invalidated = true; - lastModified = System.currentTimeMillis(); + markAsModifiedNow(); } public boolean isInvalidated() @@ -600,7 +612,7 @@ } } - lastModified = System.currentTimeMillis(); + markAsModifiedNow(); setInvalidated(false); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerCache.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerCache.java 2011-10-21 11:00:18 UTC (rev 7819) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerCache.java 2011-10-21 11:23:26 UTC (rev 7820) @@ -47,4 +47,6 @@ long getLastModified(); void initFromStorage(); + + void markAsModifiedNow(); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java 2011-10-21 11:00:18 UTC (rev 7819) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java 2011-10-21 11:23:26 UTC (rev 7820) @@ -74,4 +74,6 @@ void registerWithFederatingPortletInvoker(WSRPConsumer consumer); void deregisterWithFederatingPortletInvoker(WSRPConsumer consumer); + + long getPersistedLastModifiedForProducerInfoWith(String id); } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-10-21 11:00:18 UTC (rev 7819) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-10-21 11:23:26 UTC (rev 7820) @@ -234,4 +234,9 @@ { consumers.remove(consumer.getProducerId()); } + + public long getPersistedLastModifiedForProducerInfoWith(String id) + { + return System.currentTimeMillis(); + } } Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-10-21 11:00:18 UTC (rev 7819) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-10-21 11:23:26 UTC (rev 7820) @@ -236,7 +236,28 @@ { persister.closeSession(false); } + } + @Override + public long getPersistedLastModifiedForProducerInfoWith(String id) + { + try + { + ChromatticSession session = persister.getSession(); + ProducerInfoMapping pim = getProducerInfoMapping(id, session); + if (pim != null) + { + return pim.getLastModified(); + } + else + { + throw new IllegalArgumentException("There is no ProducerInfo with id '" + id + "'"); + } + } + finally + { + persister.closeSession(false); + } } private ProducerInfoMapping getProducerInfoMapping(String id, ChromatticSession session)

13 years, 2 months

1
0
0 / 0

gatein SVN: r7819 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-10-21 07:00:18 -0400 (Fri, 21 Oct 2011) New Revision: 7819 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java Log: GTNPORTAL-2196 Set UserPortalConfigService templates and portals definition easily ereasable Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-10-21 09:06:06 UTC (rev 7818) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-10-21 11:00:18 UTC (rev 7819) @@ -28,15 +28,9 @@ import org.exoplatform.container.xml.ValueParam; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.application.PortletPreferences.PortletPreferencesSet; -import org.exoplatform.portal.config.model.NavigationFragment; -import org.exoplatform.portal.mop.importer.ImportMode; -import org.exoplatform.portal.mop.importer.Imported; -import org.exoplatform.portal.mop.importer.Imported.Status; -import org.exoplatform.portal.mop.importer.NavigationImporter; -import org.exoplatform.portal.mop.importer.PageImporter; -import org.exoplatform.portal.mop.importer.PortalConfigImporter; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.ModelUnmarshaller; +import org.exoplatform.portal.config.model.NavigationFragment; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.Page.PageSet; import org.exoplatform.portal.config.model.PageNavigation; @@ -44,13 +38,19 @@ import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.UnmarshalledObject; import org.exoplatform.portal.mop.description.DescriptionService; +import org.exoplatform.portal.mop.importer.ImportMode; +import org.exoplatform.portal.mop.importer.Imported; +import org.exoplatform.portal.mop.importer.Imported.Status; +import org.exoplatform.portal.mop.importer.NavigationImporter; +import org.exoplatform.portal.mop.importer.PageImporter; +import org.exoplatform.portal.mop.importer.PortalConfigImporter; import org.exoplatform.portal.mop.navigation.NavigationService; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; import org.gatein.mop.api.workspace.Workspace; -import org.jibx.runtime.*; +import org.jibx.runtime.JiBXException; import java.io.InputStream; import java.util.ArrayList; @@ -449,6 +449,95 @@ overrideExistingData = overrideExistingData || other.overrideExistingData; } + /** + * This is used to delete an already loaded NewPortalConfigListener(s) + * + * @param other + */ + public void deleteListenerElements(NewPortalConfigListener other) + { + if (configs == null) + { + log.warn("No Portal configurations was loaded, nothing to delete !"); + } + else if (other.configs != null && !other.configs.isEmpty()) + { + List<NewPortalConfig> result = new ArrayList<NewPortalConfig>(configs); + for (NewPortalConfig newPortalConfigToDelete : other.configs) + { + int i = 0; + while (i < result.size()) + { + NewPortalConfig newPortalConfig = result.get(i); + if (newPortalConfigToDelete.getOwnerType().equals(newPortalConfig.getOwnerType())) + { + for (String owner : newPortalConfigToDelete.getPredefinedOwner()) + { + newPortalConfig.getPredefinedOwner().remove(owner); + } + } + // if the configuration has no owner definitions, then delete it + if (newPortalConfig.getPredefinedOwner().size() == 0) + { + result.remove(newPortalConfig); + } + else + { + i++; + } + } + } + this.configs = Collections.unmodifiableList(result); + } + + if (templateConfigs == null) + { + log.warn("No Portal templates configurations was loaded, nothing to delete !"); + } + else if (other.templateConfigs != null && !other.templateConfigs.isEmpty()) + { + List<SiteConfigTemplates> result = new ArrayList<SiteConfigTemplates>(templateConfigs); + deleteSiteConfigTemplates(other, result, PortalConfig.PORTAL_TYPE); + deleteSiteConfigTemplates(other, result, PortalConfig.GROUP_TYPE); + deleteSiteConfigTemplates(other, result, PortalConfig.USER_TYPE); + this.templateConfigs = Collections.unmodifiableList(result); + } + } + + private void deleteSiteConfigTemplates(NewPortalConfigListener other, List<SiteConfigTemplates> result, String templateType) + { + for (SiteConfigTemplates siteConfigTemplatesToDelete : other.templateConfigs) + { + Set<String> portalTemplatesToDelete = siteConfigTemplatesToDelete.getTemplates(templateType); + if (portalTemplatesToDelete != null && portalTemplatesToDelete.size() > 0) + { + int i = 0; + while (i < result.size()) + { + SiteConfigTemplates siteConfigTemplates = result.get(i); + Set<String> portalTemplates = siteConfigTemplates.getTemplates(templateType); + if (portalTemplatesToDelete != null && portalTemplatesToDelete.size() > 0) + { + portalTemplates.removeAll(portalTemplatesToDelete); + } + if ((siteConfigTemplates.getTemplates(PortalConfig.PORTAL_TYPE) == null + || siteConfigTemplates.getTemplates(PortalConfig.PORTAL_TYPE).size() == 0) + && (siteConfigTemplates.getTemplates(PortalConfig.GROUP_TYPE) == null + || siteConfigTemplates.getTemplates(PortalConfig.GROUP_TYPE).size() == 0) + && (siteConfigTemplates.getTemplates(PortalConfig.USER_TYPE) == null + || siteConfigTemplates.getTemplates(PortalConfig.USER_TYPE).size() == 0)) + { + result.remove(siteConfigTemplates); + } + else + { + i++; + } + } + } + } + } + public void initPortalConfigDB(NewPortalConfig config) throws Exception { for (String owner : config.getPredefinedOwner()) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-10-21 09:06:06 UTC (rev 7818) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-10-21 11:00:18 UTC (rev 7819) @@ -45,7 +45,14 @@ import org.exoplatform.services.organization.OrganizationService; import org.picocontainer.Startable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; /** * Created by The eXo Platform SAS Apr 19, 2007 This service is used to load the PortalConfig, Page config and @@ -626,6 +633,20 @@ } } + public void deleteListenerElements(ComponentPlugin listener) + { + if (listener instanceof NewPortalConfigListener) + { + synchronized (this) + { + if (newPortalConfigListener_ != null) + { + newPortalConfigListener_.deleteListenerElements((NewPortalConfigListener) listener); + } + } + } + } + public void start() { try

13 years, 2 months

1
0
0 / 0

gatein SVN: r7818 - in epp/portal/branches/EPP_5_2_Branch: component/portal/src/main/java/org and 4 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-21 05:06:06 -0400 (Fri, 21 Oct 2011) New Revision: 7818 Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java Log: JBEPP-1260 Fix site layout file name for MOP export and import. Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780 /portal/trunk/src/main/java/org:7451 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780 /portal/trunk/src/main/java/org:7451 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java 2011-10-21 08:59:30 UTC (rev 7817) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java 2011-10-21 09:06:06 UTC (rev 7818) @@ -79,7 +79,7 @@ private void siteLayoutManagementRegistration(ManagedResource.Registration sites) { // This allows us to filter based on path template site-layout. - ManagedResource.Registration siteLayout = sites.registerSubResource("{site-layout: portal}", description("Management resource responsible for handling management operations for a site's layout.")); + ManagedResource.Registration siteLayout = sites.registerSubResource("{site-layout: portal|group|user}", description("Management resource responsible for handling management operations for a site's layout.")); siteLayout.registerOperationHandler(OperationNames.READ_RESOURCE, new SiteLayoutReadResource(), description("The site layout resource.")); siteLayout.registerOperationHandler(OperationNames.READ_CONFIG_AS_XML, new SiteLayoutReadConfigAsXml(), description("Reads site layout data for a specific site as configuration xml.")); siteLayout.registerOperationHandler(OperationNames.EXPORT_RESOURCE, new SiteLayoutExportResource(), description("Exports site layout configuration xml as a zip file.")); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java 2011-10-21 08:59:30 UTC (rev 7817) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java 2011-10-21 09:06:06 UTC (rev 7818) @@ -25,15 +25,14 @@ import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteKey; -import org.exoplatform.portal.pom.config.POMSession; -import org.exoplatform.portal.pom.config.tasks.PortalConfigTask; -import org.exoplatform.portal.pom.data.PortalData; -import org.exoplatform.portal.pom.data.PortalKey; +import org.exoplatform.portal.mop.SiteType; import org.gatein.management.api.binding.Marshaller; import org.gatein.management.api.operation.model.ExportTask; import java.io.IOException; import java.io.OutputStream; +import java.util.HashSet; +import java.util.Set; /** * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a> @@ -41,7 +40,15 @@ */ public class SiteLayoutExportTask extends AbstractExportTask implements ExportTask { - public static final String FILE = "portal.xml"; + public static final Set<String> FILES; + static + { + HashSet<String> tmp = new HashSet<String>(3); + tmp.add("portal.xml"); + tmp.add("group.xml"); + tmp.add("user.xml"); + FILES = tmp; + } private final DataStorage dataStorage; private final Marshaller<PortalConfig> marshaller; @@ -56,7 +63,22 @@ @Override protected String getXmlFileName() { - return FILE; + if (siteKey.getType() == SiteType.PORTAL) + { + return "portal.xml"; + } + else if (siteKey.getType() == SiteType.GROUP) + { + return "group.xml"; + } + else if (siteKey.getType() == SiteType.USER) + { + return "user.xml"; + } + else + { + throw new RuntimeException("Unknown site type " + siteKey.getType()); + } } @Override Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-10-21 08:59:30 UTC (rev 7817) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-10-21 09:06:06 UTC (rev 7818) @@ -136,7 +136,7 @@ importMap.put(siteKey, mopImport); } - if (file.equals(SiteLayoutExportTask.FILE)) + if (SiteLayoutExportTask.FILES.contains(file)) { // Unmarshal site layout data Marshaller<PortalConfig> marshaller = operationContext.getBindingProvider().getMarshaller(PortalConfig.class, ContentType.XML); @@ -314,7 +314,7 @@ private static String[] parseEntry(ZipEntry entry) throws IOException { String name = entry.getName(); - if (name.endsWith(SiteLayoutExportTask.FILE) || name.endsWith(PageExportTask.FILE) || name.endsWith(NavigationExportTask.FILE)) + if (isSiteLayoutEntry(name) || name.endsWith(PageExportTask.FILE) || name.endsWith(NavigationExportTask.FILE)) { String[] parts = new String[3]; parts[0] = name.substring(0, name.indexOf("/")); @@ -328,6 +328,16 @@ } } + private static boolean isSiteLayoutEntry(String zipEntryName) + { + for (String file : SiteLayoutExportTask.FILES) + { + if (zipEntryName.endsWith(file)) return true; + } + + return false; + } + // Bug in SUN's JDK XMLStreamReader implementation closes the underlying stream when // it finishes reading an XML document. This is no good when we are using a ZipInputStream. // See http://bugs.sun.com/view_bug.do?bug_id=6539065 for more information. Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java 2011-10-21 08:59:30 UTC (rev 7817) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java 2011-10-21 09:06:06 UTC (rev 7818) @@ -64,7 +64,22 @@ if (pageOrNav) { - children.add("portal"); + if (site.getObjectType() == ObjectType.PORTAL_SITE) + { + children.add("portal"); + } + else if (site.getObjectType() == ObjectType.GROUP_SITE) + { + children.add("group"); + } + else if (site.getObjectType() == ObjectType.USER_SITE) + { + children.add("user"); + } + else + { + throw new OperationException(operationContext.getOperationName(), "Unknown site type " + site.getObjectType()); + } } else {

13 years, 2 months

1
0
0 / 0

gatein SVN: r7817 - in epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools: gatein-pc and 1 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-21 04:59:30 -0400 (Fri, 21 Oct 2011) New Revision: 7817 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml Log: JBEPP-1091 Build settings Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2011-10-21 08:57:51 UTC (rev 7816) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2011-10-21 08:59:30 UTC (rev 7817) @@ -52,11 +52,11 @@ <property name="mead.profiles">${mead.build.profiles}</property> <echo></echo> - <echo>brew mead-build ${mead.target} 'svn+${mead.svn.base}/${mead.svn.repo}?${mead.svn.path}#${svn.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch}</echo> + <echo>brew mead-build ${mead.target} 'svn+${mead.svn.base}/${mead.svn.repo}?${mead.svn.path}#${svn.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch}</echo> <echo></echo> <echo file="${brew.commands.file}" append="true"> # Name: ${project.name} -brew mead-build ${mead.target} 'svn+${mead.svn.base}/${mead.svn.repo}?${mead.svn.path}#${svn.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch} +brew mead-build ${mead.target} 'svn+${mead.svn.base}/${mead.svn.repo}?${mead.svn.path}#${svn.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch} </echo> @@ -161,7 +161,7 @@ <arg value="maven-build"/> <arg value="${mead.target}"/> <arg value="svn+${mead.svn.base}/${mead.svn.repo}?${mead.svn.path}#${svn.revision}" /> - <arg line="${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch}" /> + <arg line="${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch} ${mead.parameters}" /> </exec>   Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-21 08:57:51 UTC (rev 7816) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-21 08:59:30 UTC (rev 7817) @@ -22,9 +22,11 @@ <mead.svn.repo>${svn.gatein.repo}</mead.svn.repo> <mead.svn.path>${gatein-pc.svnpath}</mead.svn.path> - <mead.build.profiles></mead.build.profiles> - <mead.build.properties>tests=local container.unpack.dir=/maven/build/test-containers JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA tests.failOnError=true</mead.build.properties> - <mead.patch.path>patches/org.gatein.pc-pc-parent/tags/2.2.0-CR02</mead.patch.path> + <mead.build.profiles>jboss51</mead.build.profiles> + <mead.build.properties>container.unpack.dir=/maven/build/test-containers JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA tests.failOnError=true gatein.dev=true</mead.build.properties> + <mead.patch.path>patches/org.gatein.pc-pc-parent/tags/2.3.0-Beta06</mead.patch.path> +  + <mead.parameters>-E JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA</mead.parameters> </properties> </project> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-21 08:57:51 UTC (rev 7816) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-21 08:59:30 UTC (rev 7817) @@ -20,7 +20,7 @@ <mead.svn.repo>${svn.jboss-picketlink-idm.repo}</mead.svn.repo> <mead.svn.path>${jboss-picketlink-idm.svnpath}</mead.svn.path> - <mead.build.profiles>distro</mead.build.profiles> + <mead.build.profiles>dev</mead.build.profiles> <mead.build.properties></mead.build.properties> <mead.patch.path></mead.patch.path> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-21 08:57:51 UTC (rev 7816) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-21 08:59:30 UTC (rev 7817) @@ -61,6 +61,7 @@ <brew.commands.file>../target/brew.commands</brew.commands.file> <mead.target>jboss-epp-5-nosign</mead.target> + <mead.parameters> </mead.parameters> <svn.patch.base>http://svn.devel.redhat.com/repos/mead</svn.patch.base> <svn.base>http://anonsvn.jboss.org/repos</svn.base>

13 years, 2 months

1
0
0 / 0

gatein SVN: r7816 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-21 04:57:51 -0400 (Fri, 21 Oct 2011) New Revision: 7816 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1307 Upgrade eXo JCR to 1.14.2 (and upgrade its dependencies Kernel, Core, WS...) Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-21 07:12:32 UTC (rev 7815) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-21 08:57:51 UTC (rev 7816) @@ -38,11 +38,11 @@ <properties> <org.exoplatform.parent.version>9</org.exoplatform.parent.version> - <org.exoplatform.kernel.version>2.3.1-GA</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.3.2-GA</org.exoplatform.kernel.version> <org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version>  - <org.exoplatform.core.version>2.4.1-GA</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.1-GA</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.1-GA</org.exoplatform.jcr.version> + <org.exoplatform.core.version>2.4.2-GA</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.2-GA</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.2-GA</org.exoplatform.jcr.version> <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>2.0.2-Beta03</org.shindig.version>

13 years, 2 months

1
0
0 / 0

gatein SVN: r7815 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-21 03:12:32 -0400 (Fri, 21 Oct 2011) New Revision: 7815 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1304 Update gatein-management to 1.0.0-Beta05 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-21 05:56:49 UTC (rev 7814) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-21 07:12:32 UTC (rev 7815) @@ -55,7 +55,7 @@ <org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta07-EPP520</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta07</org.gatein.mop.version> - <org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version> + <org.gatein.mgmt.version>1.0.0-Beta05</org.gatein.mgmt.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version>

13 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits October 2011