Author: chris.laprun(a)jboss.com Date: 2011-09-28 05:58:15 -0400 (Wed, 28 Sep 2011) New Revision: 7545 Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java epp/portal/branches/EPP_5_2_Branch/pom.xml Log: - Upgraded to PC 2.3.0-Beta06. Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-28 09:36:06 UTC (rev 7544) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-28 09:58:15 UTC (rev 7545) @@ -52,6 +52,7 @@ gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory # Global portlet.xml +gatein.portlet.validation=true gatein.portlet.config=${gatein.conf.dir}/portlet.xml # Portal configuration Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-28 09:36:06 UTC (rev 7544) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-28 09:58:15 UTC (rev 7545) @@ -19,9 +19,12 @@ package org.exoplatform.portal.pc; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.services.resources.ResourceBundleService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.bridge.BridgeInterceptor; import org.gatein.pc.federation.FederatingPortletInvoker; @@ -54,6 +57,7 @@ public class ExoKernelIntegration implements Startable { + /** . */ protected PortletApplicationDeployer portletApplicationRegistry; /** Exo Context */ @@ -62,6 +66,9 @@ /** DO NOT REMOVE ME, OTHERWISE YOU'LL BREAK THINGS. */ private final ResourceBundleService resourceBundleService; + /** . */ + private Logger log = LoggerFactory.getLogger(ExoKernelIntegration.class); + /** * We enforce the dependency with the ResourceBundleService since it must be stared before the * <code>portletApplicationRegistry</code> @@ -84,6 +91,12 @@ portletApplicationRegistry = new ExoPortletApplicationDeployer(); portletApplicationRegistry.setContainerPortletInvoker(containerPortletInvoker); + // + String validation = PropertyManager.getProperty("gatein.portlet.validation"); + boolean validated = validation == null || "true".equals(validation.trim().toLowerCase()); + log.debug("portlet xml validation is " + (validated ? "enabled" : " disabled")); + portletApplicationRegistry.setSchemaValidated(validated); + //Container Stack ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher(); Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-28 09:36:06 UTC (rev 7544) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-28 09:58:15 UTC (rev 7545) @@ -51,7 +51,7 @@ <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> <org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version> <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version> - <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version> + <org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version> <org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta05</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> @@ -63,7 +63,7 @@ <javax.servlet.version>2.5</javax.servlet.version> <version.chromattic>1.1.0-beta6</version.chromattic> <version.reflect>1.1.0-beta12</version.reflect> - <org.staxnav.version>0.9.4</org.staxnav.version> + <org.staxnav.version>0.9.6</org.staxnav.version> <jcip.version>1.0</jcip.version> <commons-dbcp.version>1.2.2</commons-dbcp.version>