[gatein-commits] gatein SVN: r3787 - in portal/branches/branched-r3776: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.

Author: hoang_to Date: 2010-08-10 02:50:03 -0400 (Tue, 10 Aug 2010) New Revision: 3787 Modified: portal/branches/branched-r3776/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java portal/branches/branched-r3776/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java Log: Apply patch of GTNPORTAL-773 Modified: portal/branches/branched-r3776/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java =================================================================== --- portal/branches/branched-r3776/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-08-10 06:22:12 UTC (rev 3786) +++ portal/branches/branched-r3776/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-08-10 06:50:03 UTC (rev 3787) @@ -26,6 +26,7 @@ import org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle; import org.exoplatform.commons.chromattic.ChromatticLifeCycle; import org.exoplatform.commons.chromattic.ChromatticManager; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.PropertiesParam; import org.exoplatform.container.xml.ValueParam; @@ -260,7 +261,9 @@ public boolean isGadgetDeveloper(String username) { - return true; + if(PropertyManager.isDevelopping()) + return true; + return false; } public String getCountry() Modified: portal/branches/branched-r3776/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java =================================================================== --- portal/branches/branched-r3776/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-08-10 06:22:12 UTC (rev 3786) +++ portal/branches/branched-r3776/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-08-10 06:50:03 UTC (rev 3787) @@ -21,6 +21,7 @@ import org.exoplatform.application.gadget.Gadget; import org.exoplatform.application.gadget.GadgetRegistryService; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.model.ApplicationState; @@ -298,50 +299,24 @@ public boolean isNoCache() { - /* - * try { UserGadgetStorage userGadgetStorage = getGadgetStorage(); String - * username = Util.getPortalRequestContext().getRemoteUser(); if(username != - * null) { String prefs = userGadgetStorage.get(username, - * getApplicationName(), getApplicationInstanceUniqueId(), PREF_NO_CACHE); - * return prefs.equals("1"); } } catch (Exception e) {} return false; - */ - return true; + if(PropertyManager.isDevelopping()) + return true; + return false; } public void setNoCache(boolean value) { - /* - * try { UserGadgetStorage userGadgetStorage = getGadgetStorage(); String - * username = Util.getPortalRequestContext().getRemoteUser(); if(username != - * null && getGadgetRegistryService().isGadgetDeveloper(username)) { - * userGadgetStorage.save(username, getApplicationName(), - * getApplicationInstanceUniqueId(), PREF_NO_CACHE, value ? "1" : "0"); } } - * catch (Exception e) {} - */ } public boolean isDebug() { - /* - * try { UserGadgetStorage userGadgetStorage = getGadgetStorage(); String - * username = Util.getPortalRequestContext().getRemoteUser(); if(username != - * null) { String prefs = userGadgetStorage.get(username, - * getApplicationName(), getApplicationInstanceUniqueId(), PREF_DEBUG); - * return prefs.equals("1"); } } catch (Exception e) {} return false; - */ - return true; + if(PropertyManager.isDevelopping()) + return true; + return false; } public void setDebug(boolean value) { - /* - * try { UserGadgetStorage userGadgetStorage = getGadgetStorage(); String - * username = Util.getPortalRequestContext().getRemoteUser(); if(username != - * null && getGadgetRegistryService().isGadgetDeveloper(username)) { - * userGadgetStorage.save(username, getApplicationName(), - * getApplicationInstanceUniqueId(), PREF_DEBUG, value ? "1" : "0"); } } - * catch (Exception e) {} - */ } public boolean isGadgetDeveloper()