Author: chris.laprun(a)jboss.com Date: 2011-03-18 05:32:12 -0400 (Fri, 18 Mar 2011) New Revision: 6087 Modified: components/wsrp/branches/2.0.x/common/src/main/java/org/gatein/wsrp/WSRPConstants.java components/wsrp/branches/2.0.x/pom.xml Log: - GTNWSRP-90: Upgraded to Common 2.0.4-Beta02. Modified: components/wsrp/branches/2.0.x/common/src/main/java/org/gatein/wsrp/WSRPConstants.java =================================================================== --- components/wsrp/branches/2.0.x/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-03-18 09:17:00 UTC (rev 6086) +++ components/wsrp/branches/2.0.x/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-03-18 09:32:12 UTC (rev 6087) @@ -23,6 +23,7 @@ package org.gatein.wsrp; +import org.gatein.common.RuntimeContext; import org.gatein.pc.api.spi.PortalContext; import javax.xml.namespace.QName; @@ -43,8 +44,7 @@ */ public final class WSRPConstants { - // 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; + public static final boolean RUNS_IN_EPP = RuntimeContext.getInstance().isRunningIn(RuntimeContext.RunningEnvironment.epp); /** * The version of the WSRP service. This should match the maven version of the module. Right now, checked via the @@ -52,8 +52,6 @@ */ 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(); @@ -66,8 +64,6 @@ 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/branches/2.0.x/pom.xml =================================================================== --- components/wsrp/branches/2.0.x/pom.xml 2011-03-18 09:17:00 UTC (rev 6086) +++ components/wsrp/branches/2.0.x/pom.xml 2011-03-18 09:32:12 UTC (rev 6087) @@ -48,7 +48,7 @@ <properties> <version.gatein.pc>2.2.0-GA</version.gatein.pc> - <version.gatein.common>2.0.3-GA</version.gatein.common> + <version.gatein.common>2.0.4-Beta02</version.gatein.common> <version.gatein.wci>2.0.2-GA</version.gatein.wci> <version.jsf>1.2_12</version.jsf>