[gatein-commits] gatein SVN: r6817 - in portal/trunk/component/web/resources/src/test: resources/conf and 1 other directory.

Author: hoang_to Date: 2011-07-04 22:04:44 -0400 (Mon, 04 Jul 2011) New Revision: 6817 Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml Log: Fix failure of TestSkinService due to duplicated config of resource compressor Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-04 16:16:04 UTC (rev 6816) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-05 02:04:44 UTC (rev 6817) @@ -41,7 +41,8 @@ */ @ConfiguredBy( { - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") , + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml") } ) public class TestSkinService extends AbstractKernelTest Modified: portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-07-04 16:16:04 UTC (rev 6816) +++ portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-07-05 02:04:44 UTC (rev 6817) @@ -26,52 +26,6 @@ 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> - - <component> <key>org.exoplatform.portal.resource.SkinService</key> <type>org.exoplatform.portal.resource.SkinService</type> </component>