Author: chris.laprun(a)jboss.com Date: 2009-10-30 15:05:32 -0400 (Fri, 30 Oct 2009) New Revision: 464 Added: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java portal/branches/wsrp-integration/packaging/profiles.xml.template Removed: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/skin/ portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/conf/script/ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/WEB-INF/conf/script/ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/conf/script/ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/script/groovy/SkinConfigScript.groovy Modified: portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/configuration.xml portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java portal/branches/wsrp-integration/packaging/profiles.xml portal/branches/wsrp-integration/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_ru.properties portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_uk.properties portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: - Merge changes from trunk revision 441 to 462. Modified: portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/configuration.xml 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/configuration.xml 2009-10-30 19:05:32 UTC (rev 464) @@ -90,7 +90,7 @@ </component> <component> - <type>org.exoplatform.portal.skin.SkinService</type> + <type>org.exoplatform.portal.resource.SkinService</type> </component> <external-component-plugins> Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource) Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,38 +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.portal.resource; - -import org.gatein.wci.WebAppEvent; -import org.gatein.wci.WebAppListener; - -/** - * - * Created by eXoPlatform SAS - * - * Author: Minh Hoang TO - hoang281283(a)gmail.com - * - * Sep 16, 2009 - */ -public abstract class AbstractResourceHandler implements WebAppListener -{ - - abstract public void onEvent(WebAppEvent event); - -} \ No newline at end of file Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/AbstractResourceHandler.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,38 @@ +/** + * 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.wci.WebAppEvent; +import org.gatein.wci.WebAppListener; + +/** + * + * Created by eXoPlatform SAS + * + * Author: Minh Hoang TO - hoang281283(a)gmail.com + * + * Sep 16, 2009 + */ +public abstract class AbstractResourceHandler implements WebAppListener +{ + + abstract public void onEvent(WebAppEvent event); + +} \ No newline at end of file Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,111 +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.portal.resource; - -import org.exoplatform.commons.utils.CharEncoder; -import org.exoplatform.commons.utils.CharsetCharEncoder; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; - -/** - * A codec for names. It is a modified version of the percent encoding algorithm that translates - * underscores to their percent counterpart and slash to underscores. Therefore slash chars are - * never seen as the %2F string as it can cause some issues on tomcat when it is used in an URI. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class Codec -{ - - private Codec() - { - } - - private static final char[][] table = new char[256][]; - - static - { - char[] a = "0123456789ABCDEF".toCharArray(); - for (int b = 0; b < 256; b++) - { - int b1 = (b & 0xF0) >> 4; - int b2 = b & 0x0F; - table[b] = new char[]{a[b1], a[b2]}; - } - } - - public static String decode(String s) - { - try - { - s = s.replace("_", "%2F"); - return URLDecoder.decode(s, "UTF8"); - } - catch (UnsupportedEncodingException e) - { - throw new Error(e); - } - } - - public static void encode(Appendable appendable, String s) throws IOException - { - for (int i = 0; i < s.length(); i++) - { - char c = s.charAt(i); - if (Character.isLetter(c)) - { - appendable.append(c); - } - else - { - switch (c) - { - case 'A' : - case '.' : - case '-' : - case '*' : - appendable.append(c); - break; - case ' ' : - appendable.append('+'); - break; - case '/' : - appendable.append('_'); - break; - default : - CharEncoder encoder = CharsetCharEncoder.getUTF8(); - byte[] bytes = encoder.encode(c); - appendable.append('%'); - for (byte b : bytes) - { - for (char cc : table[b]) - { - appendable.append(cc); - } - } - } - } - } - } - -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Codec.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,111 @@ +/** + * 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.exoplatform.commons.utils.CharEncoder; +import org.exoplatform.commons.utils.CharsetCharEncoder; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + +/** + * A codec for names. It is a modified version of the percent encoding algorithm that translates + * underscores to their percent counterpart and slash to underscores. Therefore slash chars are + * never seen as the %2F string as it can cause some issues on tomcat when it is used in an URI. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class Codec +{ + + private Codec() + { + } + + private static final char[][] table = new char[256][]; + + static + { + char[] a = "0123456789ABCDEF".toCharArray(); + for (int b = 0; b < 256; b++) + { + int b1 = (b & 0xF0) >> 4; + int b2 = b & 0x0F; + table[b] = new char[]{a[b1], a[b2]}; + } + } + + public static String decode(String s) + { + try + { + s = s.replace("_", "%2F"); + return URLDecoder.decode(s, "UTF8"); + } + catch (UnsupportedEncodingException e) + { + throw new Error(e); + } + } + + public static void encode(Appendable appendable, String s) throws IOException + { + for (int i = 0; i < s.length(); i++) + { + char c = s.charAt(i); + if (Character.isLetter(c)) + { + appendable.append(c); + } + else + { + switch (c) + { + case 'A' : + case '.' : + case '-' : + case '*' : + appendable.append(c); + break; + case ' ' : + appendable.append('+'); + break; + case '/' : + appendable.append('_'); + break; + default : + CharEncoder encoder = CharsetCharEncoder.getUTF8(); + byte[] bytes = encoder.encode(c); + appendable.append('%'); + for (byte b : bytes) + { + for (char cc : table[b]) + { + appendable.append(cc); + } + } + } + } + } + } + +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,80 +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.portal.resource; - -import java.io.Reader; -import java.io.StringReader; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class CompositeResourceResolver implements ResourceResolver -{ - - /** . */ - private final Map<SkinKey, SkinConfig> skins; - - /** - * The name of the portal container - */ - private final String portalContainerName; - - public CompositeResourceResolver(String portalContainerName, Map<SkinKey, SkinConfig> skins) - { - this.portalContainerName = portalContainerName; - this.skins = skins; - } - - public Resource resolve(String path) - { - if (path.startsWith("/" + portalContainerName + "/resource/") && path.endsWith(".css")) - { - final StringBuffer sb = new StringBuffer(); - String encoded = path.substring(("/" + portalContainerName + "/resource/").length()); - String blah[] = encoded.split("/"); - int len = (blah.length >> 1) << 1; - for (int i = 0; i < len; i += 2) - { - String name = Codec.decode(blah[i]); - String module = Codec.decode(blah[i + 1]); - SkinKey key = new SkinKey(module, name); - SkinConfig skin = skins.get(key); - if (skin != null) - { - sb.append("@import url(").append(skin.getCSSPath()).append(");").append("\n"); - } - } - return new Resource(path) - { - @Override - public Reader read() - { - return new StringReader(sb.toString()); - } - }; - } - else - { - return null; - } - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -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 java.io.Reader; +import java.io.StringReader; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class CompositeResourceResolver implements ResourceResolver +{ + + /** . */ + private final Map<SkinKey, SkinConfig> skins; + + /** + * The name of the portal container + */ + private final String portalContainerName; + + public CompositeResourceResolver(String portalContainerName, Map<SkinKey, SkinConfig> skins) + { + this.portalContainerName = portalContainerName; + this.skins = skins; + } + + public Resource resolve(String path) + { + if (path.startsWith("/" + portalContainerName + "/resource/") && path.endsWith(".css")) + { + final StringBuffer sb = new StringBuffer(); + String encoded = path.substring(("/" + portalContainerName + "/resource/").length()); + String blah[] = encoded.split("/"); + int len = (blah.length >> 1) << 1; + for (int i = 0; i < len; i += 2) + { + String name = Codec.decode(blah[i]); + String module = Codec.decode(blah[i + 1]); + SkinKey key = new SkinKey(module, name); + SkinConfig skin = skins.get(key); + if (skin != null) + { + sb.append("@import url(").append(skin.getCSSPath()).append(");").append("\n"); + } + } + return new Resource(path) + { + @Override + public Reader read() + { + return new StringReader(sb.toString()); + } + }; + } + else + { + return null; + } + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,113 +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.portal.resource; - -import org.exoplatform.commons.utils.PropertyManager; -import org.exoplatform.services.resources.Orientation; - -import java.io.IOException; -import java.util.Collection; -import java.util.TreeMap; - -/** - * A composite skin. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class CompositeSkin implements Skin -{ - - /** . */ - private final SkinService service; - - /** . */ - private final String id; - - /** . */ - private final String urlPrefix; - - CompositeSkin(SkinService service, Collection<SkinConfig> skins) - { - TreeMap<String, SkinConfig> urlSkins = new TreeMap<String, SkinConfig>(); - for (SkinConfig skin : skins) - { - urlSkins.put(skin.getCSSPath(), skin); - } - - // - final StringBuilder builder = new StringBuilder(); - builder.append("/").append(service.portalContainerName).append("/resource"); - - // - final StringBuilder id = new StringBuilder(); - - // - try - { - for (SkinConfig cfg : urlSkins.values()) - { - StringBuilder encodedName = new StringBuilder(); - Codec.encode(encodedName, cfg.getName()); - StringBuilder encodedModule = new StringBuilder(); - Codec.encode(encodedModule, cfg.getModule()); - - // - id.append(encodedName).append(encodedModule); - builder.append("/").append(encodedName).append("/").append(encodedModule); - } - } - catch (IOException e) - { - throw new Error(e); - } - - // - this.service = service; - this.id = id.toString(); - this.urlPrefix = builder.toString(); - } - - public String getId() - { - return id; - } - - public SkinURL createURL() - { - return new SkinURL() - { - - Orientation orientation; - - public void setOrientation(Orientation orientation) - { - this.orientation = orientation; - } - - @Override - public String toString() - { - return urlPrefix + "/" + (PropertyManager.isDevelopping() ? "style" : service.id) - + service.getSuffix(orientation); - } - }; - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,113 @@ +/** + * 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.exoplatform.commons.utils.PropertyManager; +import org.exoplatform.services.resources.Orientation; + +import java.io.IOException; +import java.util.Collection; +import java.util.TreeMap; + +/** + * A composite skin. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class CompositeSkin implements Skin +{ + + /** . */ + private final SkinService service; + + /** . */ + private final String id; + + /** . */ + private final String urlPrefix; + + CompositeSkin(SkinService service, Collection<SkinConfig> skins) + { + TreeMap<String, SkinConfig> urlSkins = new TreeMap<String, SkinConfig>(); + for (SkinConfig skin : skins) + { + urlSkins.put(skin.getCSSPath(), skin); + } + + // + final StringBuilder builder = new StringBuilder(); + builder.append("/").append(service.portalContainerName).append("/resource"); + + // + final StringBuilder id = new StringBuilder(); + + // + try + { + for (SkinConfig cfg : urlSkins.values()) + { + StringBuilder encodedName = new StringBuilder(); + Codec.encode(encodedName, cfg.getName()); + StringBuilder encodedModule = new StringBuilder(); + Codec.encode(encodedModule, cfg.getModule()); + + // + id.append(encodedName).append(encodedModule); + builder.append("/").append(encodedName).append("/").append(encodedModule); + } + } + catch (IOException e) + { + throw new Error(e); + } + + // + this.service = service; + this.id = id.toString(); + this.urlPrefix = builder.toString(); + } + + public String getId() + { + return id; + } + + public SkinURL createURL() + { + return new SkinURL() + { + + Orientation orientation; + + public void setOrientation(Orientation orientation) + { + this.orientation = orientation; + } + + @Override + public String toString() + { + return urlPrefix + "/" + (PropertyManager.isDevelopping() ? "style" : service.id) + + service.getSuffix(orientation); + } + }; + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,133 +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.portal.resource; - -import org.exoplatform.container.PortalContainer; -import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; -import org.exoplatform.portal.resource.config.xml.SkinConfigParser; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.gatein.wci.WebAppEvent; -import org.gatein.wci.WebAppLifeCycleEvent; - -import java.io.IOException; -import java.io.InputStream; - -import javax.servlet.ServletContext; - -/** - * - * Created by eXoPlatform SAS - * - * Author: Minh Hoang TO - hoang281283(a)gmail.com - * - * Sep 16, 2009 - */ -public class GateinSkinConfigDeployer extends AbstractResourceHandler -{ - - private final SkinService skinService; - - private static final String GATEIN_CONFIG_RESOURCE = "/WEB-INF/gatein-resources.xml"; - - private static Log LOG = ExoLogger.getExoLogger(GateinSkinConfigDeployer.class); - - /** - * The name of the portal container - */ - private final String portalContainerName; - - public GateinSkinConfigDeployer(String portalContainerName, SkinService _skinService) - { - this.skinService = _skinService; - this.portalContainerName = portalContainerName; - } - - @Override - public void onEvent(WebAppEvent event) - { - if (event instanceof WebAppLifeCycleEvent) - { - WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; - if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) - { - ServletContext scontext = null; - try - { - scontext = event.getWebApp().getServletContext(); - InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); - if (is == null) - return; - try - { - is.close(); - } - catch (Exception ex) - { - // ignore me - } - final PortalContainerPostInitTask task = new PortalContainerPostInitTask() - { - - public void execute(ServletContext scontext, PortalContainer portalContainer) - { - register(scontext, portalContainer); - } - }; - PortalContainer.addInitTask(scontext, task, portalContainerName); - } - catch (Exception ex) - { - LOG.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" - + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); - } - } - } - } - - private void register(ServletContext scontext, PortalContainer container) - { - InputStream is = null; - try - { - is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); - SkinConfigParser.processConfigResource(is, skinService, scontext); - } - catch (Exception ex) - { - LOG.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" - + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); - } - finally - { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - // ignore me - } - } - } - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/GateinSkinConfigDeployer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,132 @@ +/** + * 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.exoplatform.container.PortalContainer; +import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; +import org.exoplatform.portal.resource.config.xml.SkinConfigParser; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; + +import javax.servlet.ServletContext; +import java.io.IOException; +import java.io.InputStream; + +/** + * + * Created by eXoPlatform SAS + * + * Author: Minh Hoang TO - hoang281283(a)gmail.com + * + * Sep 16, 2009 + */ +public class GateinSkinConfigDeployer extends AbstractResourceHandler +{ + + private final SkinService skinService; + + private static final String GATEIN_CONFIG_RESOURCE = "/WEB-INF/gatein-resources.xml"; + + private static Log LOG = ExoLogger.getExoLogger(GateinSkinConfigDeployer.class); + + /** + * The name of the portal container + */ + private final String portalContainerName; + + public GateinSkinConfigDeployer(String portalContainerName, SkinService _skinService) + { + this.skinService = _skinService; + this.portalContainerName = portalContainerName; + } + + @Override + public void onEvent(WebAppEvent event) + { + if (event instanceof WebAppLifeCycleEvent) + { + WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; + if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) + { + ServletContext scontext = null; + try + { + scontext = event.getWebApp().getServletContext(); + InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); + if (is == null) + return; + try + { + is.close(); + } + catch (Exception ex) + { + // ignore me + } + final PortalContainerPostInitTask task = new PortalContainerPostInitTask() + { + + public void execute(ServletContext scontext, PortalContainer portalContainer) + { + register(scontext, portalContainer); + } + }; + PortalContainer.addInitTask(scontext, task, portalContainerName); + } + catch (Exception ex) + { + LOG.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" + + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); + } + } + } + } + + private void register(ServletContext scontext, PortalContainer container) + { + InputStream is = null; + try + { + is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); + SkinConfigParser.processConfigResource(is, skinService, scontext); + } + catch (Exception ex) + { + LOG.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" + + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); + } + finally + { + if (is != null) + { + try + { + is.close(); + } + catch (IOException e) + { + // ignore me + } + } + } + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,80 +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.portal.resource; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArrayList; - -import javax.servlet.ServletContext; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class MainResourceResolver implements ResourceResolver -{ - - final Map<String, SimpleResourceContext> contexts; - - final CopyOnWriteArrayList<ResourceResolver> resolvers; - - final Map<SkinKey, SkinConfig> skins; - - public MainResourceResolver(String portalContainerName, Map<SkinKey, SkinConfig> skins) - { - this.skins = skins; - this.contexts = new HashMap<String, SimpleResourceContext>(); - this.resolvers = new CopyOnWriteArrayList<ResourceResolver>(); - - // - resolvers.add(new CompositeResourceResolver(portalContainerName, skins)); - } - - SimpleResourceContext registerContext(ServletContext servletContext) - { - String key = "/" + servletContext.getServletContextName(); - SimpleResourceContext ctx = contexts.get(key); - if (ctx == null) - { - ctx = new SimpleResourceContext(key, servletContext); - contexts.put(ctx.getContextPath(), ctx); - } - return ctx; - } - - public Resource resolve(String path) - { - for (ResourceResolver resolver : resolvers) - { - Resource res = resolver.resolve(path); - if (res != null) - { - return res; - } - } - - // - int i1 = path.indexOf("/", 2); - String targetedContextPath = path.substring(0, i1); - SimpleResourceContext context = contexts.get(targetedContextPath); - return context.getResource(path.substring(i1)); - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,79 @@ +/** + * 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 javax.servlet.ServletContext; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class MainResourceResolver implements ResourceResolver +{ + + final Map<String, SimpleResourceContext> contexts; + + final CopyOnWriteArrayList<ResourceResolver> resolvers; + + final Map<SkinKey, SkinConfig> skins; + + public MainResourceResolver(String portalContainerName, Map<SkinKey, SkinConfig> skins) + { + this.skins = skins; + this.contexts = new HashMap<String, SimpleResourceContext>(); + this.resolvers = new CopyOnWriteArrayList<ResourceResolver>(); + + // + resolvers.add(new CompositeResourceResolver(portalContainerName, skins)); + } + + SimpleResourceContext registerContext(ServletContext servletContext) + { + String key = "/" + servletContext.getServletContextName(); + SimpleResourceContext ctx = contexts.get(key); + if (ctx == null) + { + ctx = new SimpleResourceContext(key, servletContext); + contexts.put(ctx.getContextPath(), ctx); + } + return ctx; + } + + public Resource resolve(String path) + { + for (ResourceResolver resolver : resolvers) + { + Resource res = resolver.resolve(path); + if (res != null) + { + return res; + } + } + + // + int i1 = path.indexOf("/", 2); + String targetedContextPath = path.substring(0, i1); + SimpleResourceContext context = contexts.get(targetedContextPath); + return context.getResource(path.substring(i1)); + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,49 +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.portal.resource; - -/** - * Signal an exception during rendering. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class RenderingException extends Exception -{ - - public RenderingException() - { - } - - public RenderingException(String message) - { - super(message); - } - - public RenderingException(String message, Throwable cause) - { - super(message, cause); - } - - public RenderingException(Throwable cause) - { - super(cause); - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/RenderingException.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,49 @@ +/** + * 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; + +/** + * Signal an exception during rendering. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class RenderingException extends Exception +{ + + public RenderingException() + { + } + + public RenderingException(String message) + { + super(message); + } + + public RenderingException(String message, Throwable cause) + { + super(message, cause); + } + + public RenderingException(Throwable cause) + { + super(cause); + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,85 +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.portal.resource; - -import java.io.IOException; -import java.io.Reader; - -/** - * Represents a resource. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public abstract class Resource -{ - - private final String contextPath; - - private final String parentPath; - - private final String fileName; - - public Resource(String path) - { - int index = path.indexOf("/", 2); - String relativeCSSPath = path.substring(index); - int index2 = relativeCSSPath.lastIndexOf("/") + 1; - - // - this.contextPath = path.substring(0, index); - this.parentPath = relativeCSSPath.substring(0, index2); - this.fileName = relativeCSSPath.substring(index2); - } - - public Resource(String contextPath, String parentPath, String fileName) - { - this.contextPath = contextPath; - this.parentPath = parentPath; - this.fileName = fileName; - } - - public final String getPath() - { - return getContextPath() + getParentPath() + getFileName(); - } - - public final String getContextPath() - { - return contextPath; - } - - public final String getParentPath() - { - return parentPath; - } - - public final String getFileName() - { - return fileName; - } - - public final String getResourcePath() - { - return getParentPath() + getFileName(); - } - - public abstract Reader read() throws IOException; -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Resource.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,85 @@ +/** + * 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 java.io.IOException; +import java.io.Reader; + +/** + * Represents a resource. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public abstract class Resource +{ + + private final String contextPath; + + private final String parentPath; + + private final String fileName; + + public Resource(String path) + { + int index = path.indexOf("/", 2); + String relativeCSSPath = path.substring(index); + int index2 = relativeCSSPath.lastIndexOf("/") + 1; + + // + this.contextPath = path.substring(0, index); + this.parentPath = relativeCSSPath.substring(0, index2); + this.fileName = relativeCSSPath.substring(index2); + } + + public Resource(String contextPath, String parentPath, String fileName) + { + this.contextPath = contextPath; + this.parentPath = parentPath; + this.fileName = fileName; + } + + public final String getPath() + { + return getContextPath() + getParentPath() + getFileName(); + } + + public final String getContextPath() + { + return contextPath; + } + + public final String getParentPath() + { + return parentPath; + } + + public final String getFileName() + { + return fileName; + } + + public final String getResourcePath() + { + return getParentPath() + getFileName(); + } + + public abstract Reader read() throws IOException; +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,47 +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.portal.resource; - -/** - * An interface defining the renderer contract for a resource. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface ResourceRenderer -{ - - /** - * Returns an appendable for the performing the rendering of the resource. - * - * @return the appendable - */ - Appendable getAppendable(); - - /** - * Instruct the renderer about the expiration time in seconds. A non positive value - * means that no caching should be performed. The expiration value is relative to the - * date of the request. - * - * @param seconds the value in seconds - */ - void setExpiration(long seconds); - -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceRenderer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,47 @@ +/** + * 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; + +/** + * An interface defining the renderer contract for a resource. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface ResourceRenderer +{ + + /** + * Returns an appendable for the performing the rendering of the resource. + * + * @return the appendable + */ + Appendable getAppendable(); + + /** + * Instruct the renderer about the expiration time in seconds. A non positive value + * means that no caching should be performed. The expiration value is relative to the + * date of the request. + * + * @param seconds the value in seconds + */ + void setExpiration(long seconds); + +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,39 +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.portal.resource; - -/** - * A resource resolver for char based resources. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface ResourceResolver -{ - - /** - * Returns a reader for the provided path or null if the resource cannot be resolved. - * - * @param path the path - * @return a reader - */ - Resource resolve(String path); - -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceResolver.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,39 @@ +/** + * 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; + +/** + * A resource resolver for char based resources. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface ResourceResolver +{ + + /** + * Returns a reader for the provided path or null if the resource cannot be resolved. + * + * @param path the path + * @return a reader + */ + Resource resolve(String path); + +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,78 +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.portal.resource; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.servlet.ServletContext; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class SimpleResourceContext -{ - - private final String contextPath; - - private final ServletContext context; - - public SimpleResourceContext(String contextPath, ServletContext context) - { - this.contextPath = contextPath; - this.context = context; - } - - public Resource getResource(String path) - { - int i2 = path.lastIndexOf("/") + 1; - String targetedParentPath = path.substring(0, i2); - String targetedFileName = path.substring(i2); - try - { - final URL url = context.getResource(path); - if (url != null) - { - return new Resource(contextPath, targetedParentPath, targetedFileName) - { - @Override - public Reader read() throws IOException - { - return new InputStreamReader(url.openStream()); - } - }; - } - } - catch (MalformedURLException e) - { - e.printStackTrace(); - } - return null; - } - - public String getContextPath() - { - return contextPath; - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleResourceContext.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,77 @@ +/** + * 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 javax.servlet.ServletContext; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class SimpleResourceContext +{ + + private final String contextPath; + + private final ServletContext context; + + public SimpleResourceContext(String contextPath, ServletContext context) + { + this.contextPath = contextPath; + this.context = context; + } + + public Resource getResource(String path) + { + int i2 = path.lastIndexOf("/") + 1; + String targetedParentPath = path.substring(0, i2); + String targetedFileName = path.substring(i2); + try + { + final URL url = context.getResource(path); + if (url != null) + { + return new Resource(contextPath, targetedParentPath, targetedFileName) + { + @Override + public Reader read() throws IOException + { + return new InputStreamReader(url.openStream()); + } + }; + } + } + catch (MalformedURLException e) + { + e.printStackTrace(); + } + return null; + } + + public String getContextPath() + { + return contextPath; + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,91 +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.portal.resource; - -import org.exoplatform.services.resources.Orientation; - -/** - * An implementation of the skin config. - * - * Created by The eXo Platform SAS - * Jan 19, 2007 - */ -class SimpleSkin implements SkinConfig -{ - - private final SkinService service_; - - private final String module_; - - private final String name_; - - private final String cssPath_; - - private final String id_; - - public SimpleSkin(SkinService service, String module, String name, String cssPath) - { - service_ = service; - module_ = module; - name_ = name; - cssPath_ = cssPath; - id_ = module.replace('/', '_'); - } - - public String getId() - { - return id_; - } - - public String getModule() - { - return module_; - } - - public String getCSSPath() - { - return cssPath_; - } - - public String getName() - { - return name_; - } - - public SkinURL createURL() - { - return new SkinURL() - { - - Orientation orientation = null; - - public void setOrientation(Orientation orientation) - { - this.orientation = orientation; - } - - @Override - public String toString() - { - return cssPath_.replaceAll("\\.css$", service_.getSuffix(orientation)); - } - }; - } -} \ No newline at end of file Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,91 @@ +/** + * 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.exoplatform.services.resources.Orientation; + +/** + * An implementation of the skin config. + * + * Created by The eXo Platform SAS + * Jan 19, 2007 + */ +class SimpleSkin implements SkinConfig +{ + + private final SkinService service_; + + private final String module_; + + private final String name_; + + private final String cssPath_; + + private final String id_; + + public SimpleSkin(SkinService service, String module, String name, String cssPath) + { + service_ = service; + module_ = module; + name_ = name; + cssPath_ = cssPath; + id_ = module.replace('/', '_'); + } + + public String getId() + { + return id_; + } + + public String getModule() + { + return module_; + } + + public String getCSSPath() + { + return cssPath_; + } + + public String getName() + { + return name_; + } + + public SkinURL createURL() + { + return new SkinURL() + { + + Orientation orientation = null; + + public void setOrientation(Orientation orientation) + { + this.orientation = orientation; + } + + @Override + public String toString() + { + return cssPath_.replaceAll("\\.css$", service_.getSuffix(orientation)); + } + }; + } +} \ No newline at end of file Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,45 +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.portal.resource; - -/** - * A skin. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface Skin -{ - - /** - * Returns the skin id. - * - * @return the skin id - */ - String getId(); - - /** - * Creates and return a skin URL. - * - * @return the skin URL - */ - SkinURL createURL(); - -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/Skin.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,45 @@ +/** + * 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; + +/** + * A skin. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface Skin +{ + + /** + * Returns the skin id. + * + * @return the skin id + */ + String getId(); + + /** + * Creates and return a skin URL. + * + * @return the skin URL + */ + SkinURL createURL(); + +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,52 +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.portal.resource; - -/** - * Extends a skin with additional information. - * - * Created by The eXo Platform SAS - * Jan 19, 2007 - */ -public interface SkinConfig extends Skin -{ - - /** - * Returns the skin name - * - * @return the skin name - */ - String getName(); - - /** - * Returns the skin module. - * - * @return the module - */ - String getModule(); - - /** - * Returns the css path. - * - * @return the css path - */ - String getCSSPath(); - -} \ No newline at end of file Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfig.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,52 @@ +/** + * 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; + +/** + * Extends a skin with additional information. + * + * Created by The eXo Platform SAS + * Jan 19, 2007 + */ +public interface SkinConfig extends Skin +{ + + /** + * Returns the skin name + * + * @return the skin name + */ + String getName(); + + /** + * Returns the skin module. + * + * @return the module + */ + String getModule(); + + /** + * Returns the css path. + * + * @return the css path + */ + String getCSSPath(); + +} \ No newline at end of file Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,139 +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.portal.resource; - -import groovy.lang.Binding; -import groovy.lang.GroovyShell; - -import org.exoplatform.container.PortalContainer; -import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.gatein.wci.WebAppEvent; -import org.gatein.wci.WebAppLifeCycleEvent; - -import java.io.IOException; -import java.io.InputStream; - -import javax.servlet.ServletContext; - -/** - * Created by The eXo Platform SAS - * Jan 19, 2007 - */ - -public class SkinConfigDeployer extends AbstractResourceHandler -{ - - /** - * Logger - */ - private static final Log LOG = ExoLogger.getLogger(SkinConfigDeployer.class); - - /** . */ - private final SkinService skinService; - - /** - * The name of the portal container - */ - private final String portalContainerName; - - public SkinConfigDeployer(String portalContainerName, SkinService skinService) - { - this.skinService = skinService; - this.portalContainerName = portalContainerName; - } - - public void onEvent(WebAppEvent event) - { - if (event instanceof WebAppLifeCycleEvent) - { - WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; - if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) - { - ServletContext scontext = null; - try - { - scontext = event.getWebApp().getServletContext(); - InputStream is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/SkinConfigScript.groovy"); - if (is == null) - return; - try - { - is.close(); - } - catch (Exception ex) - { - // ignore me - } - final PortalContainerPostInitTask task = new PortalContainerPostInitTask() - { - - public void execute(ServletContext scontext, PortalContainer portalContainer) - { - register(scontext, portalContainer); - } - }; - PortalContainer.addInitTask(scontext, task, portalContainerName); - } - catch (Exception ex) - { - LOG.error("An error occurs while registering 'SkinConfigScript.groovy' from the context '" - + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); - } - } - } - } - - private void register(ServletContext scontext, PortalContainer container) - { - InputStream is = null; - try - { - is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/SkinConfigScript.groovy"); - Binding binding = new Binding(); - binding.setVariable("SkinService", skinService); - binding.setVariable("ServletContext", scontext); - binding.setVariable("ServletContextName", scontext.getServletContextName()); - binding.setVariable("PortalContainerName", container.getName()); - GroovyShell shell = new GroovyShell(binding); - shell.evaluate(is); - } - catch (Exception ex) - { - LOG.error("An error occurs while processing 'SkinConfigScript.groovy' from the context '" - + scontext.getServletContextName() + "'", ex); - } - finally - { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - // ignore me - } - } - } - } -} \ No newline at end of file Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinConfigDeployer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,137 @@ +/** + * 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 groovy.lang.Binding; +import groovy.lang.GroovyShell; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; + +import javax.servlet.ServletContext; +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by The eXo Platform SAS + * Jan 19, 2007 + */ + +public class SkinConfigDeployer extends AbstractResourceHandler +{ + + /** + * Logger + */ + private static final Log LOG = ExoLogger.getLogger(SkinConfigDeployer.class); + + /** . */ + private final SkinService skinService; + + /** + * The name of the portal container + */ + private final String portalContainerName; + + public SkinConfigDeployer(String portalContainerName, SkinService skinService) + { + this.skinService = skinService; + this.portalContainerName = portalContainerName; + } + + public void onEvent(WebAppEvent event) + { + if (event instanceof WebAppLifeCycleEvent) + { + WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; + if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) + { + ServletContext scontext = null; + try + { + scontext = event.getWebApp().getServletContext(); + InputStream is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/SkinConfigScript.groovy"); + if (is == null) + return; + try + { + is.close(); + } + catch (Exception ex) + { + // ignore me + } + final PortalContainerPostInitTask task = new PortalContainerPostInitTask() + { + + public void execute(ServletContext scontext, PortalContainer portalContainer) + { + register(scontext, portalContainer); + } + }; + PortalContainer.addInitTask(scontext, task, portalContainerName); + } + catch (Exception ex) + { + LOG.error("An error occurs while registering 'SkinConfigScript.groovy' from the context '" + + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); + } + } + } + } + + private void register(ServletContext scontext, PortalContainer container) + { + InputStream is = null; + try + { + is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/SkinConfigScript.groovy"); + Binding binding = new Binding(); + binding.setVariable("SkinService", skinService); + binding.setVariable("ServletContext", scontext); + binding.setVariable("ServletContextName", scontext.getServletContextName()); + binding.setVariable("PortalContainerName", container.getName()); + GroovyShell shell = new GroovyShell(binding); + shell.evaluate(is); + } + catch (Exception ex) + { + LOG.error("An error occurs while processing 'SkinConfigScript.groovy' from the context '" + + scontext.getServletContextName() + "'", ex); + } + finally + { + if (is != null) + { + try + { + is.close(); + } + catch (IOException e) + { + // ignore me + } + } + } + } +} \ No newline at end of file Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,98 +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.portal.resource; - -/** - * A key for skin config lookup. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -class SkinKey -{ - - private final String module; - - private final String name; - - private final int hashCode; - - /** - * Creates a new skin key. - * - * @param module the skin base - * @param name the skin name - * @throws IllegalArgumentException if any argument is null - */ - public SkinKey(String module, String name) throws IllegalArgumentException - { - if (module == null) - { - throw new IllegalArgumentException("No null base accepted"); - } - if (name == null) - { - throw new IllegalArgumentException("No null skin name accepted"); - } - - // - this.module = module; - this.name = name; - this.hashCode = module.hashCode() * 41 + name.hashCode(); - } - - public String getModule() - { - return module; - } - - public String getName() - { - return name; - } - - public int hashCode() - { - return hashCode; - } - - public boolean equals(Object obj) - { - if (obj == null) - { - return false; - } - if (obj == this) - { - return true; - } - if (obj instanceof SkinKey) - { - SkinKey that = (SkinKey)obj; - return that.module.equals(module) && that.name.equals(name); - } - return false; - } - - public String toString() - { - return "SkinKey[base=" + module + ",name=" + name + "]"; - } -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinKey.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,98 @@ +/** + * 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; + +/** + * A key for skin config lookup. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class SkinKey +{ + + private final String module; + + private final String name; + + private final int hashCode; + + /** + * Creates a new skin key. + * + * @param module the skin base + * @param name the skin name + * @throws IllegalArgumentException if any argument is null + */ + public SkinKey(String module, String name) throws IllegalArgumentException + { + if (module == null) + { + throw new IllegalArgumentException("No null base accepted"); + } + if (name == null) + { + throw new IllegalArgumentException("No null skin name accepted"); + } + + // + this.module = module; + this.name = name; + this.hashCode = module.hashCode() * 41 + name.hashCode(); + } + + public String getModule() + { + return module; + } + + public String getName() + { + return name; + } + + public int hashCode() + { + return hashCode; + } + + public boolean equals(Object obj) + { + if (obj == null) + { + return false; + } + if (obj == this) + { + return true; + } + if (obj instanceof SkinKey) + { + SkinKey that = (SkinKey)obj; + return that.module.equals(module) && that.name.equals(name); + } + return false; + } + + public String toString() + { + return "SkinKey[base=" + module + ",name=" + name + "]"; + } +} Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,557 +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.portal.resource; - -import org.exoplatform.commons.utils.PropertyManager; -import org.exoplatform.commons.utils.Safe; -import org.exoplatform.container.ExoContainerContext; -import org.exoplatform.management.annotations.Managed; -import org.exoplatform.management.annotations.ManagedDescription; -import org.exoplatform.management.annotations.ManagedName; -import org.exoplatform.management.jmx.annotations.NameTemplate; -import org.exoplatform.management.jmx.annotations.Property; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.services.resources.Orientation; -import org.gatein.wci.impl.DefaultServletContainerFactory; -import org.picocontainer.Startable; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.ServletContext; - -@Managed -@NameTemplate({@Property(key = "view", value = "portal"), @Property(key = "service", value = "management"), - @Property(key = "type", value = "skin")}) -@ManagedDescription("Skin service") -public class SkinService implements Startable -{ - - protected static Log log = ExoLogger.getLogger("portal.SkinService"); - - private static final Map<Orientation, String> suffixMap = new EnumMap<Orientation, String>(Orientation.class); - - static - { - suffixMap.put(Orientation.LT, "-lt.css"); - suffixMap.put(Orientation.RT, "-rt.css"); - suffixMap.put(Orientation.TL, "-lt.css"); - suffixMap.put(Orientation.TR, "-lt.css"); - } - - private static final String LEFT_P = "\\("; - - private static final String RIGHT_P = "\\)"; - - /** Immutable and therefore thread safe. */ - private static final Pattern IMPORT_PATTERN = - Pattern.compile("(@import\\s+" + "url" + LEFT_P + "['\"]?" + ")([^'\"]+.css)(" + "['\"]?" + RIGHT_P + "\\s*;)"); - - /** Immutable and therefore thread safe. */ - private static final Pattern BACKGROUND_PATTERN = - Pattern.compile("(background.*:.*url" + LEFT_P + "['\"]?" + ")([^'\"]+)(" + "['\"]?" + RIGHT_P + ".*;)"); - - /** Immutable and therefore thread safe. */ - private static final Pattern LT = Pattern.compile("/\\*\\s*orientation=lt\\s*\\*/"); - - /** Immutable and therefore thread safe. */ - private static final Pattern RT = Pattern.compile("/\\*\\s*orientation=rt\\s*\\*/"); - - /** One month caching. */ - private static final int ONE_MONTH = 2592000; - - /** One hour caching. */ - private static final int ONE_HOUR = 3600; - - /** The deployer. */ - private final AbstractResourceHandler deployer; - - private final Map<SkinKey, SkinConfig> portalSkins_; - - private final Map<SkinKey, SkinConfig> skinConfigs_; - - private final HashSet<String> availableSkins_; - - private final Map<String, String> ltCache; - - private final Map<String, String> rtCache; - - private final Map<String, Set<String>> portletThemes_; - - private final MainResourceResolver mainResolver; - - /** - * The name of the portal container - */ - final String portalContainerName; - - /** - * An id used for caching request. The id life cycle is the same than the class instance because - * we consider css will change until server is restarted. Of course this only applies for the - * developing mode set to false. - */ - final String id = Long.toString(System.currentTimeMillis()); - - /** Temporary hack. */ - //private static final List<String> skinBlackList = Arrays.asList("Vista", "Mac"); - private static final List<String> skinBlackList = new ArrayList<String>(); - - public SkinService(ExoContainerContext context) - { - portalSkins_ = new LinkedHashMap<SkinKey, SkinConfig>(); - skinConfigs_ = new LinkedHashMap<SkinKey, SkinConfig>(20); - availableSkins_ = new HashSet<String>(5); - ltCache = new ConcurrentHashMap<String, String>(); - rtCache = new ConcurrentHashMap<String, String>(); - portletThemes_ = new HashMap<String, Set<String>>(); - portalContainerName = context.getPortalContainerName(); - mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_); - //deployer = new SkinConfigDeployer(portalContainerName, this); - deployer = new GateinSkinConfigDeployer(portalContainerName, this); - } - - public void addCategoryTheme(String categoryName) - { - if (!portletThemes_.containsKey(categoryName)) - portletThemes_.put(categoryName, new HashSet<String>()); - } - - public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext) - { - addPortalSkin(module, skinName, cssPath, scontext, 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 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) - { - - // Triggers a put if absent - mainResolver.registerContext(scontext); - - 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); - } - } - - 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)); - } - ltCache.put(cssPath, cssData); - rtCache.put(cssPath, cssData); - } - - public void addSkin(String module, String skinName, String cssPath, ServletContext scontext) - { - addSkin(module, skinName, cssPath, scontext, false); - } - - /** - * 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); - } - - public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) - { - // Triggers a put if absent - mainResolver.registerContext(scontext); - - 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); - } - } - - public void addSkin(String module, String skinName, String cssPath, String cssData) - { - // - availableSkins_.add(skinName); - SkinKey key = new SkinKey(module, skinName); - SkinConfig skinConfig = skinConfigs_.get(key); - if (skinConfig == null) - { - skinConfigs_.put(key, new SimpleSkin(this, module, skinName, cssPath)); - } - ltCache.put(cssPath, cssData); - rtCache.put(cssPath, cssData); - } - - public void addTheme(String categoryName, List<String> themesName) - { - if (!portletThemes_.containsKey(categoryName)) - portletThemes_.put(categoryName, new HashSet<String>()); - Set<String> catThemes = portletThemes_.get(categoryName); - for (String theme : themesName) - catThemes.add(theme); - } - - /** - * Get names of all the currently registered skins. - * - * @return an unmodifiable Set of the currently registered skins - */ - public Set<String> getAvailableSkinNames() - { - return availableSkins_; - } - - /** - * Return the CSS content of the file specified by the given URI. - * - * @param cssPath path of the css to find - * @return the css - */ - public String getCSS(String cssPath) - { - try - { - final StringBuilder sb = new StringBuilder(); - renderCSS(new ResourceRenderer() - { - public Appendable getAppendable() - { - return sb; - } - - public void setExpiration(long seconds) - { - - } - }, cssPath); - return sb.toString(); - } - catch (IOException e) - { - log.error("Error while rendering css " + cssPath, e); - return null; - } - catch (RenderingException e) - { - log.error("Error while rendering css " + cssPath, e); - return null; - } - } - - public void renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException - { - Orientation orientation = Orientation.LT; - if (path.endsWith("-lt.css")) - { - path = path.substring(0, path.length() - "-lt.css".length()) + ".css"; - } - else if (path.endsWith("-rt.css")) - { - path = path.substring(0, path.length() - "-rt.css".length()) + ".css"; - orientation = Orientation.RT; - } - - // Try cache first - if (!PropertyManager.isDevelopping()) - { - - if (path.startsWith("/" + portalContainerName + "/resource")) - { - renderer.setExpiration(ONE_MONTH); - } - else - { - renderer.setExpiration(ONE_HOUR); - } - - // - Map<String, String> cache = orientation == Orientation.LT ? ltCache : rtCache; - String css = cache.get(path); - if (css == null) - { - StringBuilder sb = new StringBuilder(); - processCSS(sb, path, orientation, true); - css = sb.toString(); - cache.put(path, css); - } - renderer.getAppendable().append(css); - } - else - { - processCSS(renderer.getAppendable(), path, orientation, false); - } - } - - public String getMergedCSS(String cssPath) - { - return ltCache.get(cssPath); - } - - public Collection<SkinConfig> getPortalSkins(String skinName) - { - Set<SkinKey> keys = portalSkins_.keySet(); - Collection<SkinConfig> portalSkins = new ArrayList<SkinConfig>(); - for (SkinKey key : keys) - { - if (key.getName().equals(skinName)) - portalSkins.add(portalSkins_.get(key)); - } - return portalSkins; - } - - public Map<String, Set<String>> getPortletThemes() - { - return portletThemes_; - } - - public SkinConfig getSkin(String module, String skinName) - { - SkinConfig config = skinConfigs_.get(new SkinKey(module, skinName)); - if (config == null) - skinConfigs_.get(new SkinKey(module, "Default")); - return config; - } - - public void invalidatePortalSkinCache(String portalName, String skinName) - { - SkinKey key = new SkinKey(portalName, skinName); - skinConfigs_.remove(key); - } - - public void remove(String module, String skinName) throws Exception - { - SkinKey key; - if (skinName.length() == 0) - key = new SkinKey(module, "Default"); - else - key = new SkinKey(module, skinName); - skinConfigs_.remove(key); - } - - public int size() - { - return skinConfigs_.size(); - } - - private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge) - throws RenderingException, IOException - { - Resource skin = mainResolver.resolve(cssPath); - processCSSRecursively(appendable, merge, skin, orientation); - } - - private void processCSSRecursively(Appendable appendable, boolean merge, Resource skin, Orientation orientation) - throws RenderingException, IOException - { - - // The root URL for the entry - String basePath = skin.getContextPath() + skin.getParentPath(); - - // - String line = ""; - Reader tmp = skin.read(); - if (tmp == null) - { - throw new RenderingException("No skin resolved for path " + skin.getResourcePath()); - } - BufferedReader reader = new BufferedReader(tmp); - try - { - while ((line = reader.readLine()) != null) - { - Matcher matcher = IMPORT_PATTERN.matcher(line); - if (matcher.find()) - { - String includedPath = matcher.group(2); - if (includedPath.startsWith("/")) - { - if (merge) - { - Resource ssskin = mainResolver.resolve(includedPath); - processCSSRecursively(appendable, merge, ssskin, orientation); - } - else - { - appendable.append(matcher.group(1)).append( - includedPath.substring(0, includedPath.length() - ".css".length())).append( - getSuffix(orientation)).append(matcher.group(3)).append("\n"); - } - } - else - { - if (merge) - { - String path = skin.getContextPath() + skin.getParentPath() + includedPath; - Resource ssskin = mainResolver.resolve(path); - processCSSRecursively(appendable, merge, ssskin, orientation); - } - else - { - appendable.append(matcher.group(1)); - appendable.append(basePath); - appendable.append(includedPath.substring(0, includedPath.length() - ".css".length())); - appendable.append(getSuffix(orientation)); - appendable.append(matcher.group(3)); - } - } - } - else - { - if (orientation == null || wantInclude(line, orientation)) - { - append(line, basePath, appendable); - } - } - } - } - finally - { - Safe.close(reader); - } - } - - /** - * Filter what if it's annotated with the alternative orientation. - * - * @param line the line to include - * @param orientation the orientation - * @return true if the line is included - */ - private boolean wantInclude(String line, Orientation orientation) - { - Pattern orientationPattern = orientation == Orientation.LT ? RT : LT; - Matcher matcher2 = orientationPattern.matcher(line); - return !matcher2.find(); - } - - private void append(String line, String basePath, Appendable appendable) throws IOException - { - // Rewrite background url pattern - Matcher matcher = BACKGROUND_PATTERN.matcher(line); - if (matcher.find() && !matcher.group(2).startsWith("\"/") && !matcher.group(2).startsWith("'/") - && !matcher.group(2).startsWith("/")) - { - appendable.append(matcher.group(1)).append(basePath).append(matcher.group(2)).append(matcher.group(3)).append( - '\n'); - } - else - { - appendable.append(line).append('\n'); - } - } - - String getSuffix(Orientation orientation) - { - if (orientation == null) - { - orientation = Orientation.LT; - } - return suffixMap.get(orientation); - } - - @Managed - @ManagedDescription("The list of registered skins identifiers") - public String[] getSkinList() - { - // get all available skin - List<String> availableSkin = new ArrayList<String>(); - for (String skin : availableSkins_) - { - availableSkin.add(skin); - } - // sort skin name asc - Collections.sort(availableSkin); - - return availableSkin.toArray(new String[availableSkin.size()]); - } - - @Managed - @ManagedDescription("Reload all skins") - public void reloadSkins() - { - // remove all ltCache, rtCache - ltCache.clear(); - rtCache.clear(); - } - - @Managed - @ManagedDescription("Reload a specified skin") - public void reloadSkin(@ManagedDescription("The skin id") @ManagedName("skinId") String skinId) - { - ltCache.remove(skinId); - rtCache.remove(skinId); - } - - public void start() - { - DefaultServletContainerFactory.getInstance().getServletContainer().addWebAppListener(deployer); - } - - public void stop() - { - DefaultServletContainerFactory.getInstance().getServletContainer().removeWebAppListener(deployer); - } -} \ No newline at end of file Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,556 @@ +/** + * 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.exoplatform.commons.utils.PropertyManager; +import org.exoplatform.commons.utils.Safe; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.management.annotations.Managed; +import org.exoplatform.management.annotations.ManagedDescription; +import org.exoplatform.management.annotations.ManagedName; +import org.exoplatform.management.jmx.annotations.NameTemplate; +import org.exoplatform.management.jmx.annotations.Property; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.services.resources.Orientation; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.picocontainer.Startable; + +import javax.servlet.ServletContext; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@Managed +@NameTemplate({@Property(key = "view", value = "portal"), @Property(key = "service", value = "management"), + @Property(key = "type", value = "skin")}) +@ManagedDescription("Skin service") +public class SkinService implements Startable +{ + + protected static Log log = ExoLogger.getLogger("portal.SkinService"); + + private static final Map<Orientation, String> suffixMap = new EnumMap<Orientation, String>(Orientation.class); + + static + { + suffixMap.put(Orientation.LT, "-lt.css"); + suffixMap.put(Orientation.RT, "-rt.css"); + suffixMap.put(Orientation.TL, "-lt.css"); + suffixMap.put(Orientation.TR, "-lt.css"); + } + + private static final String LEFT_P = "\\("; + + private static final String RIGHT_P = "\\)"; + + /** Immutable and therefore thread safe. */ + private static final Pattern IMPORT_PATTERN = + Pattern.compile("(@import\\s+" + "url" + LEFT_P + "['\"]?" + ")([^'\"]+.css)(" + "['\"]?" + RIGHT_P + "\\s*;)"); + + /** Immutable and therefore thread safe. */ + private static final Pattern BACKGROUND_PATTERN = + Pattern.compile("(background.*:.*url" + LEFT_P + "['\"]?" + ")([^'\"]+)(" + "['\"]?" + RIGHT_P + ".*;)"); + + /** Immutable and therefore thread safe. */ + private static final Pattern LT = Pattern.compile("/\\*\\s*orientation=lt\\s*\\*/"); + + /** Immutable and therefore thread safe. */ + private static final Pattern RT = Pattern.compile("/\\*\\s*orientation=rt\\s*\\*/"); + + /** One month caching. */ + private static final int ONE_MONTH = 2592000; + + /** One hour caching. */ + private static final int ONE_HOUR = 3600; + + /** The deployer. */ + private final AbstractResourceHandler deployer; + + private final Map<SkinKey, SkinConfig> portalSkins_; + + private final Map<SkinKey, SkinConfig> skinConfigs_; + + private final HashSet<String> availableSkins_; + + private final Map<String, String> ltCache; + + private final Map<String, String> rtCache; + + private final Map<String, Set<String>> portletThemes_; + + private final MainResourceResolver mainResolver; + + /** + * The name of the portal container + */ + final String portalContainerName; + + /** + * An id used for caching request. The id life cycle is the same than the class instance because + * we consider css will change until server is restarted. Of course this only applies for the + * developing mode set to false. + */ + final String id = Long.toString(System.currentTimeMillis()); + + /** Temporary hack. */ + //private static final List<String> skinBlackList = Arrays.asList("Vista", "Mac"); + private static final List<String> skinBlackList = new ArrayList<String>(); + + public SkinService(ExoContainerContext context) + { + portalSkins_ = new LinkedHashMap<SkinKey, SkinConfig>(); + skinConfigs_ = new LinkedHashMap<SkinKey, SkinConfig>(20); + availableSkins_ = new HashSet<String>(5); + ltCache = new ConcurrentHashMap<String, String>(); + rtCache = new ConcurrentHashMap<String, String>(); + portletThemes_ = new HashMap<String, Set<String>>(); + portalContainerName = context.getPortalContainerName(); + mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_); + //deployer = new SkinConfigDeployer(portalContainerName, this); + deployer = new GateinSkinConfigDeployer(portalContainerName, this); + } + + public void addCategoryTheme(String categoryName) + { + if (!portletThemes_.containsKey(categoryName)) + portletThemes_.put(categoryName, new HashSet<String>()); + } + + public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext) + { + addPortalSkin(module, skinName, cssPath, scontext, 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 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) + { + + // Triggers a put if absent + mainResolver.registerContext(scontext); + + 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); + } + } + + 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)); + } + ltCache.put(cssPath, cssData); + rtCache.put(cssPath, cssData); + } + + public void addSkin(String module, String skinName, String cssPath, ServletContext scontext) + { + addSkin(module, skinName, cssPath, scontext, false); + } + + /** + * 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); + } + + public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite) + { + // Triggers a put if absent + mainResolver.registerContext(scontext); + + 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); + } + } + + public void addSkin(String module, String skinName, String cssPath, String cssData) + { + // + availableSkins_.add(skinName); + SkinKey key = new SkinKey(module, skinName); + SkinConfig skinConfig = skinConfigs_.get(key); + if (skinConfig == null) + { + skinConfigs_.put(key, new SimpleSkin(this, module, skinName, cssPath)); + } + ltCache.put(cssPath, cssData); + rtCache.put(cssPath, cssData); + } + + public void addTheme(String categoryName, List<String> themesName) + { + if (!portletThemes_.containsKey(categoryName)) + portletThemes_.put(categoryName, new HashSet<String>()); + Set<String> catThemes = portletThemes_.get(categoryName); + for (String theme : themesName) + catThemes.add(theme); + } + + /** + * Get names of all the currently registered skins. + * + * @return an unmodifiable Set of the currently registered skins + */ + public Set<String> getAvailableSkinNames() + { + return availableSkins_; + } + + /** + * Return the CSS content of the file specified by the given URI. + * + * @param cssPath path of the css to find + * @return the css + */ + public String getCSS(String cssPath) + { + try + { + final StringBuilder sb = new StringBuilder(); + renderCSS(new ResourceRenderer() + { + public Appendable getAppendable() + { + return sb; + } + + public void setExpiration(long seconds) + { + + } + }, cssPath); + return sb.toString(); + } + catch (IOException e) + { + log.error("Error while rendering css " + cssPath, e); + return null; + } + catch (RenderingException e) + { + log.error("Error while rendering css " + cssPath, e); + return null; + } + } + + public void renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException + { + Orientation orientation = Orientation.LT; + if (path.endsWith("-lt.css")) + { + path = path.substring(0, path.length() - "-lt.css".length()) + ".css"; + } + else if (path.endsWith("-rt.css")) + { + path = path.substring(0, path.length() - "-rt.css".length()) + ".css"; + orientation = Orientation.RT; + } + + // Try cache first + if (!PropertyManager.isDevelopping()) + { + + if (path.startsWith("/" + portalContainerName + "/resource")) + { + renderer.setExpiration(ONE_MONTH); + } + else + { + renderer.setExpiration(ONE_HOUR); + } + + // + Map<String, String> cache = orientation == Orientation.LT ? ltCache : rtCache; + String css = cache.get(path); + if (css == null) + { + StringBuilder sb = new StringBuilder(); + processCSS(sb, path, orientation, true); + css = sb.toString(); + cache.put(path, css); + } + renderer.getAppendable().append(css); + } + else + { + processCSS(renderer.getAppendable(), path, orientation, false); + } + } + + public String getMergedCSS(String cssPath) + { + return ltCache.get(cssPath); + } + + public Collection<SkinConfig> getPortalSkins(String skinName) + { + Set<SkinKey> keys = portalSkins_.keySet(); + Collection<SkinConfig> portalSkins = new ArrayList<SkinConfig>(); + for (SkinKey key : keys) + { + if (key.getName().equals(skinName)) + portalSkins.add(portalSkins_.get(key)); + } + return portalSkins; + } + + public Map<String, Set<String>> getPortletThemes() + { + return portletThemes_; + } + + public SkinConfig getSkin(String module, String skinName) + { + SkinConfig config = skinConfigs_.get(new SkinKey(module, skinName)); + if (config == null) + skinConfigs_.get(new SkinKey(module, "Default")); + return config; + } + + public void invalidatePortalSkinCache(String portalName, String skinName) + { + SkinKey key = new SkinKey(portalName, skinName); + skinConfigs_.remove(key); + } + + public void remove(String module, String skinName) throws Exception + { + SkinKey key; + if (skinName.length() == 0) + key = new SkinKey(module, "Default"); + else + key = new SkinKey(module, skinName); + skinConfigs_.remove(key); + } + + public int size() + { + return skinConfigs_.size(); + } + + private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge) + throws RenderingException, IOException + { + Resource skin = mainResolver.resolve(cssPath); + processCSSRecursively(appendable, merge, skin, orientation); + } + + private void processCSSRecursively(Appendable appendable, boolean merge, Resource skin, Orientation orientation) + throws RenderingException, IOException + { + + // The root URL for the entry + String basePath = skin.getContextPath() + skin.getParentPath(); + + // + String line = ""; + Reader tmp = skin.read(); + if (tmp == null) + { + throw new RenderingException("No skin resolved for path " + skin.getResourcePath()); + } + BufferedReader reader = new BufferedReader(tmp); + try + { + while ((line = reader.readLine()) != null) + { + Matcher matcher = IMPORT_PATTERN.matcher(line); + if (matcher.find()) + { + String includedPath = matcher.group(2); + if (includedPath.startsWith("/")) + { + if (merge) + { + Resource ssskin = mainResolver.resolve(includedPath); + processCSSRecursively(appendable, merge, ssskin, orientation); + } + else + { + appendable.append(matcher.group(1)).append( + includedPath.substring(0, includedPath.length() - ".css".length())).append( + getSuffix(orientation)).append(matcher.group(3)).append("\n"); + } + } + else + { + if (merge) + { + String path = skin.getContextPath() + skin.getParentPath() + includedPath; + Resource ssskin = mainResolver.resolve(path); + processCSSRecursively(appendable, merge, ssskin, orientation); + } + else + { + appendable.append(matcher.group(1)); + appendable.append(basePath); + appendable.append(includedPath.substring(0, includedPath.length() - ".css".length())); + appendable.append(getSuffix(orientation)); + appendable.append(matcher.group(3)); + } + } + } + else + { + if (orientation == null || wantInclude(line, orientation)) + { + append(line, basePath, appendable); + } + } + } + } + finally + { + Safe.close(reader); + } + } + + /** + * Filter what if it's annotated with the alternative orientation. + * + * @param line the line to include + * @param orientation the orientation + * @return true if the line is included + */ + private boolean wantInclude(String line, Orientation orientation) + { + Pattern orientationPattern = orientation == Orientation.LT ? RT : LT; + Matcher matcher2 = orientationPattern.matcher(line); + return !matcher2.find(); + } + + private void append(String line, String basePath, Appendable appendable) throws IOException + { + // Rewrite background url pattern + Matcher matcher = BACKGROUND_PATTERN.matcher(line); + if (matcher.find() && !matcher.group(2).startsWith("\"/") && !matcher.group(2).startsWith("'/") + && !matcher.group(2).startsWith("/")) + { + appendable.append(matcher.group(1)).append(basePath).append(matcher.group(2)).append(matcher.group(3)).append( + '\n'); + } + else + { + appendable.append(line).append('\n'); + } + } + + String getSuffix(Orientation orientation) + { + if (orientation == null) + { + orientation = Orientation.LT; + } + return suffixMap.get(orientation); + } + + @Managed + @ManagedDescription("The list of registered skins identifiers") + public String[] getSkinList() + { + // get all available skin + List<String> availableSkin = new ArrayList<String>(); + for (String skin : availableSkins_) + { + availableSkin.add(skin); + } + // sort skin name asc + Collections.sort(availableSkin); + + return availableSkin.toArray(new String[availableSkin.size()]); + } + + @Managed + @ManagedDescription("Reload all skins") + public void reloadSkins() + { + // remove all ltCache, rtCache + ltCache.clear(); + rtCache.clear(); + } + + @Managed + @ManagedDescription("Reload a specified skin") + public void reloadSkin(@ManagedDescription("The skin id") @ManagedName("skinId") String skinId) + { + ltCache.remove(skinId); + rtCache.remove(skinId); + } + + public void start() + { + DefaultServletContainerFactory.getInstance().getServletContainer().addWebAppListener(deployer); + } + + public void stop() + { + DefaultServletContainerFactory.getInstance().getServletContainer().removeWebAppListener(deployer); + } +} \ No newline at end of file Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java 2009-10-30 15:47:22 UTC (rev 462) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,46 +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.portal.resource; - -import org.exoplatform.services.resources.Orientation; - -/** - * The URL of a skin. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface SkinURL -{ - - /** - * Sets the orientation on the skin URL. - * - * @param orientation the orientation - */ - void setOrientation(Orientation orientation); - - /** - * This method is used to compute the path of a CSS. - * - * @return the CSS path, containing the orientation suffix. - */ - String toString(); -} Copied: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java (from rev 462, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java) =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java (rev 0) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/resource/SkinURL.java 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,46 @@ +/** + * 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.exoplatform.services.resources.Orientation; + +/** + * The URL of a skin. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface SkinURL +{ + + /** + * Sets the orientation on the skin URL. + * + * @param orientation the orientation + */ + void setOrientation(Orientation orientation); + + /** + * This method is used to compute the path of a CSS. + * + * @return the CSS path, containing the orientation suffix. + */ + String toString(); +} Modified: portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java =================================================================== --- portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -21,7 +21,6 @@ import groovy.lang.Binding; import groovy.lang.GroovyShell; - import org.exoplatform.container.PortalContainer; import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; import org.exoplatform.services.log.ExoLogger; @@ -32,11 +31,10 @@ import org.gatein.wci.impl.DefaultServletContainerFactory; import org.picocontainer.Startable; +import javax.servlet.ServletContext; import java.io.IOException; import java.io.InputStream; -import javax.servlet.ServletContext; - /** * Created by The eXo Platform SAS * Jan 19, 2007 @@ -45,6 +43,8 @@ public class JavascriptDeployer implements WebAppListener, Startable { + private static final String GATEIN_CONFIG_RESOURCE = "/WEB-INF/gatein-resources.xml"; + /** * Logger */ @@ -87,6 +87,7 @@ scontext = event.getWebApp().getServletContext(); InputStream is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/JavascriptScript.groovy"); + //InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); if (is == null) return; try @@ -122,6 +123,7 @@ try { is = scontext.getResourceAsStream("/WEB-INF/conf/script/groovy/JavascriptScript.groovy"); + //is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); Binding binding = new Binding(); binding.setVariable("JavascriptService", javascriptService); binding.setVariable("ServletContext", scontext); Modified: portal/branches/wsrp-integration/packaging/profiles.xml =================================================================== --- portal/branches/wsrp-integration/packaging/profiles.xml 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/packaging/profiles.xml 2009-10-30 19:05:32 UTC (rev 464) @@ -22,7 +22,7 @@ <profilesXml> <profiles> <profile> - <id>exo-projects</id> + <id>gatein-projects</id> <properties> <!-- Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found @@ -30,10 +30,18 @@ ex: On Linux '/home/user/AS' --> <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> + + <!-- + If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir) + Uncomment and Replace with the directory you prefer + --> + <!-- + <gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir> + --> <!-- Replace with the name of the directory containing Tomcat 6 --> - <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version> + <exo.projects.app.tomcat.version>tomcat-6.0.20</exo.projects.app.tomcat.version> <!-- Replace with the name of the directory containing JBoss AS 5.1 --> @@ -43,6 +51,6 @@ </profiles> <activeProfiles> - <activeProfile>exo-projects</activeProfile> + <activeProfile>gatein-projects</activeProfile> </activeProfiles> </profilesXml> Copied: portal/branches/wsrp-integration/packaging/profiles.xml.template (from rev 462, portal/trunk/packaging/profiles.xml.template) =================================================================== --- portal/branches/wsrp-integration/packaging/profiles.xml.template (rev 0) +++ portal/branches/wsrp-integration/packaging/profiles.xml.template 2009-10-30 19:05:32 UTC (rev 464) @@ -0,0 +1,57 @@ +<!-- + + 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. + +--> + +<profilesXml> + <profiles> + <profile> + <id>gatein-projects</id> + <properties> + <!-- + Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found + ex: On Windows 'c:/AS' + ex: On Linux '/home/user/AS' + --> + <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> + + <!-- + If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir) + Uncomment and Replace with the directory you prefer + --> + <!-- + <gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir> + --> + + <!-- + Replace with the name of the directory containing Tomcat 6 + --> + <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version> + <!-- + Replace with the name of the directory containing JBoss AS 5.1 + --> + <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version> + </properties> + </profile> + </profiles> + + <activeProfiles> + <activeProfile>gatein-projects</activeProfile> + </activeProfiles> +</profilesXml> Modified: portal/branches/wsrp-integration/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java =================================================================== --- portal/branches/wsrp-integration/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2009-10-30 19:05:32 UTC (rev 464) @@ -209,6 +209,25 @@ } } + private boolean validateName(String label) + { + label = label.trim(); + if (Character.isDigit(label.charAt(0)) || label.charAt(0) == '-') + { + return false; + } + for (int i = 0; i < label.length(); i++) + { + char c = label.charAt(i); + if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-' || Character.isSpaceChar(c)) + { + continue; + } + return false; + } + return true; + } + private boolean nameExisted(String nodeName) { for (PageNode node : pageNavigation.getNodes()) @@ -313,6 +332,11 @@ UITabPaneDashboard tabPane = event.getSource(); WebuiRequestContext context = event.getRequestContext(); String newTabLabel = context.getRequestParameter(UIComponent.OBJECTID); + if (!tabPane.validateName(newTabLabel)) + { + context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null)); + return; + } String newNodeName = tabPane.createNewPageNode(newTabLabel); //If new node is created with success, then redirect to it @@ -342,6 +366,11 @@ WebuiRequestContext context = event.getRequestContext(); int nodeIndex = Integer.parseInt(context.getRequestParameter(UIComponent.OBJECTID)); String newTabLabel = context.getRequestParameter(RENAMED_TAB_LABEL_PARAMETER); + if (!tabPane.validateName(newTabLabel)) + { + context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null)); + return; + } String newNodeName = tabPane.renamePageNode(nodeIndex, newTabLabel); //If page node is renamed with success, then redirect to new URL Modified: portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties =================================================================== --- portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2009-10-30 19:05:32 UTC (rev 464) @@ -20,4 +20,5 @@ UITabPaneDashboard.action.addNewDashboard=Add Dashboard UITabPaneDashboard.action.switchShowRange=Switch Range UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard? -UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. \ No newline at end of file +UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. +UITabPaneDashboard.msg.wrongTabName=Only alpha, digit, underscore, dash and space characters allowed. \ No newline at end of file Modified: portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties =================================================================== --- portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2009-10-30 19:05:32 UTC (rev 464) @@ -20,4 +20,5 @@ UITabPaneDashboard.action.addNewDashboard =Ajoute Dashboard UITabPaneDashboard.action.switchShowRange =Decale UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard? -UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. \ No newline at end of file +UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. +UITabPaneDashboard.msg.wrongTabName=Only alpha, digit, underscore, dash and space characters allowed. \ No newline at end of file Modified: portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_ru.properties =================================================================== --- portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_ru.properties 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_ru.properties 2009-10-30 19:05:32 UTC (rev 464) @@ -20,4 +20,5 @@ UITabPaneDashboard.action.addNewDashboard=Добавить доску UITabPaneDashboard.action.switchShowRange=Изменить область UITabPaneDashboard.msg.deleteTab=Вы действительно хотите удалить эту доску? -UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. \ No newline at end of file +UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. +UITabPaneDashboard.msg.wrongTabName=Only alpha, digit, underscore, dash and space characters allowed. \ No newline at end of file Modified: portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_uk.properties =================================================================== --- portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_uk.properties 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_uk.properties 2009-10-30 19:05:32 UTC (rev 464) @@ -20,4 +20,5 @@ UITabPaneDashboard.action.addNewDashboard =Додати панель інструментів UITabPaneDashboard.action.switchShowRange =Перемикач діапазону UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard? -UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. \ No newline at end of file +UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab. +UITabPaneDashboard.msg.wrongTabName=Only alpha, digit, underscore, dash and space characters allowed. \ No newline at end of file Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2009-10-30 19:05:32 UTC (rev 464) @@ -146,6 +146,8 @@ { if (username == null) username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser(); + if (username.equals(getUserACL().getSuperUser())) + return true; return isMemberOfGroup(username, getUserACL().getAdminGroups()); } Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -25,9 +25,9 @@ import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIBreadcumbs; +import org.exoplatform.webui.core.UIBreadcumbs.LocalPath; import org.exoplatform.webui.core.UIContainer; import org.exoplatform.webui.core.UITree; -import org.exoplatform.webui.core.UIBreadcumbs.LocalPath; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; @@ -121,7 +121,8 @@ sibblingsGroup_ = service.getGroupHandler().findGroups(parentGroup); // if not administrator - if (!GroupManagement.isAdministrator(null)) + String username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser(); + if (!GroupManagement.isSuperUserOfGroup(username, groupId)) { childrenGroup_ = GroupManagement.getRelatedGroups(null, childrenGroup_); sibblingsGroup_ = GroupManagement.getRelatedGroups(null, sibblingsGroup_); Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2009-10-30 19:05:32 UTC (rev 464) @@ -51,7 +51,7 @@ href += "&uicomponent=UITabPaneDashboard"; href += "&op=RenameTabLabel"; href += "&objectId=" + nodeIndex; - href += "&newTabLabel=" + newTabLabel; + href += "&newTabLabel=" + encodeURIComponent(newTabLabel); window.location = href; return; } @@ -83,6 +83,7 @@ inputElement.style.border = "1px solid #b7b7b7"; inputElement.style.width = "95px"; inputElement.onkeypress = eXo.webui.UITabbedDashboard.renameTabLabel; + inputElement.setAttribute('maxLength', 50); inputElement.onblur = function() { prNode.replaceChild(eXo.webui.UITabbedDashboard.backupElement, inputElement); }; Deleted: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/script/groovy/SkinConfigScript.groovy =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/script/groovy/SkinConfigScript.groovy 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/script/groovy/SkinConfigScript.groovy 2009-10-30 19:05:32 UTC (rev 464) @@ -1,42 +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. - */ - -/***************************HomePagePortlet**************************************************/ -SkinService.addSkin( - "web/HomePagePortlet", - "Default", - "/" + ServletContextName + "/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css", - ServletContext -) ; - -SkinService.addSkin( - "web/HomePagePortlet", - "Vista", - "/" + ServletContextName + "/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css", - ServletContext -) ; - -SkinService.addSkin( - "web/HomePagePortlet", - "Mac", - "/" + ServletContextName + "/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css", - ServletContext -) ; - -///////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-10-30 19:05:32 UTC (rev 464) @@ -37,7 +37,6 @@ <div class="id"><%=uicomponent.getId();%></div> <div class="title"><%=_ctx.appRes("UIPortlet.label.title");%></div> <div class="description"> - <%if(uicomponent.getDescription() != null) {%> <%=uicomponent.getDescription();%> <%} else {%> @@ -67,22 +66,12 @@ <div class="CenterBackground"> <div class="GardientBackground"> <% - String displayName = uicomponent.getDisplayName(); - if(displayName != null) { - String htmlDisplayName = ""; int count = 1; - for(c in displayName){ - if(c=="\n"){ - c="<br/>"; - count++; - } - htmlDisplayName+=c; - if(count>5) break; - } - %> - <%=htmlDisplayName;%> - <%} else {%> - <%= _ctx.appRes("UIPortlet.label.portletContent"); %> - <%}%> + try { + String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName(); + print _ctx.getRequestContext().getApplicationResourceBundle().getString("UIPortlet.description." + portletName); + } catch(Exception e){ + print uicomponent.getDisplayName(); + }%> </div> </div> </div> Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2009-10-30 19:05:32 UTC (rev 464) @@ -26,13 +26,21 @@ import org.exoplatform.commons.utils.TextEncoder; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.web.AbstractFilter; -import org.exoplatform.portal.skin.ResourceRenderer; -import org.exoplatform.portal.skin.SkinService; +import org.exoplatform.portal.resource.ResourceRenderer; +import org.exoplatform.portal.resource.SkinService; import org.exoplatform.services.cache.ExoCache; import org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import javax.imageio.ImageIO; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; @@ -47,15 +55,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import javax.imageio.ImageIO; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - public class ResourceRequestFilter extends AbstractFilter { Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-10-30 19:05:32 UTC (rev 464) @@ -1,16 +1,16 @@ /** * 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 @@ -71,13 +71,15 @@ protected static Log log = ExoLogger.getLogger("portal:UIPortletActionListener"); /** - * The process action listener is called when an ActionURL generated by the portlet container has been invoked by the - * client - * <p/> - * The call is delegated to the portlet container iteself using the method portletContainer.processAction(...). It - * returns an object of type ActionOutput that contains several information such as the next window state and portlet - * modes (if they have to change) as well as a list of Events to be broadcasted to the other portlets located in the - * same portal page + * The process action listener is called when an ActionURL generated by the + * portlet container has been invoked by the client + * + * The call is delegated to the portlet container iteself using the method + * portletContainer.processAction(...). It returns an object of type + * ActionOutput that contains several information such as the next window + * state and portlet modes (if they have to change) as well as a list of + * Events to be broadcasted to the other portlets located in the same portal + * page */ static public class ProcessActionActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C, I>> @@ -225,8 +227,8 @@ } /** - * This method is used to set the next portlet window state if this one needs to be modified because of the incoming - * request + * This method is used to set the next portlet window state if this one needs to + * be modified because of the incoming request */ public static void setNextState(UIPortlet uiPortlet, WindowState state) { @@ -260,7 +262,10 @@ } } - /** This method is used to set the next portlet mode if this one needs to be modified because of the incoming request */ + /** + * This method is used to set the next portlet mode if this one needs to + * be modified because of the incoming request + */ public static void setNextMode(UIPortlet uiPortlet, PortletMode portletMode) { if (portletMode != null) @@ -281,18 +286,21 @@ } /** - * The serveResource() method defined in the JSR 286 specs has several goals: - provide binary output like images to - * be displayed in the portlet (in the previous spec - JSR 168 - a servlet was needed) - provide text output that - * does not impact the entire portal rendering, it is for instance usefull when dealing with Javascript to return - * some JSON structures - * <p/> - * The method delegates the call to the portlet container serverResource method after filling the ResourceInput - * object with the current request state. - * <p/> - * This returns a ResourceOutput object that can content binary or text contentType - * <p/> - * Finally the content is set in the portal response writer or outputstream depending on the type; the - * processRender() method of the portal is not called as we set the response as complete + * The serveResource() method defined in the JSR 286 specs has several goals: + * - provide binary output like images to be displayed in the portlet (in the previous + * spec - JSR 168 - a servlet was needed) + * - provide text output that does not impact the entire portal rendering, it is for + * instance usefull when dealing with Javascript to return some JSON structures + * + * The method delegates the call to the portlet container serverResource method after + * filling the ResourceInput object with the current request state. + * + * This returns a ResourceOutput object that can content binary or text contentType + * + * Finally the content is set in the portal response writer or outputstream depending + * on the type; the processRender() method of the portal is not called as we set the + * response as complete + * */ static public class ServeResourceActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C, I>> @@ -444,11 +452,11 @@ } /** - * This method is called when the javax.portlet.Event is supported by the current portlet stored in the Portlet - * Caontainer - * <p/> - * The processEvent() method can also generates IPC events and hence the portal itself will call the - * ProcessEventsActionListener once again + * This method is called when the javax.portlet.Event is supported by the + * current portlet stored in the Portlet Caontainer + * + * The processEvent() method can also generates IPC events and hence the + * portal itself will call the ProcessEventsActionListener once again */ public static <S, C extends Serializable, I> List<javax.portlet.Event> processEvent(UIPortlet<S, C, I> uiPortlet, javax.portlet.Event event) @@ -580,9 +588,11 @@ } /** - * This listener is called when a RenderURL url has been generated by the portlet container. In that case it means - * that the render() method of a targeted portlet will be directly called and that the existing navigational state - * will be reset by removing all the Render Parameters from the cache map located in the UIPortlet + * This listener is called when a RenderURL url has been generated by the + * portlet container. In that case it means that the render() method of a + * targeted portlet will be directly called and that the existing navigational + * state will be reset by removing all the Render Parameters from the cache + * map located in the UIPortlet */ static public class RenderActionListener extends EventListener<UIPortlet> { @@ -602,11 +612,11 @@ } /** - * This method is called by the process action and render action listeners, aka during the processDecode() phase of - * our UI framework - * <p/> - * It goes throughs all the request parameters and add to the public render parameters Map the one that are supported - * by the targeted portlet + * This method is called by the process action and render action listeners, + * aka during the processDecode() phase of our UI framework + * + * It goes throughs all the request parameters and add to the public render + * parameters Map the one that are supported by the targeted portlet */ static public void setupPublicRenderParams(UIPortlet uiPortlet, Map<String, String[]> requestParams) { @@ -693,7 +703,10 @@ } } - /** This listener is called when the portlet mode of a portlet has to be changed. */ + /** + * This listener is called when the portlet mode of a portlet has to be + * changed. + */ static public class ChangePortletModeActionListener extends EventListener<UIPortlet> { public void execute(Event<UIPortlet> event) throws Exception @@ -724,9 +737,10 @@ } /** - * This listener is called when the portlet edit form (which tells information about the portlet width or height as - * well as if the info bar and its content should be shown) is invoked. - * <p/> + * This listener is called when the portlet edit form (which tells information + * about the portlet width or height as well as if the info bar and its + * content should be shown) is invoked. + * * It places the form in the portal black mask */ static public class EditPortletActionListener extends EventListener<UIPortlet> Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2009-10-30 19:05:32 UTC (rev 464) @@ -27,7 +27,7 @@ import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.pom.spi.wsrp.WSRPPortletStateType; import org.exoplatform.portal.portlet.PortletExceptionHandleService; -import org.exoplatform.portal.skin.SkinService; +import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; import org.exoplatform.portal.webui.workspace.UIPortalApplication; Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-10-30 19:05:32 UTC (rev 464) @@ -26,7 +26,7 @@ import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.PortalProperties; -import org.exoplatform.portal.skin.SkinService; +import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.application.UIApplicationList; import org.exoplatform.portal.webui.application.UIPortlet; import org.exoplatform.portal.webui.container.UIContainerList; Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-10-30 19:05:32 UTC (rev 464) @@ -26,7 +26,7 @@ import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.PortalProperties; -import org.exoplatform.portal.skin.SkinService; +import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.util.PortalDataMapper; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2009-10-30 19:05:32 UTC (rev 464) @@ -19,7 +19,7 @@ package org.exoplatform.portal.webui.portal; -import org.exoplatform.portal.skin.SkinService; +import org.exoplatform.portal.resource.SkinService; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; import org.exoplatform.portal.webui.workspace.UIPortalApplication; Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2009-10-30 19:05:32 UTC (rev 464) @@ -182,7 +182,7 @@ return model; } - static private Page toPageModel(UIPage uiPage) + static public Page toPageModel(UIPage uiPage) { Page model = new Page(uiPage.getStorageId()); toContainer(model, uiPage); Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-10-30 19:05:32 UTC (rev 464) @@ -21,7 +21,9 @@ import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.config.UserACL; +import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.portal.webui.page.UIPageBody; import org.exoplatform.portal.webui.page.UIPageCreationWizard; import org.exoplatform.portal.webui.page.UISiteBody; @@ -29,6 +31,7 @@ import org.exoplatform.portal.webui.portal.UIPortal; import org.exoplatform.portal.webui.portal.UIPortalComposer; import org.exoplatform.portal.webui.portal.UIPortalForm; +import org.exoplatform.portal.webui.util.PortalDataMapper; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.event.Event; @@ -64,6 +67,18 @@ UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); uiToolPanel.setShowMaskLayer(false); UIPageBody pageBody = uiWorkingWS.findFirstComponentOfType(UIPageBody.class); + + // check edit permission for page + UIPage uiPage = (UIPage) pageBody.getUIComponent(); + Page page = PortalDataMapper.toPageModel(uiPage); + + UserACL userACL = uiApp.getApplicationComponent(UserACL.class); + if (!userACL.hasEditPermission(page)) + { + uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-editPermission", null)); + return; + } + uiToolPanel.setWorkingComponent(pageBody.getUIComponent()); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); Util.getPortalRequestContext().setFullRender(true); Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-10-30 18:31:16 UTC (rev 463) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-10-30 19:05:32 UTC (rev 464) @@ -23,10 +23,10 @@ import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserPortalConfig; import org.exoplatform.portal.config.model.Container; -import org.exoplatform.portal.skin.Skin; -import org.exoplatform.portal.skin.SkinConfig; -import org.exoplatform.portal.skin.SkinService; -import org.exoplatform.portal.skin.SkinURL; +import org.exoplatform.portal.resource.Skin; +import org.exoplatform.portal.resource.SkinConfig; +import org.exoplatform.portal.resource.SkinService; +import org.exoplatform.portal.resource.SkinURL; import org.exoplatform.portal.webui.application.UIPortlet; import org.exoplatform.portal.webui.page.UISiteBody; import org.exoplatform.portal.webui.portal.PageNodeEvent;