[gatein-commits] gatein SVN: r4257 - in portal/branches/navcontroller: portlet/web/src/main/webapp/groovy/portal/webui/component and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Sep 20 10:04:18 EDT 2010
Author: julien_viet
Date: 2010-09-20 10:04:17 -0400 (Mon, 20 Sep 2010)
New Revision: 4257
Modified:
portal/branches/navcontroller/pom.xml
portal/branches/navcontroller/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java
portal/branches/navcontroller/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java
Log:
- fix an issue with the renaming of ResourceURL to ControllerURL in gtmpl
- update to portlet container 2.2.0-Beta02 and common 2.0.3-GA
- fix issue with PortletURL.getParameterMap().clear() that now does a proper reset
- use PortletURL properties to propagate ajax and confirm from PortletURLBuilder
Modified: portal/branches/navcontroller/pom.xml
===================================================================
--- portal/branches/navcontroller/pom.xml 2010-09-20 12:56:49 UTC (rev 4256)
+++ portal/branches/navcontroller/pom.xml 2010-09-20 14:04:17 UTC (rev 4257)
@@ -44,9 +44,9 @@
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
- <org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
+ <org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta02</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
Modified: portal/branches/navcontroller/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
===================================================================
--- portal/branches/navcontroller/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2010-09-20 12:56:49 UTC (rev 4256)
+++ portal/branches/navcontroller/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2010-09-20 14:04:17 UTC (rev 4257)
@@ -5,7 +5,7 @@
import org.exoplatform.portal.webui.util.Util;
import org.gatein.common.text.EntityEncoder;
import org.exoplatform.portal.application.PortalRequestContext;
- import org.exoplatform.web.url.ResourceURL;
+ import org.exoplatform.web.url.ControllerURL;
import org.exoplatform.web.application.Parameter;
def rcontext = _ctx.getRequestContext();
@@ -22,9 +22,9 @@
navigations = uicomponent.getNavigations();
- ResourceURL nodeURL = pcontext.createURL(org.exoplatform.portal.url.navigation.NavigationLocator.TYPE);
+ ControllerURL nodeURL = pcontext.createURL(org.exoplatform.portal.url.navigation.NavigationLocator.TYPE);
- public void renderChildrenContainer(PageNavigation nav, PageNode node, ResourceURL nodeURL) {
+ public void renderChildrenContainer(PageNavigation nav, PageNode node, ControllerURL nodeURL) {
print """
<div class="MenuItemContainer" style="display: none;">
<div class="MenuItemDecorator">
@@ -54,7 +54,7 @@
""";
}
- public void renderChildNode(PageNavigation nav, PageNode node, ResourceURL nodeURL) {
+ public void renderChildNode(PageNavigation nav, PageNode node, ControllerURL nodeURL) {
PageNode selectedNode = uicomponent.getSelectedPageNode();
PageNavigation selectedNav = uicomponent.getSelectedNavigation();
String tabStyleNavigation = "NormalItem"; // OverItem
Modified: portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-09-20 12:56:49 UTC (rev 4256)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-09-20 14:04:17 UTC (rev 4257)
@@ -4,7 +4,7 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.navigation.TreeNode;
- import org.exoplatform.web.url.ResourceURL;
+ import org.exoplatform.web.url.ControllerURL;
import org.exoplatform.web.application.Parameter;
%>
<%
@@ -19,10 +19,10 @@
def actionExpandAll = uicomponent.event("ExpandAllNode");
def actionCollapseAll = uicomponent.event("CollapseAllNode");
- ResourceURL nodeURL = pcontext.createURL(org.exoplatform.portal.url.navigation.NavigationLocator.TYPE);
+ ControllerURL nodeURL = pcontext.createURL(org.exoplatform.portal.url.navigation.NavigationLocator.TYPE);
nodeURL.setAjax(true);
- public void renderNodes(TreeNode rootTree, ResourceURL nodeURL, boolean useAjax) {
+ public void renderNodes(TreeNode rootTree, ControllerURL nodeURL, boolean useAjax) {
List childrenNodes=rootTree.getChildren();
int childrenSize = childrenNodes.size() ;
int size = 0;
@@ -37,7 +37,7 @@
actionExpand = uicomponent.event("ExpandNode", nav.getId() + "::" + node.getUri());
def actionCollapse = "ajaxAsyncGetRequest('" + uicomponent.url("CollapseNode",nav.getId() + "::" + node.getUri()) + "', true)";
- String actionLink = nodeURL.setResource(node).toString();
+ String actionLink = nodeURL.setController(node).toString();
lastNode = '';
Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2010-09-20 12:56:49 UTC (rev 4256)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2010-09-20 14:04:17 UTC (rev 4257)
@@ -243,6 +243,12 @@
}
}
+ // Ajax support
+ url.setAjax("true".equals(containerURL.getProperties().get("ajax")));
+
+ // Confirm messsage
+ url.setConfirm(containerURL.getProperties().get("confirm"));
+
//
return url.toString();
}
Modified: portal/branches/navcontroller/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java
===================================================================
--- portal/branches/navcontroller/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2010-09-20 12:56:49 UTC (rev 4256)
+++ portal/branches/navcontroller/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2010-09-20 14:04:17 UTC (rev 4257)
@@ -25,7 +25,6 @@
import org.exoplatform.webui.core.UIComponent;
import javax.portlet.PortletURL;
-import java.net.URLEncoder;
/**
* julien todo : use PortletURL parameter instead of appending them to the url returned by the PortletURL
@@ -46,61 +45,28 @@
public String createAjaxURL(UIComponent targetComponent, String action, String confirm, String targetBeanId, Parameter[] params)
{
- StringBuilder builder = new StringBuilder("javascript:");
- if (confirm != null && confirm.length() > 0)
- {
- builder.append("if(confirm('").append(confirm.replaceAll("'", "\\\\'")).append("'))");
- }
- builder.append("ajaxGet('");
- if (targetBeanId != null)
- {
- try
- {
- targetBeanId = URLEncoder.encode(targetBeanId, "utf-8");
- }
- catch (Exception e)
- {
- System.err.println(e.toString());
- }
- }
- createURL(builder, targetComponent, action, targetBeanId, params);
- builder.append("&ajaxRequest=true')");
- return builder.toString();
+ return createURL(true, confirm, targetComponent, action, targetBeanId, params);
}
public String createURL(UIComponent targetComponent, String action, String confirm, String targetBeanId, Parameter[] params)
{
- StringBuilder builder = new StringBuilder();
- boolean hasConfirm = confirm != null && confirm.length() > 0;
- if (hasConfirm)
- {
- builder.append("javascript:if(confirm('").append(confirm.replaceAll("'", "\\\\'")).append("'))");
- builder.append("window.location=\'");
- }
- if (targetBeanId != null)
- {
- try
- {
- targetBeanId = URLEncoder.encode(targetBeanId, "utf-8");
- }
- catch (Exception e)
- {
- System.err.println(e.toString());
- }
- }
- createURL(builder, targetComponent, action, targetBeanId, params);
- if (hasConfirm)
- builder.append("\';");
- return builder.toString();
+ return createURL(false, confirm, targetComponent, action, targetBeanId, params);
}
- private void createURL(StringBuilder builder, UIComponent targetComponent, String action, String targetBeanId,
+ private String createURL(
+ boolean ajax,
+ String confirm,
+ UIComponent targetComponent, String action, String targetBeanId,
Parameter[] params)
{
// Clear URL
url.getParameterMap().clear();
//
+ url.setProperty("ajax", Boolean.toString(ajax));
+ url.setProperty("confirm", confirm);
+
+ //
url.setParameter(UIComponent.UICOMPONENT, targetComponent.getId());
//
@@ -125,6 +91,6 @@
}
//
- builder.append(url.toString());
+ return url.toString();
}
}
More information about the gatein-commits
mailing list