May 2010 - gatein-commits - Jboss List Archives

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

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-05-20 06:01:40 -0400 (Thu, 20 May 2010) New Revision: 3157 Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormMultiValueInputSet.java Log: correct UIFormMultiValueInputSet Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormMultiValueInputSet.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormMultiValueInputSet.java 2010-05-20 09:35:50 UTC (rev 3156) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormMultiValueInputSet.java 2010-05-20 10:01:40 UTC (rev 3157) @@ -271,9 +271,9 @@ } } else { inputBase = (UIFormInputBase)constructor_.newInstance(); - inputBase.setName(compName); } + inputBase.setName(compName); inputBase.setId(compName); List<Validator> validators = this.getValidators(); if (validators != null)

14 years, 7 months

1
0
0 / 0

gatein SVN: r3156 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:35:50 -0400 (Thu, 20 May 2010) New Revision: 3156 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-05-20 09:35:33 UTC (rev 3155) +++ components/mop/trunk/api/pom.xml 2010-05-20 09:35:50 UTC (rev 3156) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-05-20 09:35:33 UTC (rev 3155) +++ components/mop/trunk/core/pom.xml 2010-05-20 09:35:50 UTC (rev 3156) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-05-20 09:35:33 UTC (rev 3155) +++ components/mop/trunk/pom.xml 2010-05-20 09:35:50 UTC (rev 3156) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.3-CR01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> </scm> <dependencyManagement> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-05-20 09:35:33 UTC (rev 3155) +++ components/mop/trunk/spi/pom.xml 2010-05-20 09:35:50 UTC (rev 3156) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>

14 years, 7 months

1
0
0 / 0

gatein SVN: r3155 - components/mop/tags.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:35:33 -0400 (Thu, 20 May 2010) New Revision: 3155 Added: components/mop/tags/1.0.3-CR01/ Log: [maven-scm] copy for tag 1.0.3-CR01 Copied: components/mop/tags/1.0.3-CR01 (from rev 3154, components/mop/trunk)

14 years, 7 months

1
0
0 / 0

gatein SVN: r3154 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:35:06 -0400 (Thu, 20 May 2010) New Revision: 3154 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare release 1.0.3-CR01 Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) +++ components/mop/trunk/api/pom.xml 2010-05-20 09:35:06 UTC (rev 3154) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-GA-SNAPSHOT</version> + <version>1.0.3-CR01</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) +++ components/mop/trunk/core/pom.xml 2010-05-20 09:35:06 UTC (rev 3154) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-GA-SNAPSHOT</version> + <version>1.0.3-CR01</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) +++ components/mop/trunk/pom.xml 2010-05-20 09:35:06 UTC (rev 3154) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-GA-SNAPSHOT</version> + <version>1.0.3-CR01</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.3-CR01</url> </scm> <dependencyManagement> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) +++ components/mop/trunk/spi/pom.xml 2010-05-20 09:35:06 UTC (rev 3154) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-GA-SNAPSHOT</version> + <version>1.0.3-CR01</version> </parent>

14 years, 7 months

1
0
0 / 0

gatein SVN: r3153 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:33:29 -0400 (Thu, 20 May 2010) New Revision: 3153 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: rolling back to initial state Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-05-20 09:28:05 UTC (rev 3152) +++ components/mop/trunk/api/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR02-SNAPSHOT</version> + <version>1.0.3-GA-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-05-20 09:28:05 UTC (rev 3152) +++ components/mop/trunk/core/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR02-SNAPSHOT</version> + <version>1.0.3-GA-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-05-20 09:28:05 UTC (rev 3152) +++ components/mop/trunk/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) @@ -34,7 +34,7 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR02-SNAPSHOT</version> + <version>1.0.3-GA-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - MOP</name> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-05-20 09:28:05 UTC (rev 3152) +++ components/mop/trunk/spi/pom.xml 2010-05-20 09:33:29 UTC (rev 3153) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR02-SNAPSHOT</version> + <version>1.0.3-GA-SNAPSHOT</version> </parent>

14 years, 7 months

1
0
0 / 0

gatein SVN: r3152 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-05-20 05:28:05 -0400 (Thu, 20 May 2010) New Revision: 3152 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java Log: GTNPORTAL-1228: Portlet 's non-English labels are not displayed properly in EDIT mode Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-05-20 09:27:08 UTC (rev 3151) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-05-20 09:28:05 UTC (rev 3152) @@ -77,6 +77,8 @@ import javax.portlet.PortletMode; import javax.servlet.http.Cookie; + +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -216,7 +218,7 @@ if (portletResponse instanceof FragmentResponse) { FragmentResponse fragmentResponse = (FragmentResponse)portletResponse; - content = fragmentResponse.getContent(); + content = new String(fragmentResponse.getBytes(), Charset.forName("UTF-8")); } else { @@ -252,6 +254,7 @@ } portletContent.setLength(0); + portletContent.append(content); } catch (Throwable ex)

14 years, 7 months

1
0
0 / 0

gatein SVN: r3151 - components/mop/tags.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:27:08 -0400 (Thu, 20 May 2010) New Revision: 3151 Removed: components/mop/tags/1.0.3-CR01/ Log: fuckedup again

14 years, 7 months

1
0
0 / 0

gatein SVN: r3150 - in portal/trunk/portlet/dashboard/src/main: webapp/WEB-INF/classes/locale/portlet/gadget and 1 other directory.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-05-20 05:25:11 -0400 (Thu, 20 May 2010) New Revision: 3150 Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_en.properties portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_vi.xml Log: GTNPORTAL-1060 Alternative to URL preference for local gadgets in Gadget Wrapper portlet Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java =================================================================== --- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2010-05-20 09:22:00 UTC (rev 3149) +++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2010-05-20 09:25:11 UTC (rev 3150) @@ -19,12 +19,21 @@ package org.exoplatform.gadget.webui.component; +import org.exoplatform.application.gadget.Gadget; +import org.exoplatform.application.gadget.GadgetRegistryService; +import org.exoplatform.application.gadget.LocalImporter; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.webui.application.GadgetUtil; +import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.application.portlet.PortletRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.core.UIPortletApplication; import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.json.JSONException; import org.json.JSONObject; @@ -39,26 +48,58 @@ @ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/gadget/webui/component/UIGadgetPortlet.gtmpl") public class UIGadgetPortlet extends UIPortletApplication { + final static public String LOCAL_STRING = "local://"; + + private static final Logger log = LoggerFactory.getLogger(LocalImporter.class); + public UIGadgetPortlet() throws Exception { - addChild(UIGadgetViewMode.class, null, null); + addChild(UIGadgetViewMode.class, null, null); } public String getUrl() { PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); PortletPreferences pref = pcontext.getRequest().getPreferences(); - return pref.getValue("url", "http://www.google.com/ig/modules/horoscope.xml"); + String urlPref = pref.getValue("url", "http://www.google.com/ig/modules/horoscope.xml"); + if (urlPref.startsWith(LOCAL_STRING)) + { + try + { + String gadgetName = urlPref.replaceFirst(LOCAL_STRING, ""); + ExoContainer container = ExoContainerContext.getCurrentContainer(); + GadgetRegistryService gadgetService = + (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class); + Gadget gadget = gadgetService.getGadget(gadgetName); + if (gadget != null) + { + return GadgetUtil.reproduceUrl(gadget.getUrl(), gadget.isLocal()); + } + } + catch (Exception e) + { + log.warn("Failure retrieving gadget from url!"); + } + } + return urlPref; } public String getMetadata() { - String metadata_ = GadgetUtil.fetchGagdetMetadata(getUrl()); + String url = getUrl(); + if (url == null) + { + WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); + UIApplication uiApplication = context.getUIApplication(); + uiApplication.addMessage(new ApplicationMessage("UIGadgetPortlet.msg.url-invalid", null)); + } + + String metadata_ = GadgetUtil.fetchGagdetMetadata(url); try { JSONObject jsonObj = new JSONObject(metadata_); JSONObject obj = jsonObj.getJSONArray("gadgets").getJSONObject(0); - String token = GadgetUtil.createToken(getUrl(), new Long(hashCode())); + String token = GadgetUtil.createToken(url, new Long(hashCode())); obj.put("secureToken", token); metadata_ = jsonObj.toString(); } Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_en.properties =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_en.properties 2010-05-20 09:22:00 UTC (rev 3149) +++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_en.properties 2010-05-20 09:25:11 UTC (rev 3150) @@ -24,4 +24,6 @@ UIGadgetEditMode.action.Save=Save UIGadgetEditMode.label.option.remote=Remote Gadget -UIGadgetEditMode.label.option.local=Local Gadget \ No newline at end of file +UIGadgetEditMode.label.option.local=Local Gadget + +UIGadgetPortlet.msg.url-invalid=The gadget url formating is wrong in Preference Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_vi.xml =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_vi.xml 2010-05-20 09:22:00 UTC (rev 3149) +++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/gadget/GadgetPortlet_vi.xml 2010-05-20 09:25:11 UTC (rev 3150) @@ -36,5 +36,10 @@ <Save>Lưu</Save> </action> </UIGadgetEditMode> + <UIGadgetPortlet> + <msg> + <url-invalid>Url sai định dạng</url-invalid> + </msg> + </UIGadgetPortlet> </bundle>

14 years, 7 months

1
0
0 / 0

gatein SVN: r3149 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:22:00 -0400 (Thu, 20 May 2010) New Revision: 3149 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-05-20 09:21:39 UTC (rev 3148) +++ components/mop/trunk/api/pom.xml 2010-05-20 09:22:00 UTC (rev 3149) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-05-20 09:21:39 UTC (rev 3148) +++ components/mop/trunk/core/pom.xml 2010-05-20 09:22:00 UTC (rev 3149) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-05-20 09:21:39 UTC (rev 3148) +++ components/mop/trunk/pom.xml 2010-05-20 09:22:00 UTC (rev 3149) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.3-CR01</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.3-CR01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> </scm> <dependencyManagement> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-05-20 09:21:39 UTC (rev 3148) +++ components/mop/trunk/spi/pom.xml 2010-05-20 09:22:00 UTC (rev 3149) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.3-CR01</version> + <version>1.0.3-CR02-SNAPSHOT</version> </parent>

14 years, 7 months

1
0
0 / 0

gatein SVN: r3148 - components/mop/tags/1.0.3-CR01.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-05-20 05:21:39 -0400 (Thu, 20 May 2010) New Revision: 3148 Added: components/mop/tags/1.0.3-CR01/trunk/ Log: [maven-scm] copy for tag 1.0.3-CR01 Copied: components/mop/tags/1.0.3-CR01/trunk (from rev 3147, components/mop/trunk)

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits May 2010