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=&quot;hoang281283(a)gmail.com&quot;&gt;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=&quot;hoang281283(a)gmail.com&quot;&gt;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=&quot;hoang281283(a)gmail.com&quot;&gt;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=&quot;hoang281283(a)gmail.com&quot;&gt;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"?> +<!-- + + 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. + +--> + +<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"?> -<!-- - - 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. - ---> -<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> - - <!-- Simple window style --> - <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> - - <!-- RoundConer 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> - - <!-- Shadow 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> - - <!-- MacStyle 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> - - <!-- VistaStyle 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"?> +<!-- + + 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. + +--> +<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> + + <!-- Simple window style --> + <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> + + <!-- RoundConer 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> + + <!-- Shadow 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> + + <!-- MacStyle 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> + + <!-- VistaStyle 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