Author: chris.laprun(a)jboss.com Date: 2010-10-05 10:08:41 -0400 (Tue, 05 Oct 2010) New Revision: 4510 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java Log: - GTNWSRP-91: Only parse markup for timeout value if we don't run in EPP (since the associated bug has been fixed in EAP 5.1) Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2010-10-05 13:35:38 UTC (rev 4509) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2010-10-05 14:08:41 UTC (rev 4510) @@ -43,13 +43,8 @@ */ public final class WSRPConstants { - // JMX ************************************************************************************************************** - /** JMX object name for the Portal web app registry */ - @Deprecated - public static final String WEB_APP_REGISTRY_OBJECT_NAME = "portal:service=WebAppRegistry"; - /** JMX object name for the WSRP Producer */ - @Deprecated - public static final String WSRP_PRODUCER_OBJECT_NAME = "portletcontainer.wsrp:service=WSRPProducer"; + // public static final boolean RUNS_IN_EPP = RuntimeContext.getInstance().isRunningIn(RuntimeContext.RunningEnvironment.epp); // todo: GTNWSRP-90: Use RuntimeContext from common when possible + public static final boolean RUNS_IN_EPP; /** * The version of the WSRP service. This should match the maven version of the module. Right now, checked via the @@ -57,6 +52,8 @@ */ public static final String WSRP_SERVICE_VERSION; + private static final String GATEIN_RUNTIME_CONTEXT_PROP_NAME = "gatein.runtime.context"; // todo: remove when GTNWSRP-90 is fixed + static { Properties props = new Properties(); @@ -69,6 +66,8 @@ throw new RuntimeException("Could not load wsrp.properties."); } WSRP_SERVICE_VERSION = props.getProperty("wsrp.service.version"); + + RUNS_IN_EPP = "epp".equals(System.getProperty(GATEIN_RUNTIME_CONTEXT_PROP_NAME)); // todo: remove when GTNWSRP-90 is fixed } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java 2010-10-05 13:35:38 UTC (rev 4509) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java 2010-10-05 14:08:41 UTC (rev 4510) @@ -129,7 +129,10 @@ // fix-me: how to deal with fragment header? => interceptor? // todo: remove, this is a work-around for GTNWSRP-12 - markup = markup.replaceFirst("%3ftimeout%3d.*%2f", "%2f"); + if (!WSRPConstants.RUNS_IN_EPP) + { + markup = markup.replaceFirst("%3ftimeout%3d.*%2f", "%2f"); + } markup = TextTools.replaceBoundedString( markup,