9:58 a.m.
Author: julien_viet
Date: 2011-09-27 10:58:41 -0400 (Tue, 27 Sep 2011)
New Revision: 7530
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
portal/trunk/pom.xml
Log:
GTNPORTAL-2131 : Update to portlet container 2.3.0-Beta06
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-27
14:02:18 UTC (rev 7529)
+++
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-27
14:58:41 UTC (rev 7530)
@@ -60,6 +60,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: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-09-27
14:02:18 UTC (rev 7529)
+++
portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-09-27
14:58:41 UTC (rev 7530)
@@ -63,16 +63,14 @@
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
# Global portlet.xml
+gatein.portlet.validation=true
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
-# Web
-gatein.web.compressor.js.level=simple
-
# Portal configuration
gatein.portal.idm.createuserportal=false
gatein.portal.idm.destroyuserportal=true
gatein.portal.controller.config=${gatein.conf.dir}/controller.xml
-# key files for gadget
-gatein.gadgets.securityTokenKeyFile=${gatein.conf.dir}/gadgets/key.txt
-gatein.gadgets.signingKeyFile=${gatein.conf.dir}/gadgets/oauthkey.pem
+# Key files for gadget
+gatein.gadgets.securitytokenkeyfile=${gatein.conf.dir}/gadgets/key.txt
+gatein.gadgets.signingkeyfile=${gatein.conf.dir}/gadgets/oauthkey.pem
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-09-27
14:02:18 UTC (rev 7529)
+++
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-09-27
14:58:41 UTC (rev 7530)
@@ -63,6 +63,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:
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
===================================================================
---
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-27
14:02:18 UTC (rev 7529)
+++
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-27
14:58:41 UTC (rev 7530)
@@ -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: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/pom.xml 2011-09-27 14:58:41 UTC (rev 7530)
@@ -45,7 +45,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.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-Beta06</org.gatein.mop.version>
@@ -57,7 +57,7 @@
<javax.servlet.version>2.5</javax.servlet.version>
<version.chromattic>1.1.0-beta7</version.chromattic>
<version.reflext>1.1.0-beta12</version.reflext>
- <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>