[gatein-commits] gatein SVN: r6794 - in epp/portal/branches/EPP_5_2_Branch: distribution/jboss-epp/serverAddon/gatein.ear and 1 other directories.

Author: hfnukal Date: 2011-07-01 15:24:03 -0400 (Fri, 01 Jul 2011) New Revision: 6794 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl Log: JBEPP-970 configuration changes Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-01 16:01:54 UTC (rev 6793) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-01 19:24:03 UTC (rev 6794) @@ -877,20 +877,16 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-exo</artifactId> </dependency> -<!-- <dependency> + <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <exclusions> <exclusion> - <artifactId>annotations-api</artifactId> - <groupId>org.apache.tomcat</groupId> + <artifactId>wci-tomcat</artifactId> + <groupId>org.gatein.wci</groupId> </exclusion> - <exclusion> - <artifactId>catalina</artifactId> - <groupId>org.apache.tomcat</groupId> - </exclusion> </exclusions> - </dependency>--> + </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-01 16:01:54 UTC (rev 6793) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-01 19:24:03 UTC (rev 6794) @@ -45,7 +45,7 @@ <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> <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-Beta03</org.gatein.wci.version> + <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 16:01:54 UTC (rev 6793) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 19:24:03 UTC (rev 6794) @@ -7,10 +7,7 @@ import java.util.Iterator; import org.exoplatform.portal.webui.portal.UIPortal ; import org.exoplatform.portal.config.model.PortalProperties ; - import org.gatein.common.text.EntityEncoder; - EntityEncoder encoder = EntityEncoder.FULL; - def rcontext = _ctx.getRequestContext() ; String docBase = rcontext.getRequestContextPath() ; String skin = uicomponent.getSkin(); @@ -18,7 +15,7 @@ def portletSkins = uicomponent.getPortletSkins() ; def scriptsPaths = uicomponent.getJavascriptURLs(); def lang = uicomponent.getLocale().getLanguage(); - def title = encoder.encode(rcontext.getTitle()); + def title = rcontext.getTitle(); def metaInformation = rcontext.getMetaInformation(); %>