gatein SVN: r4069 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-07 09:02:20 -0400 (Tue, 07 Sep 2010)
New Revision: 4069
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
Log:
- GTNWSRP-61: Again, not sure what's going on... :(
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-07 13:00:57 UTC (rev 4068)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-07 13:02:20 UTC (rev 4069)
@@ -40,9 +40,7 @@
</h:column>
<h:column>
- <f:facet name="header">#{i18n.portlets_table
- _c
- olumn_portlet_name}</f:facet>
+ <f:facet name="header">#{i18n.portlets_table_column_portlet_name}</f:facet>
#{portlet.handle}
</h:column>
</h:dataTable>
14 years, 3 months
gatein SVN: r4068 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-07 09:00:57 -0400 (Tue, 07 Sep 2010)
New Revision: 4068
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
Log:
- GTNWSRP-61: Fixed weird issues with spaces.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-07 12:48:39 UTC (rev 4067)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-07 13:00:57 UTC (rev 4068)
@@ -34,17 +34,16 @@
rowClasses="EvenRow,OddRow"
styleClass="UIGrid" width="100%">
<h:column>
- <f:facet name="header">#{i18n.portlets_ta
- bl
- e_column_include}</f:facet>
+ <f:facet name="header">#{i18n.portlets_table_column_include}</f:facet>
<h:selectBooleanCheckbox value="#{portlet.selected}"/>
</h:column>
<h:column>
- <f:facet name="header">#{i18n.portlets_table_column_portlet_name}</f:facet>
- #{p
- ortlet.handle}
+ <f:facet name="header">#{i18n.portlets_table
+ _c
+ olumn_portlet_name}</f:facet>
+ #{portlet.handle}
</h:column>
</h:dataTable>
<table class="ActionContainer">
14 years, 3 months
gatein SVN: r4067 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2010-09-07 08:48:39 -0400 (Tue, 07 Sep 2010)
New Revision: 4067
Added:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/BaseHttpRequestWrapper.java
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/HttpRequestWrapper.java
Log:
GTNPORTAL-1355: Locale is not set correctly in login form when login failed
- when request was intercepted by LocalizationFilter, the session retrieved from request would not be the same among different web modules, breaking session state sharing - now fixed
Added: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/BaseHttpRequestWrapper.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/BaseHttpRequestWrapper.java (rev 0)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/BaseHttpRequestWrapper.java 2010-09-07 12:48:39 UTC (rev 4067)
@@ -0,0 +1,497 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * 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.application.localization;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * This class is an alternative for {@link javax.servlet.http.HttpServletRequestWrapper}.
+ * One reason for favoring it is to avoid situations when servlet container decides to replace
+ * the delegate via {@link javax.servlet.ServletRequestWrapper#setRequest(javax.servlet.ServletRequest)}.
+ *
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class BaseHttpRequestWrapper implements HttpServletRequest
+{
+
+ private HttpServletRequest delegate;
+
+ /**
+ * Create new instance
+ * @param request delegate {@link HttpServletRequest}
+ */
+ public BaseHttpRequestWrapper(HttpServletRequest request)
+ {
+ delegate = request;
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getAuthType()
+ */
+ public String getAuthType()
+ {
+ return delegate.getAuthType();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getCookies()
+ */
+ public Cookie[] getCookies()
+ {
+ return delegate.getCookies();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getDateHeader(String)
+ */
+ public long getDateHeader(String name)
+ {
+ return delegate.getDateHeader(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getHeader(String)
+ */
+ public String getHeader(String name)
+ {
+ return delegate.getHeader(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getHeaders(String)
+ */
+ public Enumeration getHeaders(String name)
+ {
+ return delegate.getHeaders(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
+ */
+ public Enumeration getHeaderNames()
+ {
+ return delegate.getHeaderNames();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getIntHeader(String)
+ */
+ public int getIntHeader(String name)
+ {
+ return delegate.getIntHeader(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getMethod()
+ */
+ public String getMethod()
+ {
+ return delegate.getMethod();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getPathInfo()
+ */
+ public String getPathInfo()
+ {
+ return delegate.getPathInfo();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getPathTranslated()
+ */
+ public String getPathTranslated()
+ {
+ return delegate.getPathTranslated();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getContextPath()
+ */
+ public String getContextPath()
+ {
+ return delegate.getContextPath();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getQueryString()
+ */
+ public String getQueryString()
+ {
+ return delegate.getQueryString();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
+ */
+ public String getRemoteUser()
+ {
+ return delegate.getRemoteUser();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isUserInRole(String)
+ */
+ public boolean isUserInRole(String role)
+ {
+ return delegate.isUserInRole(role);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
+ */
+ public Principal getUserPrincipal()
+ {
+ return delegate.getUserPrincipal();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId()
+ */
+ public String getRequestedSessionId()
+ {
+ return delegate.getRequestedSessionId();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRequestURI()
+ */
+ public String getRequestURI()
+ {
+ return delegate.getRequestURI();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRequestURL()
+ */
+ public StringBuffer getRequestURL()
+ {
+ return delegate.getRequestURL();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getServletPath()
+ */
+ public String getServletPath()
+ {
+ return delegate.getServletPath();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getSession(boolean)
+ */
+ public HttpSession getSession(boolean create)
+ {
+ return delegate.getSession(create);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getSession()
+ */
+ public HttpSession getSession()
+ {
+ return delegate.getSession();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
+ */
+ public boolean isRequestedSessionIdValid()
+ {
+ return delegate.isRequestedSessionIdValid();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
+ */
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ return delegate.isRequestedSessionIdFromCookie();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
+ */
+ public boolean isRequestedSessionIdFromURL()
+ {
+ return delegate.isRequestedSessionIdFromURL();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl()
+ */
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ return delegate.isRequestedSessionIdFromUrl();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getAttribute(String)
+ */
+ public Object getAttribute(String name)
+ {
+ return delegate.getAttribute(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getAttributeNames()
+ */
+ public Enumeration getAttributeNames()
+ {
+ return delegate.getAttributeNames();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getCharacterEncoding()
+ */
+ public String getCharacterEncoding()
+ {
+ return delegate.getCharacterEncoding();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#setCharacterEncoding(String)
+ */
+ public void setCharacterEncoding(String env) throws UnsupportedEncodingException
+ {
+ delegate.setCharacterEncoding(env);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getContentLength()
+ */
+ public int getContentLength()
+ {
+ return delegate.getContentLength();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getContentType()
+ */
+ public String getContentType()
+ {
+ return delegate.getContentType();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getInputStream()
+ */
+ public ServletInputStream getInputStream() throws IOException
+ {
+ return delegate.getInputStream();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getParameter(String)
+ */
+ public String getParameter(String name)
+ {
+ return delegate.getParameter(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getParameterNames()
+ */
+ public Enumeration getParameterNames()
+ {
+ return delegate.getParameterNames();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getParameterValues(String)
+ */
+ public String[] getParameterValues(String name)
+ {
+ return delegate.getParameterValues(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getParameterMap()
+ */
+ public Map getParameterMap()
+ {
+ return delegate.getParameterMap();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getProtocol()
+ */
+ public String getProtocol()
+ {
+ return delegate.getProtocol();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getScheme()
+ */
+ public String getScheme()
+ {
+ return delegate.getScheme();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getServerName()
+ */
+ public String getServerName()
+ {
+ return delegate.getServerName();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getServerPort()
+ */
+ public int getServerPort()
+ {
+ return delegate.getServerPort();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getReader()
+ */
+ public BufferedReader getReader() throws IOException
+ {
+ return delegate.getReader();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRemoteAddr()
+ */
+ public String getRemoteAddr()
+ {
+ return delegate.getRemoteAddr();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRemoteHost()
+ */
+ public String getRemoteHost()
+ {
+ return delegate.getRemoteHost();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#setAttribute(String, Object)
+ */
+ public void setAttribute(String name, Object o)
+ {
+ delegate.setAttribute(name, o);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#removeAttribute(String)
+ */
+ public void removeAttribute(String name)
+ {
+ delegate.removeAttribute(name);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getLocale()
+ */
+ public Locale getLocale()
+ {
+ return delegate.getLocale();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getLocales()
+ */
+ public Enumeration getLocales()
+ {
+ return delegate.getLocales();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#isSecure()
+ */
+ public boolean isSecure()
+ {
+ return delegate.isSecure();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRequestDispatcher(String)
+ */
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return delegate.getRequestDispatcher(path);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRealPath(String)
+ */
+ public String getRealPath(String path)
+ {
+ return delegate.getRealPath(path);
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getRemotePort()
+ */
+ public int getRemotePort()
+ {
+ return delegate.getRemotePort();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getLocalName()
+ */
+ public String getLocalName()
+ {
+ return delegate.getLocalName();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getLocalAddr()
+ */
+ public String getLocalAddr()
+ {
+ return delegate.getLocalAddr();
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServletRequest#getLocalPort()
+ */
+ public int getLocalPort()
+ {
+ return delegate.getLocalPort();
+ }
+
+ /**
+ * Get the underlying request - the delegate
+ */
+ public HttpServletRequest getRequest()
+ {
+ return delegate;
+ }
+}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/HttpRequestWrapper.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/HttpRequestWrapper.java 2010-09-07 11:34:22 UTC (rev 4066)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/HttpRequestWrapper.java 2010-09-07 12:48:39 UTC (rev 4067)
@@ -24,7 +24,6 @@
import org.exoplatform.portal.application.PortalRequestContext;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import java.util.Collections;
import java.util.Enumeration;
import java.util.LinkedList;
@@ -34,7 +33,7 @@
/**
* @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
*/
-public class HttpRequestWrapper extends HttpServletRequestWrapper
+public class HttpRequestWrapper extends BaseHttpRequestWrapper
{
private static final List<Locale> EMPTY_LOCALE_LIST = Collections.emptyList();
14 years, 3 months
gatein SVN: r4066 - portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-09-07 07:34:22 -0400 (Tue, 07 Sep 2010)
New Revision: 4066
Modified:
portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1379: Update Java code
Modified: portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-07 11:20:54 UTC (rev 4065)
+++ portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-07 11:34:22 UTC (rev 4066)
@@ -170,7 +170,6 @@
//
Text markup = null;
- String portletTitle = null;
try
{
@@ -217,8 +216,7 @@
markup = Text.create("");
break;
}
- portletTitle = fragmentResponse.getTitle();
- uicomponent.setConfiguredTitle(portletTitle);
+ uicomponent.setConfiguredTitle(fragmentResponse.getTitle());
// setup portlet properties
if (fragmentResponse.getProperties() != null)
@@ -338,7 +336,6 @@
WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext);
bcontext.put(UIComponent.UICOMPONENT, uicomponent);
bcontext.put("portletContent", markup);
- //bcontext.put("portletTitle", portletTitle);
try
{
renderTemplate(uicomponent.getTemplate(), bcontext);
14 years, 3 months
gatein SVN: r4065 - components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-07 07:20:54 -0400 (Tue, 07 Sep 2010)
New Revision: 4065
Modified:
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java
Log:
- GTNWSRP-68: added test case.
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-09-07 10:50:22 UTC (rev 4064)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-09-07 11:20:54 UTC (rev 4065)
@@ -52,6 +52,12 @@
factory = new SOAPServiceFactory();
}
+ public void testV2ServiceWithExtraPorts() throws Exception
+ {
+ factory.setWsdlDefinitionURL("http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark...");
+ checkPorts(WSRP2_PORT_TYPES);
+ }
+
public void testSimpleV2Service() throws Exception
{
factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=...");
14 years, 3 months
gatein SVN: r4064 - in portal/branches/branch-r4047: webui/portal/src/main/java/org/exoplatform/portal/application and 2 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-09-07 06:50:22 -0400 (Tue, 07 Sep 2010)
New Revision: 4064
Modified:
portal/branches/branch-r4047/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
portal/branches/branch-r4047/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java
Log:
GTNPORTAL-1379: Update Java code to enable localization of page title
Modified: portal/branches/branch-r4047/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/branches/branch-r4047/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-09-07 09:42:14 UTC (rev 4063)
+++ portal/branches/branch-r4047/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-09-07 10:50:22 UTC (rev 4064)
@@ -37,14 +37,7 @@
<div class="FixHeight">
<%
if(hasPermission) {
- if(portletTitle == null || portletTitle.trim().length() < 1) {
- try {
- String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName();
- print _ctx.getRequestContext().getApplicationResourceBundle().getString("UIPortlet.description." + portletName);
- } catch(Exception e){
- print uicomponent.getDisplayName();
- }
- } else print portletTitle;
+ print uicomponent.getDisplayTitle();
} else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";
%>
</div>
@@ -62,12 +55,8 @@
if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) {
if(uicomponent.getShowInfoBar()) {
- String title = portletTitle;
+ String title = uicomponent.getDisplayTitle();
if(title == null || title.trim().length() < 1)
- title = uicomponent.getTitle();
- if(title == null || title.trim().length() < 1)
- title = uicomponent.getDisplayName();
- if(title == null || title.trim().length() < 1)
title = portletId;
/*Begin Window Portlet Bar*/
String visibility = "visible";
@@ -292,9 +281,7 @@
String portletIcon = uicomponent.getIcon();
if(portletIcon == null) portletIcon = "PortletIcon";
- String title = portletTitle;
- if(title == null || title.trim().length() < 1)
- title = uicomponent.getDisplayTitle();
+ String title = uicomponent.getDisplayTitle();
if(title.length() > 30) title = title.substring(0,27) + "...";
%>
<div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
Modified: portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-07 09:42:14 UTC (rev 4063)
+++ portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-07 10:50:22 UTC (rev 4064)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.application;
import org.exoplatform.Constants;
+import org.exoplatform.commons.utils.ExpressionUtil;
import org.exoplatform.commons.utils.PortalPrinter;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.portal.config.UserPortalConfigService;
@@ -224,6 +225,7 @@
if (page != null)
{
title = page.getTitle();
+ return ExpressionUtil.getExpressionValue(this.getApplicationResourceBundle(), title);
}
else
{
Modified: portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-09-07 09:42:14 UTC (rev 4063)
+++ portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-09-07 10:50:22 UTC (rev 4064)
@@ -160,6 +160,9 @@
private StateString navigationalState;
+ /** A field storing localized value of javax.portlet.title **/
+ private String configuredTitle;
+
public UIPortlet()
{
// That value will be overriden when it is mapped onto a data storage
@@ -361,16 +364,6 @@
supportedPublicParams_ = supportedPublicRenderParameters;
}
- public String getDisplayTitle()
- {
- String title = getTitle();
- if (title == null)
- {
- title = getDisplayName();
- }
- return title;
- }
-
public String getDisplayName()
{
if (displayName == null)
@@ -925,4 +918,37 @@
{
this.navigationalState = navigationalState;
}
+
+ protected void setConfiguredTitle(String _configuredTitle)
+ {
+ this.configuredTitle = _configuredTitle;
+ }
+
+ /**
+ * Returns the title showed on the InfoBar. The title is computed in following manner.
+ *
+ * 1. First, the method getTitle(), inherited from UIPortalComponent is called. The getTitle() returns
+ * what users set in the PortletSetting tab, the current method returns call result if it is not null.
+ *
+ * 2. configuredTitle, which is the localized value of javax.portlet.title is returned if it is not null.
+ *
+ * 3. If the method does not terminate at neither (1) nor (2), the configured display name is returned.
+ * @return
+ */
+ public String getDisplayTitle()
+ {
+ String displayedTitle = getTitle();
+ if(displayedTitle != null && displayedTitle.trim().length() > 0)
+ {
+ return displayedTitle;
+ }
+
+ if(configuredTitle != null)
+ {
+ return configuredTitle;
+ }
+
+ return getDisplayName();
+
+ }
}
\ No newline at end of file
Modified: portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-07 09:42:14 UTC (rev 4063)
+++ portal/branches/branch-r4047/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-07 10:50:22 UTC (rev 4064)
@@ -218,7 +218,8 @@
break;
}
portletTitle = fragmentResponse.getTitle();
-
+ uicomponent.setConfiguredTitle(portletTitle);
+
// setup portlet properties
if (fragmentResponse.getProperties() != null)
{
@@ -337,7 +338,7 @@
WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext);
bcontext.put(UIComponent.UICOMPONENT, uicomponent);
bcontext.put("portletContent", markup);
- bcontext.put("portletTitle", portletTitle);
+ //bcontext.put("portletTitle", portletTitle);
try
{
renderTemplate(uicomponent.getTemplate(), bcontext);
Modified: portal/branches/branch-r4047/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java
===================================================================
--- portal/branches/branch-r4047/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-09-07 09:42:14 UTC (rev 4063)
+++ portal/branches/branch-r4047/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-09-07 10:50:22 UTC (rev 4064)
@@ -107,6 +107,9 @@
{
try
{
+ //Needed to localize title via predefined I18n key javax.portlet.title
+ res.setTitle(getTitle(req));
+
getPortletApplication().render(req, res);
}
catch (Exception ex)
14 years, 3 months
gatein SVN: r4063 - in components/wsrp/trunk: wsrp-producer-war and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-07 05:42:14 -0400 (Tue, 07 Sep 2010)
New Revision: 4063
Modified:
components/wsrp/trunk/UpdateWSRPForGateIn.sh
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
- Changed name of environment variable from JBOSS_TEST_HOME to JBOSS_5_1_0_HOME for the clean AS version to use in tests to align with PC tests, thus making it easier for people. Thanks, theute! :)
Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh
===================================================================
--- components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-09-07 09:25:32 UTC (rev 4062)
+++ components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-09-07 09:42:14 UTC (rev 4063)
@@ -33,13 +33,13 @@
fi
echo Using GateIn home at: $GATEIN_EAR_HOME
-if [ -z "$JBOSS_TEST_HOME" -o ! -d "$JBOSS_TEST_HOME" ]
+if [ -z "$JBOSS_5_1_0_HOME" -o ! -d "$JBOSS_5_1_0_HOME" ]
then
- echo \=\=\> Please set JBOSS_TEST_HOME to point the root directory of a clean install of JBoss AS 5.1.x to be used for tests
+ echo \=\=\> Please set JBOSS_5_1_0_HOME to point the root directory of a clean install of JBoss AS 5.1.x to be used for tests
exit
fi
echo --------------------------------------------------------------------------
-echo \| Using JBoss AS home at: $JBOSS_TEST_HOME
+echo \| Using JBoss AS home at: $JBOSS_5_1_0_HOME
# Retrieve the current WSRP version as specified in the POM file
export CURRENT_WSRP=`grep -m 1 ".*<version>\(.*\)<\/version>.*" pom.xml | sed -n -e 's/.*<version>\(.*\)<\/.*/\1/p'`
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-07 09:25:32 UTC (rev 4062)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-07 09:42:14 UTC (rev 4063)
@@ -71,7 +71,7 @@
</activation>
<properties>
<jboss.systemPath>${jboss.zip.url}</jboss.systemPath>
- <JBOSS_TEST_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_TEST_HOME>
+ <JBOSS_5_1_0_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_5_1_0_HOME>
</properties>
<dependencies>
<dependency>
@@ -446,7 +446,7 @@
<configuration>
<container>
<containerId>jboss51x</containerId>
- <home>${JBOSS_TEST_HOME}</home>
+ <home>${JBOSS_5_1_0_HOME}</home>
<log>${basedir}/target/jboss51x/container.log</log>
<systemProperties>
<!-- Since the tests run on the server, we need to pass system properties to the
@@ -475,7 +475,7 @@
<configfiles>
<!-- hack to get normal logging instead of incredibly versbose -->
<configfile>
- <file>${JBOSS_TEST_HOME}/server/default/conf/jboss-log4j.xml</file>
+ <file>${JBOSS_5_1_0_HOME}/server/default/conf/jboss-log4j.xml</file>
<tofile>/conf/jboss-log4j.xml</tofile>
</configfile>
<configfile>
14 years, 3 months
gatein SVN: r4062 - components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-07 05:25:32 -0400 (Tue, 07 Sep 2010)
New Revision: 4062
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java
Log:
- If no ExportManager has been set, use the default one.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2010-09-07 08:25:27 UTC (rev 4061)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2010-09-07 09:25:32 UTC (rev 4062)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.producer;
import org.gatein.exports.ExportManager;
+import org.gatein.exports.impl.ExportManagerImpl;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletInvoker;
@@ -361,6 +362,10 @@
public ExportManager getExportManager()
{
+ if (exportManager == null)
+ {
+ exportManager = new ExportManagerImpl();
+ }
return exportManager;
}
14 years, 3 months
gatein SVN: r4061 - portal/branches/branch-r4047/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-09-07 04:25:27 -0400 (Tue, 07 Sep 2010)
New Revision: 4061
Modified:
portal/branches/branch-r4047/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
Log:
GTNPORTAL-1343 Cannot rename a tab dashboard on google Chrome and safary
Modified: portal/branches/branch-r4047/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
===================================================================
--- portal/branches/branch-r4047/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-09-07 07:08:42 UTC (rev 4060)
+++ portal/branches/branch-r4047/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-09-07 08:25:27 UTC (rev 4061)
@@ -39,11 +39,6 @@
var compId = portletFrag.parentNode.id;
var nodeIndex = inputElement.id;
- //Change the tab label
- var spanElement = document.createElement("span");
- spanElement.innerHTML = newTabLabel;
- inputElement.parentNode.replaceChild(spanElement, inputElement);
-
//Send request to server to change node name
var href = eXo.env.server.portalBaseURL + "?portal:componentId=" + compId;
href += "&portal:type=action";
14 years, 3 months
gatein SVN: r4060 - portal/branches/branch-r4047/component/portal/src/test/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-09-07 03:08:42 -0400 (Tue, 07 Sep 2010)
New Revision: 4060
Modified:
portal/branches/branch-r4047/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
Log:
GTNPORTAL-1359 Update testcase for removing group navigations when remove group
Modified: portal/branches/branch-r4047/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
===================================================================
--- portal/branches/branch-r4047/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-09-07 03:27:39 UTC (rev 4059)
+++ portal/branches/branch-r4047/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-09-07 07:08:42 UTC (rev 4060)
@@ -127,6 +127,31 @@
group = groupHandler.findGroupById("/groupTest");
assertNull(group);
}
+
+ public void testGroupNavigation() throws Exception
+ {
+ GroupHandler groupHandler = org.getGroupHandler();
+ Group group = groupHandler.createGroupInstance();
+ group.setGroupName("testGroupNavigation");
+ group.setLabel("testGroupNavigation");
+
+ groupHandler.addChild(null, group, true);
+
+ PageNavigation pageNavigation = new PageNavigation();
+ pageNavigation.setOwnerId(group.getId());
+ pageNavigation.setOwnerType(PortalConfig.GROUP_TYPE);
+ storage.create(pageNavigation);
+
+ pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId());
+ assertNotNull(pageNavigation);
+
+ // Remove group
+ groupHandler.removeGroup(group, true);
+
+ // Group navigations is removed after remove group
+ pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId());
+ assertNull(pageNavigation);
+ }
public void testUserLayout() throws Exception
{
14 years, 3 months