October 2011 - gatein-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-12 06:13:42 -0400 (Wed, 12 Oct 2011) New Revision: 7723 Added: epp/portal/tags/EPP_5_2_0_ER04/ Log: [maven-release-plugin] copy for tag EPP_5_2_0_ER04

13 years, 3 months

1
0
0 / 0

gatein SVN: r7722 - in epp/portal/branches/EPP_5_2_Branch: component and 75 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-10-12 06:13:29 -0400 (Wed, 12 Oct 2011) New Revision: 7722 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_2_Branch/server/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_2_Branch/web/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: [maven-release-plugin] prepare release EPP_5_2_0_ER04 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -136,33 +136,33 @@ </executions> <configuration> <japexConfig> - <testSuite name="ParsingPerformance" xmlns="http://www.sun.com/japex/testSuite"> - <param name="japex.namedClassPath" value="maven.test.classpath"/> - <param name="japex.resultUnit" value="ms"/> - <param name="japex.warmupIterations" value="10000"/> - <param name="japex.runIterations" value="${japex.runIterations}"/> - <param name="japex.numberOfThreads" value="${japex.numberOfThreads}"/> + <testSuite xmlns="http://www.sun.com/japex/testSuite" name="ParsingPerformance"> + <param name="japex.namedClassPath" value="maven.test.classpath" /> + <param name="japex.resultUnit" value="ms" /> + <param name="japex.warmupIterations" value="10000" /> + <param name="japex.runIterations" value="${japex.runIterations}" /> + <param name="japex.numberOfThreads" value="${japex.numberOfThreads}" /> <driver name="JavaUtilRegex"> - <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/> - <param name="description" value="Controller performance with the java.util.regex package"/> - <param name="regex" value="java"/> + <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver" /> + <param name="description" value="Controller performance with the java.util.regex package" /> + <param name="regex" value="java" /> </driver> <driver name="JRegex"> - <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/> - <param name="description" value="Controller performance with the jregex package"/> - <param name="regex" value="jregex"/> + <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver" /> + <param name="description" value="Controller performance with the jregex package" /> + <param name="regex" value="jregex" /> </driver> <testCase name="classic"> - <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/> + <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }" /> </testCase> <testCase name="fr/classic"> - <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:lang' : 'fr', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/> + <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:lang' : 'fr', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }" /> </testCase> <testCase name="group"> - <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'group' , 'gtn:sitename' : '/platform/administrator', 'gtn:path' : 'page' }"/> + <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'group' , 'gtn:sitename' : '/platform/administrator', 'gtn:path' : 'page' }" /> </testCase> <testCase name="user"> - <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'user' , 'gtn:sitename' : 'root', 'gtn:path' : 'page' }"/> + <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'user' , 'gtn:sitename' : 'root', 'gtn:path' : 'page' }" /> </testCase> </testSuite> </japexConfig> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -20,15 +20,14 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.gwtGadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -76,9 +76,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/tags/EPP_5_2_0_ER04</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/tags/EPP_5_2_0_ER04</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5_2_0_ER04</url> </scm> <modules> @@ -465,74 +465,74 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -542,68 +542,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>test-jar</type> </dependency> <dependency> @@ -620,7 +620,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency>  Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -22,13 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>extension-ear</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <artifactId>extension-war</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-11 20:57:30 UTC (rev 7721) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-12 10:13:29 UTC (rev 7722) @@ -34,7 +34,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0.ER04-SNAPSHOT</version> + <version>5.2.0.ER04</version> </parent> <description>GateIn WSRP Integration extension parent</description>

13 years, 3 months

1
0
0 / 0

gatein SVN: r7721 - epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization.

by do-not-reply＠jboss.org

Author: ghjboss Date: 2011-10-11 16:57:30 -0400 (Tue, 11 Oct 2011) New Revision: 7721 Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: setting cacheExpiration as 1800000 to avoid performance issue as discussed in GTNPORTAL-1866. Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) +++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-11 20:57:30 UTC (rev 7721) @@ -112,7 +112,7 @@ <value-param> <name>cacheExpiration</name> - <value>2000</value> + <value>1800000</value> </value-param> </init-params>

13 years, 3 months

1
0
0 / 0

gatein SVN: r7720 - in epp/portal/branches/EPP_5_2_Branch/component: common/src/test/java/org/exoplatform/commons/cache/future and 11 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-10-11 16:19:38 -0400 (Tue, 11 Oct 2011) New Revision: 7720 Added: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/test-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css Removed: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/ Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml Log: JBEPP-1281: Enhance SkinService Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java (from rev 7696, portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.commons.cache.future; + +import java.io.Serializable; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class FutureMap<K extends Serializable, V, C> extends FutureCache<K, V, C> +{ + + /** . */ + final Map<K, V> data; + + public FutureMap(Loader<K, V, C> loader) + { + super(loader); + + // + this.data = new ConcurrentHashMap<K, V>(); + } + + public void clear() + { + data.clear(); + } + + public void remove(K key) + { + data.remove(key); + } + + @Override + protected V get(K key) + { + return data.get(key); + } + + @Override + protected void put(K key, V value) + { + data.put(key, value); + } +} \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.commons.cache.future; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class FutureMap<C> extends FutureCache<String, String, C> -{ - - /** . */ - final Map<String, String> data; - - public FutureMap(Loader<String, String, C> loader) - { - super(loader); - - // - this.data = Collections.synchronizedMap(new HashMap<String, String>()); - } - - @Override - protected String get(String key) - { - return data.get(key); - } - - @Override - protected void put(String key, String value) - { - data.put(key, value); - } -} Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -23,7 +23,6 @@ import junit.framework.TestCase; import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -33,7 +32,7 @@ { public void testGet() { - FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader()); + FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader()); Assert.assertEquals("foo_value", futureCache.get(new Callable<String>() { public String call() throws Exception @@ -46,7 +45,7 @@ public void testNullValue() { - FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader()); + FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader()); Assert.assertEquals(null, futureCache.get(new Callable<String>() { public String call() throws Exception @@ -59,7 +58,7 @@ public void testThrowException() { - FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader()); + FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader()); Assert.assertEquals(null, futureCache.get(new Callable<String>() { public String call() throws Exception @@ -72,7 +71,7 @@ public void testReentrancy() { - final FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader()); + final FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader()); String res = futureCache.get(new Callable<String>() { public String call() throws Exception Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -40,31 +40,26 @@ private final String id_; - private final int cssPriority_; + private final int priority; public SimpleSkin(SkinService service, String module, String name, String cssPath) { - service_ = service; - module_ = module; - name_ = name; - cssPath_ = cssPath; - id_ = module.replace('/', '_'); - cssPriority_ = -1; + this(service, module, name, cssPath, Integer.MAX_VALUE); } - public SimpleSkin(SkinService service, String module, String name, String cssPath, Integer cssPriority) + public SimpleSkin(SkinService service, String module, String name, String cssPath, int cssPriority) { service_ = service; module_ = module; name_ = name; cssPath_ = cssPath; id_ = module.replace('/', '_'); - cssPriority_ = cssPriority != null ? cssPriority : -1; + priority = cssPriority; } public int getCSSPriority() { - return cssPriority_; + return priority; } public String getId() @@ -89,7 +84,7 @@ public String toString() { - return "SimpleSkin[id=" + id_ + ",module=" + module_ + ",name=" + name_ + ",cssPath=" + cssPath_ + "]"; + return "SimpleSkin[id=" + id_ + ",module=" + module_ + ",name=" + name_ + ",cssPath=" + cssPath_ + ", priority=" + priority +"]"; } public SkinURL createURL() Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -19,7 +19,7 @@ package org.exoplatform.portal.resource; -import org.exoplatform.commons.cache.future.FutureExoCache; +import org.exoplatform.commons.cache.future.FutureMap; import org.exoplatform.commons.cache.future.Loader; import org.exoplatform.commons.utils.BinaryOutput; import org.exoplatform.commons.utils.ByteArrayOutput; @@ -36,7 +36,6 @@ import org.exoplatform.management.rest.annotations.RESTEndpoint; import org.exoplatform.portal.resource.compressor.ResourceCompressor; import org.exoplatform.portal.resource.compressor.ResourceType; -import org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.resources.Orientation; @@ -46,13 +45,10 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.Date; import java.util.EnumMap; import java.util.HashMap; import java.util.HashSet; @@ -123,9 +119,9 @@ private final HashSet<String> availableSkins_; - private final FutureExoCache<String, CachedStylesheet, Orientation> ltCache; + private final FutureMap<String, CachedStylesheet, Orientation> ltCache; - private final FutureExoCache<String, CachedStylesheet, Orientation> rtCache; + private final FutureMap<String, CachedStylesheet, Orientation> rtCache; private final Map<String, Set<String>> portletThemes_; @@ -152,19 +148,25 @@ { public CachedStylesheet retrieve(Orientation context, String key) throws Exception { + Resource skin = getCSSResource(key, key); + if (skin == null) + { + return null; + } + StringBuffer sb = new StringBuffer(); - processCSS(sb, key, context, true); - String css; + processCSSRecursively(sb, true, skin, context); + String css = sb.toString();; try { - StringWriter output = new StringWriter(); - SkinService.this.compressor.compress(new StringReader(sb.toString()), output, ResourceType.STYLESHEET); - css = output.toString(); + if (SkinService.this.compressor.isSupported(ResourceType.STYLESHEET)) + { + css = SkinService.this.compressor.compress(css, ResourceType.STYLESHEET); + } } catch (Exception e) { log.warn("Error when compressing CSS " + key + " for orientation " + context + " will use normal CSS instead", e); - css = sb.toString(); } return new CachedStylesheet(css); @@ -176,8 +178,8 @@ portalSkins_ = new LinkedHashMap<SkinKey, SkinConfig>(); skinConfigs_ = new LinkedHashMap<SkinKey, SkinConfig>(20); availableSkins_ = new HashSet<String>(5); - ltCache = new FutureExoCache<String, CachedStylesheet, Orientation>(loader, new ConcurrentFIFOExoCache<String, CachedStylesheet>(200)); - rtCache = new FutureExoCache<String, CachedStylesheet, Orientation>(loader, new ConcurrentFIFOExoCache<String, CachedStylesheet>(200)); + ltCache = new FutureMap<String, CachedStylesheet, Orientation>(loader); + rtCache = new FutureMap<String, CachedStylesheet, Orientation>(loader); portletThemes_ = new HashMap<String, Set<String>>(); portalContainerName = context.getPortalContainerName(); mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_); @@ -186,117 +188,64 @@ } /** - * add category into portletThemes_ if portletThemes does not contain one - * @param categoryName: category's name that wangt to add into portletThemes + * Add a new category for portlet themes if it does not exist + * + * @param categoryName the category name */ public void addCategoryTheme(String categoryName) { if (!portletThemes_.containsKey(categoryName)) + { portletThemes_.put(categoryName, new HashSet<String>()); + } } /** - * Register the stylesheet for a portal Skin. Do not replace any previous skin - * - * @param module - * skin module identifier - * @param skinName - * skin name - * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} + * @deprecated use {@link #addPortalSkin(String, String, String)} instead */ + @Deprecated public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext) { - addPortalSkin(module, skinName, cssPath, scontext, false); + addPortalSkin(module, skinName, cssPath); } - + /** - * Register the stylesheet for a portal Skin. + * Add a portal skin with the <code>priority</code> is Integer.MAX_VALUE + * and the <code>overwrite</code> is false by default * * @param module - * skin module identifier * @param skinName - * skin name * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} - * @param overwrite - * if any previous skin should be replaced by that one */ - public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) + public void addPortalSkin(String module, String skinName, String cssPath) { - availableSkins_.add(skinName); - SkinKey key = new SkinKey(module, skinName); - SkinConfig skinConfig = portalSkins_.get(key); - if (skinConfig == null || overwrite) - { - skinConfig = new SimpleSkin(this, module, skinName, cssPath); - portalSkins_.put(key, skinConfig); - - if (log.isDebugEnabled()) - { - log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig); - } - } + addPortalSkin(module, skinName, cssPath, Integer.MAX_VALUE, false); } - + /** - * Register the stylesheet for a portal Skin. - * - * @param module - * skin module identifier - * @param skinName - * skin name - * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param cssData - * the content of css + * @deprecated use {@link #addPortalSkin(String, String, String, boolean)} instead */ - public void addPortalSkin(String module, String skinName, String cssPath, String cssData) + @Deprecated + public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) { - SkinKey key = new SkinKey(module, skinName); - SkinConfig skinConfig = portalSkins_.get(key); - if (skinConfig == null) - { - portalSkins_.put(key, new SimpleSkin(this, module, skinName, cssPath)); - - if (log.isDebugEnabled()) - { - log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig); - } - } - ltCache.remove(cssPath); - rtCache.remove(cssPath); + addPortalSkin(module, skinName, cssPath, overwrite); } /** - * Register the stylesheet for a portal Skin. Do not replace any previous skin. Support priority + * Add a portal skin with the <code>priority</code> is Integer.MAX_VALUE by default * * @param module - * skin module identifier * @param skinName - * skin name * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} - * @param cssPriority - * priority to support sorting in skin list + * @param overwrite */ - public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, Integer cssPriority) + public void addPortalSkin(String module, String skinName, String cssPath, boolean overwrite) { - addPortalSkin(module, skinName, cssPath, scontext, false, cssPriority); + addPortalSkin(module, skinName, cssPath, Integer.MAX_VALUE, overwrite); } - + /** - * Register the stylesheet for a portal Skin. Support priority + * Register a portal skin * * @param module * skin module identifier @@ -305,21 +254,24 @@ * @param cssPath * path uri to the css file. This is relative to the root context, * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} * @param overwrite * if any previous skin should be replaced by that one * @param cssPriority * priority to support sorting in skin list */ - public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPrioriry) + public void addPortalSkin(String module, String skinName, String cssPath, int priority, boolean overwrite) { availableSkins_.add(skinName); SkinKey key = new SkinKey(module, skinName); SkinConfig skinConfig = portalSkins_.get(key); if (skinConfig == null || overwrite) { - skinConfig = new SimpleSkin(this, module, skinName, cssPath, cssPrioriry); + if (priority < 0) + { + priority = Integer.MAX_VALUE; + } + + skinConfig = new SimpleSkin(this, module, skinName, cssPath, priority); portalSkins_.put(key, skinConfig); if (log.isDebugEnabled()) @@ -330,8 +282,10 @@ } /** - * Register the stylesheet for a portal Skin. Support priority + * Register a portal skin with the specific <code>cssData</code> * + * @deprecated This method is not supported anymore. + * The resource resolver pluggability mechanism should be used somehow * @param module * skin module identifier * @param skinName @@ -341,104 +295,57 @@ * use leading '/' * @param cssData * the content of css - * @param cssPriority - * priority to support sorting in skin list */ - public void addPortalSkin(String module, String skinName, String cssPath, String cssData, Integer cssPriority) + @Deprecated + public void addPortalSkin(String module, String skinName, String cssPath, String cssData) { - SkinKey key = new SkinKey(module, skinName); - SkinConfig skinConfig = portalSkins_.get(key); - if (skinConfig == null) - { - portalSkins_.put(key, new SimpleSkin(this, module, skinName, cssPath, cssPriority)); - - if (log.isDebugEnabled()) - { - log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig); - } - } - try - { - StringWriter output = new StringWriter(); - compressor.compress(new StringReader(cssData), output, ResourceType.STYLESHEET); - cssData = output.toString(); - } - catch (Exception e) - { - log.debug("Error when compressing CSS, will use normal CSS instead", e); - } + throw new UnsupportedOperationException("This method is not supported anymore."); } /** - * - * Register the Skin for available portal Skins. Do not override previous skin - * - * @param module - * skin module identifier - * @param skinName - * skin name - * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} + * @deprecated use {@link #addSkin(String, String, String)} instead */ + @Deprecated public void addSkin(String module, String skinName, String cssPath, ServletContext scontext) { - addSkin(module, skinName, cssPath, scontext, false); + addSkin(module, skinName, cssPath); } - + /** - * Merge several skins into one single skin. + * Add a skin with the <code>priority</code> is Integer.MAX_VALUE + * and the <code>overwrite</code> is false by default * - * @param skins - * the skins to merge - * @return the merged skin + * @param module + * @param skinName + * @param cssPath */ - public Skin merge(Collection<SkinConfig> skins) + public void addSkin(String module, String skinName, String cssPath) { - return new CompositeSkin(this, skins); + addSkin(module, skinName, cssPath, Integer.MAX_VALUE, false); } /** - * Add a resource resolver to plug external resolvers. - * - * @param resolver - * a resolver to add + * @deprecated use {@link #addSkin(String, String, String, boolean)} instead */ - public void addResourceResolver(ResourceResolver resolver) + @Deprecated + public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) { - mainResolver.resolvers.addIfAbsent(resolver); + addSkin(module, skinName, cssPath, overwrite); } - + /** + * Add a portal skin with the <code>priority</code> is Integer.MAX_VALUE * - * Register the Skin for available portal Skins. - * * @param module - * skin module identifier * @param skinName - * skin name * @param cssPath - * path uri to the css file. This is relative to the root context, - * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} * @param overwrite - * if any previous skin should be replaced by that one */ - public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) + public void addSkin(String module, String skinName, String cssPath, boolean overwrite) { - availableSkins_.add(skinName); - SkinKey key = new SkinKey(module, skinName); - SkinConfig skinConfig = skinConfigs_.get(key); - if (skinConfig == null || overwrite) - { - skinConfig = new SimpleSkin(this, module, skinName, cssPath); - skinConfigs_.put(key, skinConfig); - } + addSkin(module, skinName, cssPath, Integer.MAX_VALUE, overwrite); } - + /** * * Register the Skin for available portal Skins. Support priority @@ -450,22 +357,30 @@ * @param cssPath * path uri to the css file. This is relative to the root context, * use leading '/' - * @param scontext - * the webapp's {@link javax.servlet.ServletContext} * @param overwrite * if any previous skin should be replaced by that one - * @param cssPriority + * @param priority * priority to support sorting in skin list */ - public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPriority) + public void addSkin(String module, String skinName, String cssPath, int priority, boolean overwrite) { availableSkins_.add(skinName); SkinKey key = new SkinKey(module, skinName); SkinConfig skinConfig = skinConfigs_.get(key); if (skinConfig == null || overwrite) { - skinConfig = new SimpleSkin(this, module, skinName, cssPath, cssPriority); + if (priority < 0) + { + priority = Integer.MAX_VALUE; + } + + skinConfig = new SimpleSkin(this, module, skinName, cssPath, priority); skinConfigs_.put(key, skinConfig); + + if (log.isDebugEnabled()) + { + log.debug("Adding skin : Bind " + key + " to " + skinConfig); + } } } @@ -483,6 +398,7 @@ * @param scontext * the webapp's {@link javax.servlet.ServletContext} */ + @Deprecated public void addSkin(String module, String skinName, String cssPath, String cssData) { availableSkins_.add(skinName); @@ -495,8 +411,31 @@ ltCache.remove(cssPath); rtCache.remove(cssPath); } + + /** + * Merge several skins into one single skin. + * + * @param skins + * the skins to merge + * @return the merged skin + */ + public Skin merge(Collection<SkinConfig> skins) + { + return new CompositeSkin(this, skins); + } /** + * Add a resource resolver to plug external resolvers. + * + * @param resolver + * a resolver to add + */ + public void addResourceResolver(ResourceResolver resolver) + { + mainResolver.resolvers.addIfAbsent(resolver); + } + + /** * Registry theme category with its themes for portlet Theme * @param categoryName * category name that will be registried @@ -525,16 +464,16 @@ /** * Return the CSS content of the file specified by the given URI. * - * @param cssPath + * @param path * path of the css to find * @return the css contet or null if not found. */ - public String getCSS(String cssPath) + public String getCSS(String path) { try { final ByteArrayOutput output = new ByteArrayOutput(); - renderCSS(new ResourceRenderer() + boolean success = renderCSS(new ResourceRenderer() { public BinaryOutput getOutput() throws IOException { @@ -543,20 +482,29 @@ public void setExpiration(long seconds) { } - }, cssPath); - return output.toString(); + }, path); + + if (success) + { + return output.getString(); + } + else + { + return null; + } } catch (IOException e) { - log.error("Error while rendering css " + cssPath, e); + log.error("Error while rendering css " + path, e); return null; } catch (RenderingException e) { - log.error("Error while rendering css " + cssPath, e); + log.error("Error while rendering css " + path, e); return null; } } + /** * Render css content of the file specified by the given URI * @param renderer @@ -565,8 +513,10 @@ * path uri to the css file * @throws RenderingException * @throws IOException + * @return <code>true</code> if the <code>CSS resource </code>is found and rendered; + * <code>false</code> otherwise. */ - public void renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException + public boolean renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException { Orientation orientation = Orientation.LT; if (path.endsWith("-lt.css")) @@ -579,13 +529,30 @@ orientation = Orientation.RT; } - // Try cache first - if (!PropertyManager.isDevelopping()) + // Check if it is running under developing mode + if (PropertyManager.isDevelopping()) { + StringBuffer sb = new StringBuffer(); + Resource skin = getCSSResource(path, path); + if (skin == null) + { + return false; + } + processCSSRecursively(sb, false, skin, orientation); + byte[] bytes = sb.toString().getBytes("UTF-8"); + renderer.getOutput().write(bytes); + } + else + { // - FutureExoCache<String, CachedStylesheet, Orientation> cache = orientation == Orientation.LT ? ltCache : rtCache; + FutureMap<String, CachedStylesheet, Orientation> cache = orientation == Orientation.LT ? ltCache : rtCache; CachedStylesheet cachedCss = cache.get(orientation, path); - + + if (cachedCss == null) + { + return false; + } + if (path.startsWith("/" + portalContainerName + "/resource")) { renderer.setExpiration(ONE_MONTH); @@ -598,29 +565,25 @@ cachedCss.writeTo(renderer.getOutput()); } - else - { - StringBuffer sb = new StringBuffer(); - processCSS(sb, path, orientation, false); - byte[] bytes = sb.toString().getBytes("UTF-8"); - renderer.getOutput().write(bytes); - } + return true; } /** - * get css content of URI file - * @param cssPath + * Return CSS data corresponding to the <code>path</code> + * + * @param path * path uri to the css file * @return css content of URI file or null if not found */ - public String getMergedCSS(String cssPath) + @Deprecated + public String getMergedCSS(String path) { - CachedStylesheet stylesheet = ltCache.get(Orientation.LT, cssPath); - return stylesheet != null ? stylesheet.getText() : null; + return getCSS(path); } /** - * Get all SkinConfig of Portal Skin + * Return a collection of Portal Skins that its elements are ordered by CSS priority + * * @param skinName * name of Portal Skin * @return @@ -639,22 +602,16 @@ { public int compare(SkinConfig o1, SkinConfig o2) { - if (o1.getCSSPriority() == o2.getCSSPriority()) - return 1;//Can indicate others condition here - else if (o1.getCSSPriority() < 0) - return 1; - else if (o2.getCSSPriority() < 0) - return -1; - else - return o1.getCSSPriority() - o2.getCSSPriority(); + return o1.getCSSPriority() - o2.getCSSPriority(); } }); return portalSkins; } /** - * Get all portlet's themes - * @return portlet's themes + * Return the map of portlet themes + * + * @return the map of portlet themes */ public Map<String, Set<String>> getPortletThemes() { @@ -662,7 +619,8 @@ } /** - * Get SkinConfig by module and skin name + * Return a SkinConfig mapping by the module and skin name + * * @param module * @param skinName * @return SkinConfig by SkinKey(module, skinName), or SkinConfig by SkinKey(module, SkinService.DEFAULT_SKIN) @@ -677,14 +635,30 @@ /** * Remove SkinKey from SkinCache by portalName and skinName + * + * @deprecated the method name is wrong to the behaviour it does. + * Use {@link #removeSkin(String, String)} instead + * * @param portalName * @param skinName */ + @Deprecated public void invalidatePortalSkinCache(String portalName, String skinName) { SkinKey key = new SkinKey(portalName, skinName); skinConfigs_.remove(key); } + + /** + * Invalidate skin from the cache + * + * @param path the key + */ + public void invalidateCachedSkin(String path) + { + ltCache.remove(path); + rtCache.remove(path); + } /** * Return last modifed date of cached css @@ -697,8 +671,13 @@ { throw new IllegalArgumentException("path must not be null"); } + + if (PropertyManager.isDevelopping()) + { + return Long.MAX_VALUE; + } - FutureExoCache<String, CachedStylesheet, Orientation> cache = ltCache; + FutureMap<String, CachedStylesheet, Orientation> cache = ltCache; Orientation orientation = Orientation.LT; if (path.endsWith("-lt.css")) { @@ -722,54 +701,102 @@ } /** - * Remove SkinConfig from Portal Skin Configs by module and skin name + * @deprecated The method name is not clear. + * Using {@link #removeSkin(String, String)} instead + */ + @Deprecated + public void remove(String module, String skinName) + { + removeSkin(module, skinName); + } + + /** + * Remove a Skin from the service as well as its cache + * * @param module * @param skinName - * @throws Exception */ - public void remove(String module, String skinName) throws Exception + public void removeSkin(String module, String skinName) { SkinKey key; if (skinName.length() == 0) + { key = new SkinKey(module, DEFAULT_SKIN); + } else + { key = new SkinKey(module, skinName); - skinConfigs_.remove(key); + } + + removeSkin(key); } - + /** - * Remove Skin from Portal available Skin by skin name - * @param skinName - * name of skin that will be removed - * @throws Exception + * Remove a Skin mapped to the <code>key</code> + * + * @param key key whose mapping skin is to be removed from the service */ - public void removeSupportedSkin(String skinName) throws Exception + public void removeSkin(SkinKey key) { - availableSkins_.remove(skinName); + if (key == null) + { + return; + } + + SkinConfig remove = skinConfigs_.remove(key); + + if (remove != null) + { + invalidateCachedSkin(remove.getCSSPath()); + } } - + /** + * @deprecated This is deprecated as its name was not clear. + * Use {@link #removeSkins(List)} instead + */ + @Deprecated + public void remove(List<SkinKey> keys) throws Exception + { + removeSkins(keys); + } + + /** * Remove SkinConfig from Portal Skin Config by SkinKey * @param keys * SkinKey list these will be removed * @throws Exception */ - public void remove(List<SkinKey> keys) throws Exception + public void removeSkins(List<SkinKey> keys) throws Exception { if (keys == null) { return; } + for (SkinKey key : keys) { - skinConfigs_.remove(key); + removeSkin(key); } } + /** - * get quantity of Portal Skin Config - * @return + * Remove Skin from Portal available Skin by skin name + * @param skinName + * name of skin that will be removed + * @throws Exception */ + public void removeSupportedSkin(String skinName) throws Exception + { + availableSkins_.remove(skinName); + } + + /** + * Return the number of skin config maintaining in this SkinService + * + * @return the number of skin config maintaining in this SkinService + */ public int size() { return skinConfigs_.size(); @@ -801,7 +828,7 @@ private Resource getCSSResource(String cssPath, String outerCssFile) { Resource resource = mainResolver.resolve(cssPath); - if (resource == null) + if (resource == null && log.isErrorEnabled()) { String logMessage; if (!cssPath.equals(outerCssFile)) @@ -822,22 +849,6 @@ } return resource; } - - /** - * Apply CSS of skin - * @param appendable - * @param cssPath - * @param orientation - * @param merge - * @throws RenderingException - * @throws IOException - */ - private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge) - throws RenderingException, IOException - { - Resource skin = getCSSResource(cssPath, cssPath); - processCSSRecursively(appendable, merge, skin, orientation); - } /** * Apply CSS for Skin <br/> @@ -860,7 +871,6 @@ String basePath = skin.getContextPath() + skin.getParentPath(); // - String line = ""; Reader tmp = skin.read(); if (tmp == null) { @@ -869,7 +879,8 @@ BufferedReader reader = new SkipCommentReader(tmp, new CommentBlockHandler.OrientationCommentBlockHandler()); try { - while ((line = reader.readLine()) != null) + String line = reader.readLine(); + while (line != null) { line = proccessOrientation(line, orientation); line = proccessBackgroundUrl(line, basePath); @@ -901,7 +912,11 @@ matcher.appendReplacement((StringBuffer)appendable, str); } matcher.appendTail((StringBuffer)appendable); - appendable.append("\n"); + + if ((line = reader.readLine()) != null) + { + appendable.append("\n"); + } } } finally Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -31,8 +31,10 @@ public interface ResourceCompressor { - + public boolean isSupported(ResourceType resourceType); + public void compress(Reader input, Writer output, ResourceType resourceType) throws ResourceCompressorException, IOException; + public String compress(String input, ResourceType resourceType) throws ResourceCompressorException, IOException; } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -17,15 +17,17 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.exoplatform.portal.resource.compressor.impl; - + import java.io.IOException; import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - + import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.management.ManagementAware; @@ -40,7 +42,7 @@ import org.exoplatform.portal.resource.compressor.ResourceType; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; - + /** * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> * Aug 19, 2010 @@ -50,119 +52,128 @@ @NameTemplate({@Property(key = "service", value = "resource")}) public class ResourceCompressorService implements ResourceCompressor, ManagementAware { - - /** . */ - private Log log = ExoLogger.getLogger(ResourceCompressorService.class); - - /** . */ - private Map<ResourceType, List<ResourceCompressorPlugin>> plugins; - - /** . */ - private ManagementContext managementContext; - - public ResourceCompressorService(InitParams params) throws Exception - { - - plugins = new HashMap<ResourceType, List<ResourceCompressorPlugin>>(); - } - - public void registerCompressorPlugin(ComponentPlugin plugin) - { - if (plugin instanceof ResourceCompressorPlugin) - { - ResourceCompressorPlugin compressorPlugin = (ResourceCompressorPlugin)plugin; - ResourceType type = compressorPlugin.getResourceType(); - List<ResourceCompressorPlugin> sameResourceTypePlugins = plugins.get(type); - - if (sameResourceTypePlugins != null) - { - sameResourceTypePlugins.add(compressorPlugin); - log.debug("Loaded compressor plugin: " + compressorPlugin.getName() + " for resource type " - + type.toString()); - } - else - { - List<ResourceCompressorPlugin> newListOfPlugins = new ArrayList<ResourceCompressorPlugin>(); - newListOfPlugins.add(compressorPlugin); - log.debug("Loaded compressor plugin: " + compressorPlugin.getName() + " for new resource type " - + type.toString()); - plugins.put(type, newListOfPlugins); - } - } - } - - public ResourceCompressorPlugin getCompressorPlugin(ResourceType type, String name) - { - List<ResourceCompressorPlugin> sameResourceTypePlugins = plugins.get(type); - - if (sameResourceTypePlugins != null) - { - for (ResourceCompressorPlugin plugin : sameResourceTypePlugins) - { - if (plugin.getName().equals(name)) - { - return plugin; - } - } - } - return null; - } - - final public void compress(Reader input, Writer output, ResourceType resourceType) - throws ResourceCompressorException, IOException - { - ResourceCompressorPlugin plugin = getHighestPriorityCompressorPlugin(resourceType); - if (plugin != null) - { - plugin.compress(input, output); - } - else - { - throw new ResourceCompressorException("There is no compressor for " + resourceType + " type"); - } - } - - public ResourceCompressorPlugin getHighestPriorityCompressorPlugin(ResourceType resourceType) - { - List<ResourceCompressorPlugin> candidates = plugins.get(resourceType); - if (candidates == null || candidates.size() == 0) - { - return null; - } - - //Loop the list instead of invoking sort method - int highestPriorityIndex = 0; - int maxPriority = -1; - - for (int i = 0; i < candidates.size(); i++) - { - int currentPriority = candidates.get(i).getPriority(); - if (currentPriority > maxPriority) - { - highestPriorityIndex = i; - maxPriority = currentPriority; - } - } - - return candidates.get(highestPriorityIndex); - } - - public void setContext(ManagementContext context) - { - this.managementContext = context; + /** . */ + private Log log = ExoLogger.getLogger(ResourceCompressorService.class); - if(context==null) { - // TODO: throws exception when shutdown server - log.warn("Context is null."); - } else { - // - for (Map.Entry<ResourceType, List<ResourceCompressorPlugin>> entry : plugins.entrySet()) + /** . */ + private Map<ResourceType, List<ResourceCompressorPlugin>> plugins; + + public ResourceCompressorService(InitParams params) throws Exception + { + + plugins = new HashMap<ResourceType, List<ResourceCompressorPlugin>>(); + } + + public void registerCompressorPlugin(ComponentPlugin plugin) + { + if (plugin instanceof ResourceCompressorPlugin) + { + ResourceCompressorPlugin compressorPlugin = (ResourceCompressorPlugin)plugin; + ResourceType type = compressorPlugin.getResourceType(); + List<ResourceCompressorPlugin> sameResourceTypePlugins = plugins.get(type); + + if (sameResourceTypePlugins != null) { - for (ResourceCompressorPlugin plugin : entry.getValue()) + sameResourceTypePlugins.add(compressorPlugin); + log.debug("Loaded compressor plugin: " + compressorPlugin.getName() + " for resource type " + + type.toString()); + } + else + { + List<ResourceCompressorPlugin> newListOfPlugins = new ArrayList<ResourceCompressorPlugin>(); + newListOfPlugins.add(compressorPlugin); + log.debug("Loaded compressor plugin: " + compressorPlugin.getName() + " for new resource type " + + type.toString()); + plugins.put(type, newListOfPlugins); + } + } + } + + public ResourceCompressorPlugin getCompressorPlugin(ResourceType type, String name) + { + List<ResourceCompressorPlugin> sameResourceTypePlugins = plugins.get(type); + + if (sameResourceTypePlugins != null) + { + for (ResourceCompressorPlugin plugin : sameResourceTypePlugins) + { + if (plugin.getName().equals(name)) { - context.register(plugin); + return plugin; } } - } - } -} \ No newline at end of file + } + return null; + } + + @Override + final public boolean isSupported(ResourceType resourceType) + { + return (getHighestPriorityCompressorPlugin(resourceType) != null); + } + + @Override + final public void compress(Reader input, Writer output, ResourceType resourceType) + throws ResourceCompressorException, IOException + { + ResourceCompressorPlugin plugin = getHighestPriorityCompressorPlugin(resourceType); + if (plugin != null) + { + plugin.compress(input, output); + } + else + { + throw new ResourceCompressorException("There is no compressor for " + resourceType + " type"); + } + } + + @Override + public String compress(String input, ResourceType resourceType) throws ResourceCompressorException, IOException + { + StringReader reader = new StringReader(input); + StringWriter writer = new StringWriter(); + compress(reader, writer, resourceType); + return writer.toString(); + } + + public ResourceCompressorPlugin getHighestPriorityCompressorPlugin(ResourceType resourceType) + { + List<ResourceCompressorPlugin> candidates = plugins.get(resourceType); + if (candidates == null || candidates.size() == 0) + { + return null; + } + + //Loop the list instead of invoking sort method + int highestPriorityIndex = 0; + int maxPriority = -1; + + for (int i = 0; i < candidates.size(); i++) + { + int currentPriority = candidates.get(i).getPriority(); + if (currentPriority > maxPriority) + { + highestPriorityIndex = i; + maxPriority = currentPriority; + } + } + + return candidates.get(highestPriorityIndex); + } + + public void setContext(ManagementContext context) + { + if (context == null) + { + return; + } + // + for (Map.Entry<ResourceType, List<ResourceCompressorPlugin>> entry : plugins.entrySet()) + { + for (ResourceCompressorPlugin plugin : entry.getValue()) + { + context.register(plugin); + } + } + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -76,14 +76,14 @@ } String contextPath = scontext.getContextPath(); String fullCSSPath = contextPath + cssPath; - Integer iCssPriority = null; + int priority; try { - iCssPriority = Integer.valueOf(cssPriority); + priority = Integer.valueOf(cssPriority); } catch (Exception e) { - //Don't set cssPriority when it is not a numarical + priority = Integer.MAX_VALUE; } - skinService.addPortalSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCssPriority); + skinService.addPortalSkin(moduleName, skinName, fullCSSPath, priority, overwrite); updateSkinDependentManager(contextPath, moduleName, skinName); } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -93,14 +93,14 @@ String moduleName = applicationName + "/" + portletName; String contextPath = scontext.getContextPath(); String fullCSSPath = contextPath + cssPath; - Integer iCSSPriority = null; + int priority; try { - iCSSPriority = Integer.valueOf(cssPriority); + priority = Integer.valueOf(cssPriority); } catch (Exception e) { - //Don't set cssPriority when it is not a numarical + priority = Integer.MAX_VALUE; } - skinService.addSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCSSPriority); + skinService.addSkin(moduleName, skinName, fullCSSPath, priority, overwrite); updateSkinDependentManager(contextPath, moduleName, skinName); } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -152,7 +152,7 @@ NodeList nodes = rootElement.getElementsByTagName(tagName); SkinConfigTask task; - for (int i = nodes.getLength() - 1; i >= 0; i--) + for (int i = 0; i < nodes.getLength(); i++) { task = (SkinConfigTask)elemtToTask(tagName); if (task != null) Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -31,9 +31,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.OutputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; @@ -317,11 +314,8 @@ // Minify try { - Reader input = new StringReader(s); - StringWriter output = new StringWriter(); - compressor.compress(input, output, ResourceType.JAVASCRIPT); - - jsBytes = output.toString().getBytes(); + String output = compressor.compress(s, ResourceType.JAVASCRIPT); + jsBytes = output.getBytes(); } catch (Exception e) { Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java (from rev 7696, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.commons.utils.PropertyManager; +import org.exoplatform.commons.xml.DocumentSource; +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.resource.config.xml.SkinConfigParser; + +import java.net.URL; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +import javax.servlet.ServletContext; + +@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")}) +public abstract class AbstractSkinServiceTest extends AbstractKernelTest +{ + protected SkinService skinService; + + private static ServletContext mockServletContext; + + protected static MockResourceResolver resResolver; + + abstract boolean isDevelopingMode(); + + abstract boolean setUpTestEnvironment(); + + abstract void touchSetUp(); + + @Override + protected void setUp() throws Exception + { + //Set running mode at starting up + PropertyManager.setProperty(PropertyManager.DEVELOPING, String.valueOf(isDevelopingMode())); + + PortalContainer portalContainer = getContainer(); + + skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class); + + if (setUpTestEnvironment()) + { + mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader()); + skinService.registerContext(mockServletContext); + + resResolver = new MockResourceResolver(); + skinService.addResourceResolver(resResolver); + + URL url = mockServletContext.getResource("/gatein-resources.xml"); + SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext); + + touchSetUp(); + } + } + + public void testInitializing() + { + assertEquals(1, skinService.getAvailableSkinNames().size()); + assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); + + String css = skinService.getCSS("/path/to/MockResourceResolver.css"); + assertEquals(MockResourceResolver.class.getName(), css); + } + + public void testPortalSkinAndPriority() + { + Collection<SkinConfig> portalSkinConfigs = skinService.getPortalSkins("TestSkin"); + assertNotNull(portalSkinConfigs); + assertEquals(4, portalSkinConfigs.size()); + + SkinConfig[] array = new SkinConfig[4]; + portalSkinConfigs.toArray(array); + + SkinConfig portalSkin = array[0]; + assertNotNull(portalSkin); + assertEquals("CoreSkin", portalSkin.getModule()); + assertEquals(mockServletContext.getContextPath() + "/skin/core/Stylesheet.css", portalSkin.getCSSPath()); + + portalSkin = array[1]; + assertNotNull(portalSkin); + assertEquals("Module2", portalSkin.getModule()); + assertEquals(mockServletContext.getContextPath() + "/skin/module2/Stylesheet.css", portalSkin.getCSSPath()); + + portalSkin = array[2]; + assertNotNull(portalSkin); + assertEquals("Module3", portalSkin.getModule()); + assertEquals(mockServletContext.getContextPath() + "/skin/module3/Stylesheet.css", portalSkin.getCSSPath()); + + portalSkin = array[3]; + assertNotNull(portalSkin); + assertEquals("Module1", portalSkin.getModule()); + assertEquals(mockServletContext.getContextPath() + "/skin/module1/Stylesheet.css", portalSkin.getCSSPath()); + } + + public void testPortletSkin() + { + SkinConfig portletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); + assertNotNull(portletSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/FirstPortlet.css", + portletSkin.getCSSPath()); + + portletSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin"); + assertNotNull(portletSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/SecondPortlet.css", + portletSkin.getCSSPath()); + } + + public void testThemes() + { + Map<String, Set<String>> themeStyles = skinService.getPortletThemes(); + Set<String> themes = themeStyles.get("Simple"); + assertNotNull(themes); + assertTrue(themes.contains("SimpleBlue")); + assertTrue(themes.contains("SimpleViolet")); + + assertNotNull(themeStyles.get("VistaStyle")); + } + + public void testExistingCSS() throws Exception + { + String css = skinService.getCSS("/mockwebapp/skin/Stylesheet-lt.css"); + assertTrue(css.length() > 0); + + css = skinService.getCSS("/mockwebapp/skin/Stylesheet-rt.css"); + assertTrue(css.length() > 0); + } + + public void testNonExistingCSS() + { + String css = skinService.getCSS("/non/existing/file.css"); + assertNull(css); + + css = skinService.getCSS("/non/existing/file-lt.css"); + assertNull(css); + } + + public void testProcessComment() + { + String path = "/process/comment/file.css"; + String css = + "foo; /*background:url(bar.gif); Inline comment*/" + + "/* Block comment\n" + + " background:url(bar.gif);\n" + + " End of block comment */"; + + resResolver.addResource(path, css); + + //TODO: It should only ignore the comment instead of removing it +// assertEquals( +// "foo; /*background:url(bar.gif); Inline comment*/" + +// "/* Block comment\n" + +// " background:url(bar.gif);\n" + +// " End of block comment */", +// skinService.getCSS(path)); + assertEquals("foo;", skinService.getCSS(path)); + } + + public void testOrientation() + { + String path = "/orientation/file"; + String css = + "aaa;/*orientation=lt*/bbb;/*orientation=rt*/\n" + + " aaa; /* orientation=lt */ bbb; /* orientation=rt */ \n" + + "{aaa;bbb;/*orientation=lt*/ccc;ddd;/*orientation=rt*/}\n" + + "{aaa;/*orientation=lt*/bbb;}{ccc;/*orientation=rt*/ddd;}"; + + resResolver.addResource(path + ".css", css); + + assertEquals( + "aaa;\n" + + "aaa;\n" + + "{aaa;bbb;/*orientation=lt*/ccc;}\n" + + "{aaa;/*orientation=lt*/bbb;}{ddd;}", + skinService.getCSS(path + "-lt.css")); + + assertEquals( + "bbb;/*orientation=rt*/\n" + + " bbb; /* orientation=rt */\n" + + "{aaa;ccc;ddd;/*orientation=rt*/}\n" + + "{bbb;}{ccc;/*orientation=rt*/ddd;}", + skinService.getCSS(path + "-rt.css")); + } + + public void testBackgroundURL() + { + String path = "/background/url/file.css"; + String css = + "background:url(images/foo.gif);\n" + + "background:url('/images/foo.gif');\n" + + "aaa; background: #fff url('images/foo.gif') no-repeat center -614px; ccc;"; + + resResolver.addResource(path, css); + assertEquals( + "background:url(/background/url/images/foo.gif);\n" + + "background:url('/images/foo.gif');\n" + + "aaa; background: #fff url('/background/url/images/foo.gif') no-repeat center -614px; ccc;", + skinService.getCSS(path)); + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -28,9 +28,8 @@ * @date 7/5/11 */ @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/js-service-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml") }) public abstract class AbstractWebResourceTest extends AbstractKernelTest { Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java (from rev 7696, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.resource; + +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; + +import java.io.Reader; +import java.io.StringReader; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="trongtt(a)gmail.com">Trong Tran</a> + * @version $Revision$ + */ +class MockResourceResolver implements ResourceResolver +{ + /** . */ + private final Logger log = LoggerFactory.getLogger(MockResourceResolver.class); + + private Map<String, String> map = new HashMap<String, String>(); + + public MockResourceResolver() + { + addResource("/path/to/MockResourceResolver.css", this.getClass().getName()); + } + + public void addResource(String path, String value) + { + map.put(path, value); + } + + public String removeResource(String path) + { + return map.remove(path); + } + + @Override + public Resource resolve(String path) throws NullPointerException + { + if (path == null) + { + throw new NullPointerException("No null path is accepted"); + } + + log.info("path to resolve : " + path); + + final String css = map.get(path); + if (css != null) + { + return new Resource(path) + { + @Override + public Reader read() + { + return new StringReader(css); + } + }; + } + return null; + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -18,207 +18,116 @@ */ package org.exoplatform.portal.resource; -import org.exoplatform.commons.xml.DocumentSource; -import org.exoplatform.component.test.AbstractKernelTest; -import org.exoplatform.component.test.ConfigurationUnit; -import org.exoplatform.component.test.ConfiguredBy; -import org.exoplatform.component.test.ContainerScope; -import org.exoplatform.container.PortalContainer; -import org.exoplatform.portal.resource.config.xml.SkinConfigParser; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.net.URL; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import javax.servlet.ServletContext; +import org.exoplatform.services.resources.Orientation; +import java.util.Arrays; + /** - * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> - * @date 6/29/11 + * @author <a href="trongtt(a)gmail.com">Trong Tran</a> + * @version $Revision$ */ -public class TestSkinService extends AbstractWebResourceTest + +public class TestSkinService extends AbstractSkinServiceTest { - private PortalContainer portalContainer; + private static boolean isFirstStartup = true; - private SkinService skinService; - - private ServletContext mockServletContext; - - private volatile boolean initSkinService = true; - - /** A cache of Method in SkinService, served for reflect invocation **/ - private Map<String, Method> methodsOfSkinService = new HashMap<String, Method>(); - - @Override - protected void setUp() throws Exception + boolean isDevelopingMode() { - if(initSkinService) - { - initSkinService = false; - - portalContainer = getContainer(); - skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class); - mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader()); - skinService.registerContext(mockServletContext); - - processSkinConfiguration("/gatein-resources.xml"); - } + return false; } - private void processSkinConfiguration(String configResource) throws Exception + @Override + boolean setUpTestEnvironment() { - URL url = mockServletContext.getResource(configResource); - SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext); + return isFirstStartup; } - public void testInitService() + @Override + void touchSetUp() { - assertNotNull(portalContainer); - assertEquals("portal", portalContainer.getName()); - assertNotNull(skinService); + isFirstStartup = false; } - public void testInitSkinModules() + public void testCompositeSkin() { - assertNotNull(skinService.getAvailableSkinNames()); - assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); - } + SkinConfig fSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); + SkinConfig sSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin"); + assertNotNull(fSkin); + assertNotNull(sSkin); - public void testInitThemes() - { + Skin merged = skinService.merge(Arrays.asList(fSkin, sSkin)); + SkinURL url = merged.createURL(); - } + url.setOrientation(Orientation.LT); + assertEquals( + ".FirstPortlet {foo1 : bar1}\n" + + ".SecondPortlet {foo2 : bar2}", + skinService.getCSS(url.toString())); - public void testDeployedSkinModules() - { - assertNotNull(skinService.getAvailableSkinNames()); - assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); - - Collection<SkinConfig> skinConfigs = skinService.getPortalSkins("TestSkin"); - assertNotNull(skinConfigs); - - SkinConfig portalSkin = null; - for(SkinConfig config : skinConfigs) - { - if("TestSkin".equals(config.getName())) - { - portalSkin = config; - break; - } - } - assertNotNull(portalSkin); - assertEquals(mockServletContext.getContextPath() + "/skin/Stylesheet.css", portalSkin.getCSSPath()); - - SkinConfig firstPortletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); - assertNotNull(firstPortletSkin); - assertEquals(mockServletContext.getContextPath() + "/skin/portlet/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath()); + url.setOrientation(Orientation.RT); + assertEquals( + ".FirstPortlet {foo1 : bar1}\n" + + ".SecondPortlet {foo2 : bar2}", + skinService.getCSS(url.toString())); } - public void testDeployedThemes() + public void testCache() { + String path = "/path/to/test/caching.css"; - } + resResolver.addResource(path, "foo"); + assertEquals("foo", skinService.getCSS(path)); - public void testRenderLT_CSS() throws Exception - { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ResourceRenderer renderer = new MockResourceRenderer(out); - - skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-lt.css"); - - //TODO: Check the array of bytes in out + resResolver.addResource(path, "bar"); + assertEquals("foo", skinService.getCSS(path)); } - - public void testRenderRT_CSS() throws Exception + + public void testInvalidateCache() { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ResourceRenderer renderer = new MockResourceRenderer(out); + String path = "/path/to/test/caching.css"; - skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-rt.css"); + resResolver.addResource(path, "foo"); + assertEquals("foo", skinService.getCSS(path)); - //TODO: Check the array of bytes in out + resResolver.addResource(path, "bar"); + skinService.invalidateCachedSkin(path); + assertEquals("bar", skinService.getCSS(path)); } - public void testBackground() throws Exception + public void testProcessImportCSS() { - } + String parent = "/process/import/css.css"; - public void testServiceCache() throws Exception - { - } + resResolver.addResource(parent, "@import url(Portlet/Stylesheet.css); aaa;"); + assertEquals(" aaa;", skinService.getCSS(parent)); + skinService.invalidateCachedSkin(parent); + + resResolver.addResource(parent, "@import url('/Portlet/Stylesheet.css'); aaa;"); + assertEquals(" aaa;", skinService.getCSS(parent)); + skinService.invalidateCachedSkin(parent); - public void testSkinPriority() throws Exception - { - } + //parent file import child css file + resResolver.addResource(parent, "@import url(childCSS/child.css); background:url(images/foo.gif);"); + String child = "/process/import/childCSS/child.css"; + resResolver.addResource(child, "background:url(bar.gif);"); - public void testUndeploySkinConfig() throws Exception - { - //TODO: Fork the work of GateInSkinConfigRemoval here + /* + * Now test merge and process recursively (run in non-dev mode) + * We have folder /path/to/parent.css + * /images/foo.gif + * /childCSS/child.css + * /bar.gif + */ + assertEquals("background:url(/process/import/childCSS/bar.gif); background:url(/process/import/images/foo.gif);", + skinService.getCSS(parent)); } - /** - * Designed to invoke reflectively private methods of SkinService. That facilitate - * writting JUnit tests - * - * @param methodName - * @param arguments - */ - private void invokeMethodOfSkinService(String methodName, Object... arguments) + public void testLastModifiedSince() { - StringBuilder methodSignature = new StringBuilder(methodName); - Class<?>[] paramTypes = new Class<?>[arguments.length]; - for(int i =0; i < arguments.length; i++) - { - paramTypes[i] = arguments[i].getClass(); - methodSignature.append("_"); - methodSignature.append(paramTypes[i].getName()); - } - //First we look at the cache - Method method = methodsOfSkinService.get(methodSignature.toString()); + String path = "/last/modify/since.css"; + resResolver.addResource(path, "foo"); - //Find method by reflection - if(method == null) - { - try - { - method = skinService.getClass().getDeclaredMethod(methodName, paramTypes); - if(method != null) - { - method.setAccessible(true); - methodsOfSkinService.put(methodSignature.toString(), method); - } - else - { - return; - } - } - catch (NoSuchMethodException ex) - { - } - } - - try - { - if(Modifier.isStatic(method.getModifiers())) - { - method.invoke(null, arguments); - } - else - { - method.invoke(skinService, arguments); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } + assertTrue(skinService.getCSS(path).length() > 0); + assertTrue(skinService.getLastModified(path) < System.currentTimeMillis()); } - - @Override - protected void tearDown() throws Exception - { - } } Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java (from rev 7696, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.services.resources.Orientation; + +import java.util.Arrays; + + +/** + * @author <a href="trongtt(a)gmail.com">Trong Tran</a> + * @version $Revision$ + */ + +public class TestSkinServiceInDevelopingMode extends AbstractSkinServiceTest +{ + private static boolean isFirstStartup = true; + + boolean isDevelopingMode() + { + return true; + } + + @Override + boolean setUpTestEnvironment() + { + return isFirstStartup; + } + + @Override + void touchSetUp() + { + isFirstStartup = false; + } + + public void testCompositeSkin() + { + SkinConfig fSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); + SkinConfig sSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin"); + assertNotNull(fSkin); + assertNotNull(sSkin); + + Skin merged = skinService.merge(Arrays.asList(fSkin, sSkin)); + SkinURL url = merged.createURL(); + + url.setOrientation(Orientation.LT); + assertEquals("@import url(/mockwebapp/skin/FirstPortlet-lt.css);\n" + + "@import url(/mockwebapp/skin/SecondPortlet-lt.css);", skinService.getCSS(url.toString())); + + url.setOrientation(Orientation.RT); + assertEquals("@import url(/mockwebapp/skin/FirstPortlet-rt.css);\n" + + "@import url(/mockwebapp/skin/SecondPortlet-rt.css);", skinService.getCSS(url.toString())); + } + + public void testCache() + { + String path = "/path/to/test/caching.css"; + + resResolver.addResource(path, "foo"); + assertEquals("foo", skinService.getCSS(path)); + + resResolver.addResource(path, "bar"); + assertEquals("bar", skinService.getCSS(path)); + } + + public void testProcessImportCSS() + { + String parent = "/process/import/css.css"; + + resResolver.addResource(parent, "@import url(Portlet/Stylesheet.css); aaa;"); + assertEquals("@import url(/process/import/Portlet/Stylesheet-lt.css); aaa;", skinService.getCSS(parent)); + + resResolver.addResource(parent, "@import url('/Portlet/Stylesheet.css'); aaa;"); + assertEquals("@import url('/Portlet/Stylesheet-lt.css'); aaa;", skinService.getCSS(parent)); + + //parent file import child css file + resResolver.addResource(parent, "@import url(childCSS/child.css); background:url(images/foo.gif);"); + String child = "/process/import/childCSS/child.css"; + resResolver.addResource(child, "background:url(bar.gif);"); + + /* + * Now test merge and process recursively (run in non-dev mode) + * We have folder /process/import/css.css + * /images/foo.gif + * /childCSS/child.css + * /bar.gif + */ + assertEquals("@import url(/process/import/childCSS/child-lt.css); background:url(/process/import/images/foo.gif);", + skinService.getCSS(parent)); + } + + public void testLastModifiedSince() + { + String path = "/last/modify/since.css"; + resResolver.addResource(path, "foo"); + + assertTrue(skinService.getCSS(path).length() > 0); + assertEquals(Long.MAX_VALUE, skinService.getLastModified(path)); + } +} Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - <component> - <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key> - <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type> - </component> -</configuration> Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - - <component> - <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key> - <type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type> - <component-plugins> - <component-plugin> - <name>MockCompressorPlugin</name> - <set-method>registerCompressorPlugin</set-method> - <type>org.exoplatform.portal.resource.compressor.MockCompressorPlugin</type> - <init-params> - <value-param> - <name>plugin.priority</name> - <value>5</value> - </value-param> - </init-params> - </component-plugin> - - <component-plugin> - <name>JSMinCompressorPlugin</name> - <set-method>registerCompressorPlugin</set-method> - <type>org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin</type> - <init-params> - <value-param> - <name>plugin.priority</name> - <value>9</value> - </value-param> - </init-params> - </component-plugin> - - <component-plugin> - <name>YUICSSCompressorPlugin</name> - <set-method>registerCompressorPlugin</set-method> - <type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type> - <init-params> - <value-param> - <name>plugin.priority</name> - <value>1</value> - </value-param> - <value-param> - <name>line.break.position</name> - <value>100</value> - </value-param> - </init-params> - </component-plugin> - </component-plugins> - </component> -</configuration> Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml (from rev 7696, portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <external-component-plugins> + <target-component>org.exoplatform.portal.resource.compressor.ResourceCompressor</target-component> + <component-plugin> + <name>MockCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.MockCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>5</value> + </value-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>JSMinCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>9</value> + </value-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>YUICSSCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>1</value> + </value-param> + <value-param> + <name>line.break.position</name> + <value>100</value> + </value-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - - <component> - <key>org.exoplatform.portal.resource.SkinService</key> - <type>org.exoplatform.portal.resource.SkinService</type> - </component> -</configuration> Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/test-configuration.xml (from rev 7696, portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/test-configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/test-configuration.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.exoplatform.portal.resource.SkinService</key> + <type>org.exoplatform.portal.resource.SkinService</type> + </component> + + <component> + <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key> + <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type> + </component> + + <component> + <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key> + <type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type> + </component> +</configuration> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 20:17:47 UTC (rev 7719) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 20:19:38 UTC (rev 7720) @@ -21,128 +21,93 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> - <portal-skin> - <skin-name>TestSkin</skin-name> - <css-path>/skin/Stylesheet.css</css-path> - </portal-skin> + <portal-skin> + <skin-name>TestSkin</skin-name> + <css-path>/skin/core/Stylesheet.css</css-path> + <css-priority>0</css-priority> + </portal-skin> - <portlet-skin> - <application-name>mockwebapp</application-name> - <portlet-name>FirstPortlet</portlet-name> - <skin-name>TestSkin</skin-name> - <css-path>/skin/portlet/FirstPortlet/Stylesheet.css</css-path> - </portlet-skin> + <portal-skin> + <skin-name>TestSkin</skin-name> + <skin-module>Module1</skin-module> + <css-path>/skin/module1/Stylesheet.css</css-path> + </portal-skin> -  - <window-style> - <style-name>Simple</style-name> - <style-theme> - <theme-name>SimpleBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>SimplePink</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>RoundConer</style-name> - <style-theme> - <theme-name>RoundConerBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerPink</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>Shadow</style-name> - <style-theme> - <theme-name>ShadowBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowPink</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>MacStyle</style-name> - <style-theme> - <theme-name>MacTheme</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGray</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGreenSteel</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>VistaStyle</style-name> - <style-theme> - <theme-name>VistaTheme</theme-name> - </style-theme> - </window-style> - - <javascript> - <param> - <js-module>js.test1</js-module> - <js-path>/js/test1.js</js-path> - <js-priority>-1</js-priority> - </param> - </javascript> - <javascript> - <param> - <js-module>js.test2</js-module> - <js-path>/js/test2.js</js-path> - <js-priority>1</js-priority> - </param> - </javascript> - <javascript> - <param> - <js-module>js.test3</js-module> - <js-path>/js/test3.js</js-path> - </param> - </javascript> - <javascript> - <param> - <js-module>js.test4</js-module> - <js-path>/js/test4.js</js-path> - <js-priority>2</js-priority> - </param> - </javascript> + <portal-skin> + <skin-name>TestSkin</skin-name> + <skin-module>Module2</skin-module> + <css-path>/skin/module2/Stylesheet.css</css-path> + <css-priority>1</css-priority> + </portal-skin> + + <portal-skin> + <skin-name>TestSkin</skin-name> + <skin-module>Module3</skin-module> + <css-path>/skin/module3/Stylesheet.css</css-path> + <css-priority>1</css-priority> + </portal-skin> + + <portlet-skin> + <application-name>mockwebapp</application-name> + <portlet-name>FirstPortlet</portlet-name> + <skin-name>TestSkin</skin-name> + <css-path>/skin/FirstPortlet.css</css-path> + </portlet-skin> + + <portlet-skin> + <application-name>mockwebapp</application-name> + <portlet-name>SecondPortlet</portlet-name> + <skin-name>TestSkin</skin-name> + <css-path>/skin/SecondPortlet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + + <javascript> + <param> + <js-module>js.test1</js-module> + <js-path>/js/test1.js</js-path> + <js-priority>-1</js-priority> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test2</js-module> + <js-path>/js/test2.js</js-path> + <js-priority>1</js-priority> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test3</js-module> + <js-path>/js/test3.js</js-path> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test4</js-module> + <js-path>/js/test4.js</js-path> + <js-priority>2</js-priority> + </param> + </javascript> </gatein-resources> Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css (from rev 7696, portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1 @@ +.FirstPortlet {foo1 : bar1} \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css (from rev 7696, portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css 2011-10-11 20:19:38 UTC (rev 7720) @@ -0,0 +1 @@ +.SecondPortlet {foo2 : bar2} \ No newline at end of file

13 years, 3 months

1
0
0 / 0

gatein SVN: r7719 - portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator.

by do-not-reply＠jboss.org

Author: theute Date: 2011-10-11 16:17:47 -0400 (Tue, 11 Oct 2011) New Revision: 7719 Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java Log: GTNPORTAL-2165 NotSerializableException: org.exoplatform.webui.form.validator.NotHTMLTagValidator Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java 2011-10-11 20:05:21 UTC (rev 7718) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java 2011-10-11 20:17:47 UTC (rev 7719) @@ -18,11 +18,13 @@ */ package org.exoplatform.webui.form.validator; +import java.io.Serializable; + /** * @author <a href="trongtt(a)gmail.com">Trong Tran</a> * @version $Revision$ */ -public class NotHTMLTagValidator extends ExpressionValidator +public class NotHTMLTagValidator extends ExpressionValidator implements Serializable { private static final String REGEX = "[^\\<\\>]*";

13 years, 3 months

1
0
0 / 0

gatein SVN: r7718 - epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator.

by do-not-reply＠jboss.org

Author: theute Date: 2011-10-11 16:05:21 -0400 (Tue, 11 Oct 2011) New Revision: 7718 Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java Log: JBEPP-1283: NotSerializableException: org.exoplatform.webui.form.validator.NotHTMLTagValidator Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java 2011-10-11 15:38:07 UTC (rev 7717) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/NotHTMLTagValidator.java 2011-10-11 20:05:21 UTC (rev 7718) @@ -18,11 +18,13 @@ */ package org.exoplatform.webui.form.validator; +import java.io.Serializable; + /** * @author <a href="trongtt(a)gmail.com">Trong Tran</a> * @version $Revision$ */ -public class NotHTMLTagValidator extends ExpressionValidator +public class NotHTMLTagValidator extends ExpressionValidator implements Serializable { private static final String REGEX = "[^\\<\\>]*";

13 years, 3 months

1
0
0 / 0

gatein SVN: r7717 - epp/portal/branches.

by do-not-reply＠jboss.org

Author: ghjboss Date: 2011-10-11 11:38:07 -0400 (Tue, 11 Oct 2011) New Revision: 7717 Added: epp/portal/branches/EPP_5_1_1_GA_JBEPP-1284/ Log: create branch for support jira JBEPP-1284

13 years, 3 months

1
0
0 / 0

gatein SVN: r7716 - in epp/portal/branches/EPP_5_2_Branch: component and 7 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-10-11 11:32:14 -0400 (Tue, 11 Oct 2011) New Revision: 7716 Added: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/ Log: JUnit Tests for JavascriptConfigService (CC GTNPORAL-2005) Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1592/component/portal:4868 /portal/trunk:7451 /portal/trunk/component/portal:7451,7500,7570-7571,7573,7577,7614-7615 + /portal/branches/branch-GTNPORTAL-1592/component/portal:4868 /portal/trunk:7451 /portal/trunk/component/portal:7085,7451,7500,7570-7571,7573,7577,7614-7615 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 /portal/trunk/src/main/java/org:7451 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 /portal/trunk/src/main/java/org:7451 Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-10-11 15:18:28 UTC (rev 7715) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-10-11 15:32:14 UTC (rev 7716) @@ -23,7 +23,6 @@ import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.resource.compressor.ResourceCompressor; import org.exoplatform.portal.resource.compressor.ResourceType; -import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; import org.gatein.wci.impl.DefaultServletContainerFactory; @@ -369,6 +368,8 @@ extendedJavascripts.remove(path); jsBytes = null; } + + /** * Start service. Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-11 15:18:28 UTC (rev 7715) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-11 15:32:14 UTC (rev 7716) @@ -29,6 +29,7 @@ */ @ConfiguredBy({ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/js-service-configuration.xml"), @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") }) public abstract class AbstractWebResourceTest extends AbstractKernelTest Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java (from rev 7085, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java 2011-10-11 15:32:14 UTC (rev 7716) @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.container.PortalContainer; +import org.exoplatform.test.mocks.servlet.MockServletContext; +import org.exoplatform.web.application.javascript.JavascriptConfigParser; +import org.exoplatform.web.application.javascript.JavascriptConfigService; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.servlet.ServletContext; + +/** + * @author <a href="mailto:phuong.vu@exoplatform.com">Vu Viet Phuong</a> + * @version $Id$ + * + */ +public class TestJavascriptConfigService extends AbstractWebResourceTest +{ + private JavascriptConfigService jsService; + + private ServletContext mockServletContext; + + private static final String exModule = "extended.js.test"; + + private static final String exPath = "/extended/js/test.js"; + + private static final ServletContext exContext = new MockJSServletContext("extendedWebApp", null); + + @Override + protected void setUp() throws Exception + { + final PortalContainer portalContainer = getContainer(); + jsService = (JavascriptConfigService)portalContainer.getComponentInstanceOfType(JavascriptConfigService.class); + + Map<String, String> resources = new HashMap<String, String>(4); + resources.put("/js/test1.js", "aaa;"); + resources.put("/js/test2.js", "bbb;"); + resources.put("/js/test3.js", "ccc;"); + resources.put("/js/test4.js", "ddd;"); + mockServletContext = new MockJSServletContext("mockwebapp", resources); + + URL url = portalContainer.getPortalClassLoader().getResource("mockwebapp/gatein-resources.xml"); + JavascriptConfigParser.processConfigResource(url.openStream(), jsService, mockServletContext); + } + + public void testAvailableScripts() + { + assertEquals(4, jsService.getAvailableScripts().size()); + assertTrue(jsService.isModuleLoaded("js.test1")); + assertTrue(jsService.isModuleLoaded("js.test2")); + assertTrue(jsService.isModuleLoaded("js.test3")); + assertTrue(jsService.isModuleLoaded("js.test4")); + assertFalse(jsService.isModuleLoaded("js.test5")); + } + + public void testPriority() + { + Iterator<String> availPaths = jsService.getAvailableScriptsPaths().iterator(); + assertEquals(mockServletContext.getContextPath() + "/js/test2.js", availPaths.next()); + assertEquals(mockServletContext.getContextPath() + "/js/test4.js", availPaths.next()); + assertEquals(mockServletContext.getContextPath() + "/js/test1.js", availPaths.next()); + assertEquals(mockServletContext.getContextPath() + "/js/test3.js", availPaths.next()); + assertFalse(availPaths.hasNext()); + } + + public void testExtendedJS() throws Exception + { + jsService.addExtendedJavascript(exModule, exPath, exContext, "extendedJS;"); + assertTrue(jsService.isModuleLoaded(exModule)); + assertTrue(jsService.getAvailableScriptsPaths().contains(exContext.getContextPath() + exPath)); + assertEquals("\nbbb;ddd;aaa;ccc;extendedJS;", new String(jsService.getMergedJavascript())); + + long first = jsService.getLastModified(); + assertTrue(first < System.currentTimeMillis()); + + jsService.removeExtendedJavascript(exModule, exPath, exContext); + + assertFalse(jsService.isModuleLoaded(exModule)); + assertFalse(jsService.getAvailableScriptsPaths().contains(exContext.getContextPath() + exPath)); + Thread.sleep(1000); //Wait to make sure we can compare lastModified properly + assertEquals("\nbbb;ddd;aaa;ccc;", new String(jsService.getMergedJavascript())); + + long second = jsService.getLastModified(); + assertTrue(first < second); + assertTrue(second < System.currentTimeMillis()); + } + + public void testMergedJS() + { + String mergedJS = new String(jsService.getMergedJavascript()); + assertEquals("\nbbb;ddd;aaa;ccc;", mergedJS); + assertTrue(jsService.getLastModified() < System.currentTimeMillis()); + } + + public void testRemoveJS() + { + assertEquals(4, jsService.getAvailableScripts().size()); + assertEquals(4, jsService.getAvailableScriptsPaths().size()); + jsService.remove(mockServletContext); + assertEquals(0, jsService.getAvailableScripts().size()); + assertEquals(0, jsService.getAvailableScriptsPaths().size()); + + assertTrue(jsService.getMergedJavascript().length > 0); + jsService.refreshMergedJavascript(); + //bug of service +// assertTrue(jsService.getMergedJavascript().length == 0); + } + + @Override + protected void tearDown() throws Exception + { + jsService.remove(mockServletContext); + jsService.removeExtendedJavascript(exModule, exPath, exContext); + } + + private static class MockJSServletContext extends MockServletContext + { + private Map<String, String> resources; + + public MockJSServletContext(String contextName, Map<String, String> resources) + { + super(contextName); + this.resources = resources; + } + + @Override + public String getContextPath() + { + return "/" + getServletContextName(); + } + + @Override + public InputStream getResourceAsStream(String s) + { + return new ByteArrayInputStream(resources.get(s).getBytes()); + } + } +} Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml (from rev 7085, portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-10-11 15:32:14 UTC (rev 7716) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + <component> + <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key> + <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type> + </component> +</configuration> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 15:18:28 UTC (rev 7715) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 15:32:14 UTC (rev 7716) @@ -118,4 +118,31 @@ </style-theme> </window-style> + <javascript> + <param> + <js-module>js.test1</js-module> + <js-path>/js/test1.js</js-path> + <js-priority>-1</js-priority> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test2</js-module> + <js-path>/js/test2.js</js-path> + <js-priority>1</js-priority> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test3</js-module> + <js-path>/js/test3.js</js-path> + </param> + </javascript> + <javascript> + <param> + <js-module>js.test4</js-module> + <js-path>/js/test4.js</js-path> + <js-priority>2</js-priority> + </param> + </javascript> </gatein-resources> Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615

13 years, 3 months

1
0
0 / 0

gatein SVN: r7715 - in epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test: java/org/exoplatform/portal/resource/compressor and 7 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-10-11 11:18:28 -0400 (Tue, 11 Oct 2011) New Revision: 7715 Added: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css Removed: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java Log: Adding skin service tests Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java (from rev 6835, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 7/5/11 + */ +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") +}) +public abstract class AbstractWebResourceTest extends AbstractKernelTest +{ +} Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java (from rev 6775, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.commons.utils.BinaryOutput; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.Charset; + +/** + * A simple ResourceRenderer used in JUnit tests of SkinService + * + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +public class MockResourceRenderer implements ResourceRenderer +{ + + private final BinaryOutput output; + + private final static Charset UTF_8 = Charset.forName("UTF-8"); + + public MockResourceRenderer(final OutputStream out) + { + this.output = new BinaryOutput() + { + public Charset getCharset() + { + return UTF_8; + } + + public void write(byte b) throws IOException + { + out.write(b); + } + + public void write(byte[] bytes) throws IOException + { + out.write(bytes); + } + + public void write(byte[] bytes, int off, int len) throws IOException + { + out.write(bytes, off, len); + } + }; + } + + public BinaryOutput getOutput() throws IOException + { + return output; + } + + public void setExpiration(long seconds) + { + } +} Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java (from rev 6773, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Enumeration; +import java.util.Set; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +public class MockServletContext implements ServletContext +{ + + private String contextName; + + private ClassLoader loader; + + public MockServletContext(String contextName, ClassLoader loader) + { + this.contextName = contextName; + this.loader = loader; + } + + public String getContextPath() + { + return "/" + contextName; + } + + public ServletContext getContext(String s) + { + return null; + } + + public int getMajorVersion() + { + return 0; + } + + public int getMinorVersion() + { + return 0; + } + + public String getMimeType(String s) + { + return null; + } + + public Set getResourcePaths(String s) + { + return null; + } + + public URL getResource(String s) throws MalformedURLException + { + return loader.getResource(contextName + s); + } + + public InputStream getResourceAsStream(String s) + { + return loader.getResourceAsStream(contextName + s); + } + + public RequestDispatcher getRequestDispatcher(String s) + { + return null; + } + + public RequestDispatcher getNamedDispatcher(String s) + { + return null; + } + + public Servlet getServlet(String s) throws ServletException + { + return null; + } + + public Enumeration getServlets() + { + return null; + } + + public Enumeration getServletNames() + { + return null; + } + + public void log(String s) + { + } + + public void log(Exception e, String s) + { + } + + public void log(String s, Throwable throwable) + { + } + + public String getRealPath(String s) + { + return null; + } + + public String getServerInfo() + { + return null; + } + + public String getInitParameter(String s) + { + return null; + } + + public Enumeration getInitParameterNames() + { + return null; + } + + public Object getAttribute(String s) + { + return null; + } + + public Enumeration getAttributeNames() + { + return null; + } + + public void setAttribute(String s, Object o) + { + } + + public void removeAttribute(String s) + { + } + + public String getServletContextName() + { + return contextName; + } +} Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java (from rev 6773, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +import org.exoplatform.commons.xml.DocumentSource; +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.resource.config.xml.SkinConfigParser; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.ServletContext; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +public class TestSkinService extends AbstractWebResourceTest +{ + private PortalContainer portalContainer; + + private SkinService skinService; + + private ServletContext mockServletContext; + + private volatile boolean initSkinService = true; + + /** A cache of Method in SkinService, served for reflect invocation **/ + private Map<String, Method> methodsOfSkinService = new HashMap<String, Method>(); + + @Override + protected void setUp() throws Exception + { + if(initSkinService) + { + initSkinService = false; + + portalContainer = getContainer(); + skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class); + mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader()); + skinService.registerContext(mockServletContext); + + processSkinConfiguration("/gatein-resources.xml"); + } + } + + private void processSkinConfiguration(String configResource) throws Exception + { + URL url = mockServletContext.getResource(configResource); + SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext); + } + + public void testInitService() + { + assertNotNull(portalContainer); + assertEquals("portal", portalContainer.getName()); + assertNotNull(skinService); + } + + public void testInitSkinModules() + { + assertNotNull(skinService.getAvailableSkinNames()); + assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); + } + + public void testInitThemes() + { + + } + + public void testDeployedSkinModules() + { + assertNotNull(skinService.getAvailableSkinNames()); + assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); + + Collection<SkinConfig> skinConfigs = skinService.getPortalSkins("TestSkin"); + assertNotNull(skinConfigs); + + SkinConfig portalSkin = null; + for(SkinConfig config : skinConfigs) + { + if("TestSkin".equals(config.getName())) + { + portalSkin = config; + break; + } + } + assertNotNull(portalSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/Stylesheet.css", portalSkin.getCSSPath()); + + SkinConfig firstPortletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); + assertNotNull(firstPortletSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/portlet/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath()); + } + + public void testDeployedThemes() + { + + } + + public void testRenderLT_CSS() throws Exception + { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ResourceRenderer renderer = new MockResourceRenderer(out); + + skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-lt.css"); + + //TODO: Check the array of bytes in out + } + + public void testRenderRT_CSS() throws Exception + { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ResourceRenderer renderer = new MockResourceRenderer(out); + + skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-rt.css"); + + //TODO: Check the array of bytes in out + } + + public void testBackground() throws Exception + { + } + + public void testServiceCache() throws Exception + { + } + + public void testSkinPriority() throws Exception + { + } + + public void testUndeploySkinConfig() throws Exception + { + //TODO: Fork the work of GateInSkinConfigRemoval here + } + + /** + * Designed to invoke reflectively private methods of SkinService. That facilitate + * writting JUnit tests + * + * @param methodName + * @param arguments + */ + private void invokeMethodOfSkinService(String methodName, Object... arguments) + { + StringBuilder methodSignature = new StringBuilder(methodName); + Class<?>[] paramTypes = new Class<?>[arguments.length]; + for(int i =0; i < arguments.length; i++) + { + paramTypes[i] = arguments[i].getClass(); + methodSignature.append("_"); + methodSignature.append(paramTypes[i].getName()); + } + //First we look at the cache + Method method = methodsOfSkinService.get(methodSignature.toString()); + + //Find method by reflection + if(method == null) + { + try + { + method = skinService.getClass().getDeclaredMethod(methodName, paramTypes); + if(method != null) + { + method.setAccessible(true); + methodsOfSkinService.put(methodSignature.toString(), method); + } + else + { + return; + } + } + catch (NoSuchMethodException ex) + { + } + } + + try + { + if(Modifier.isStatic(method.getModifiers())) + { + method.invoke(null, arguments); + } + else + { + method.invoke(skinService, arguments); + } + } + catch(Exception ex) + { + ex.printStackTrace(); + } + } + + @Override + protected void tearDown() throws Exception + { + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-10-11 13:05:16 UTC (rev 7714) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -62,6 +62,7 @@ public void testFirstCSSFile() throws IOException { initiateReader("skin/test_1.css"); + skipCommentReader.setCommentBlockHandler(new CommentBlockHandler.OrientationCommentBlockHandler()); for(int i =0; i < 30; i++) { Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-10-11 13:05:16 UTC (rev 7714) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-10-11 15:18:28 UTC (rev 7715) @@ -29,6 +29,7 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.Parameter; import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.portal.resource.AbstractWebResourceTest; import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; @@ -50,8 +51,7 @@ * @version $Revision$ */ -@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml")}) -public class TestResourceCompressorService extends AbstractKernelTest +public class TestResourceCompressorService extends AbstractWebResourceTest { public void testInitializing() { Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml (from rev 6773, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/conf/skin-service-configuration.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.exoplatform.portal.resource.SkinService</key> + <type>org.exoplatform.portal.resource.SkinService</type> + </component> +</configuration> Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-06-29 04:55:29 UTC (rev 6773) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 15:18:28 UTC (rev 7715) @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<gatein-resources - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> - - <portal-skin> - <skin-name>TestSkin</skin-name> - <css-path>/skin/Stylesheet.css</css-path> - </portal-skin> - - <portlet-skin> - <application-name>mockwebapp</application-name> - <portlet-name>FirstPortlet</portlet-name> - <skin-name>TestSkin</skin-name> - <css-path>/skin/FirstPortlet/Stylesheet.css</css-path> - </portlet-skin> - -  - <window-style> - <style-name>Simple</style-name> - <style-theme> - <theme-name>SimpleBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>SimplePink</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>RoundConer</style-name> - <style-theme> - <theme-name>RoundConerBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerPink</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>Shadow</style-name> - <style-theme> - <theme-name>ShadowBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowPink</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>MacStyle</style-name> - <style-theme> - <theme-name>MacTheme</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGray</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGreenSteel</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>VistaStyle</style-name> - <style-theme> - <theme-name>VistaTheme</theme-name> - </style-theme> - </window-style> - -</gatein-resources> Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml (from rev 6773, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + + <portal-skin> + <skin-name>TestSkin</skin-name> + <css-path>/skin/Stylesheet.css</css-path> + </portal-skin> + + <portlet-skin> + <application-name>mockwebapp</application-name> + <portlet-name>FirstPortlet</portlet-name> + <skin-name>TestSkin</skin-name> + <css-path>/skin/portlet/FirstPortlet/Stylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + +</gatein-resources> Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-06-29 04:55:29 UTC (rev 6773) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -1,22 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -@import url(DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css); -@import url(DefaultSkin/webui/component/Stylesheet.css); -@import url(PortletThemes/Stylesheet.css); -@import url(Portlet/Stylesheet.css); Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css (from rev 6773, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,30 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.LeftBlock { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} +/* blah blah */ +aaaaaa +@import url(portal/TestSkin/Stylesheet.css); /* blah blah */ +bbbbbb +.RightBlock { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css 2011-06-29 10:23:05 UTC (rev 6775) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -1,21 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -.LeftBlock { - float: left; /* orientation=lt */ float: right; /* orientation=rt */ -} \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css (from rev 6775, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.LeftBlock { + float: left; /* orientation=lt */ float: right; /* orientation=rt */ +} \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css 2011-06-29 10:23:05 UTC (rev 6775) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -.LeftBlock { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} -/* blah blah */ -.RightBlock { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css (from rev 6775, portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css 2011-10-11 15:18:28 UTC (rev 7715) @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.LeftBlock { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} +/* blah blah */ +.RightBlock { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} \ No newline at end of file

13 years, 3 months

1
0
0 / 0

gatein SVN: r7714 - epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-10-11 09:05:16 -0400 (Tue, 11 Oct 2011) New Revision: 7714 Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java Log: JBEPP-1282 Fix URL encoding issue that causes trouble with latest PortletBridge Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2011-10-11 12:40:59 UTC (rev 7713) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2011-10-11 13:05:16 UTC (rev 7714) @@ -22,6 +22,7 @@ import org.exoplatform.Constants; import org.exoplatform.commons.utils.I18N; import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.web.url.MimeType; import org.exoplatform.web.url.PortalURL; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.url.ComponentURL; @@ -287,6 +288,10 @@ url.setConfirm(props.get("gtn:confirm")); // + MimeType mimeType = Boolean.TRUE.equals(format.getWantEscapeXML()) ? MimeType.XHTML : MimeType.PLAIN; + url.setMimeType(mimeType); + + // return url.toString(); } }

13 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits October 2011