[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Bigtop (incubating) (https://cwiki.apache.org/confluence/display/BIGTOP) Pages - Bigtop 0.4.0 hackathon May 17, 2012 agenda edited by do...@stanfordalumni.org (09:12 PM) https://cwiki.apache.org/confluence/display/BIGTOP/Bigtop+0.4.0+hackathon+May+17%2C+2012+agenda Apache Buildr (https://cwiki.apache.org/confluence/display/BUILDR) Pages - May 2012 Board Report created by boisvert (11:51 AM) https://cwiki.apache.org/confluence/display/BUILDR/May+2012+Board+Report Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - JCR edited by bibryam (10:11 PM) https://cwiki.apache.org/confluence/display/CAMEL/JCR Camel 2.10.0 Release edited by cmoulliard (01:14 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.0+Release Zookeeper edited by mazzag (08:02 AM) https://cwiki.apache.org/confluence/display/CAMEL/Zookeeper Building edited by davsclaus (07:06 AM) https://cwiki.apache.org/confluence/display/CAMEL/Building Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Configuration of the Bus edited by dkulp (09:51 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/Configuration+of+the+Bus WS-Security edited by mazzag (05:12 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/WS-Security Apache Flume (https://cwiki.apache.org/confluence/display/FLUME) Pages - Getting Started edited by w...@cloudera.com (06:15 PM) https://cwiki.apache.org/confluence/display/FLUME/Getting+Started Apache Maven (https://cwiki.apache.org/confluence/display/MAVEN) Pages - Java 5 Annotations for Plugins edited by olamy (12:43 PM) https://cwiki.apache.org/confluence/display/MAVEN/Java+5+Annotations+for+Plugins OFBiz Project Administration Workspace (https://cwiki.apache.org/confluence/display/OFBADMIN) Pages - Mailing Lists edited by jacques.le.roux (04:25 AM) https://cwiki.apache.org/confluence/display/OFBADMIN/Mailing+Lists OFBiz Source Repository and Access edited by toashishvijay (02:01 AM) https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Source+Repository+and+Access OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - How to migrate OfBiz from Derby to MySQL database edited by ak_avinash (08:37 AM) https://cwiki.apache.org/confluence/display/OFBIZ/How+to+migrate+OfBiz+from+Derby+to+MySQL+database Apache OFBiz User List edited by jacques.le.roux (03:10 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Apache OpenOffice Social Promotion Kit edited by arie...@apache.org (10:03 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Apache+OpenOffice+Social+Promotion+Kit Improvements for the download webpages edited by mla (06:55 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Improvements+for+the+download+webpages AOO 4.0 Feature Planning edited by arist (05:16 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Feature+Planning OpenJPA (https://cwiki.apache.org/confluence/display/openjpa) Pages - Building and Running OpenBooks edited by kwsut...@gmail.com (04:04 PM) https://cwiki.apache.org/confluence/display/openjpa/Building+and+Running+OpenBooks Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP) Pages - Books created by joern (04:53 AM) https://cwiki.apache.org/confluence/display/OPENNLP/Books Index edited by joern (04:51 AM) https://cwiki.apache.org/confluence/display/OPENNLP/Index Apache Pig (https://cwiki.apache.org/confluence/display/PIG) Pages - GSoc2012 edited by daijy (09:34 PM) https://cwiki.apache.org/confluence/display/PIG/GSoc2012 Apache Qpid (https://cwiki.apache.org/confluence/display/qpid) Pages - 0.16 Release edited by justi9 (05:58 PM) https
svn commit: r1336486 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
Author: lukaszlenart
Date: Thu May 10 05:54:36 2012
New Revision: 1336486
URL: http://svn.apache.org/viewvc?rev=1336486&view=rev
Log:
WW-3763 adds setter to inject missing UrlHelper
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=1336486&r1=1336485&r2=1336486&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
Thu May 10 05:54:36 2012
@@ -29,6 +29,7 @@ import org.apache.struts2.dispatcher.map
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.portlet.util.PortletUrlHelper;
import org.apache.struts2.portlet.util.PortletUrlHelperJSR286;
+import org.apache.struts2.views.util.UrlHelper;
import javax.portlet.PortletMode;
import java.io.IOException;
@@ -44,7 +45,7 @@ public class PortletUrlRenderer implemen
/**
* The servlet renderer used when not executing in a portlet context.
*/
-private UrlRenderer servletRenderer = null;
+private ServletUrlRenderer servletRenderer = null;
private PortletUrlHelper portletUrlHelper = null;
public PortletUrlRenderer() {
@@ -62,18 +63,23 @@ public class PortletUrlRenderer implemen
servletRenderer.setActionMapper(actionMapper);
}
+@Inject
+public void setUrlHelper(UrlHelper urlHelper) {
+servletRenderer.setUrlHelper(urlHelper);
+}
+
/**
* {@inheritDoc}
*/
public void renderUrl(Writer writer, UrlProvider urlComponent) {
-if (PortletActionContext.getPortletContext() == null ||
"none".equalsIgnoreCase(urlComponent.getPortletUrlType())) {
+if (PortletActionContext.getPortletContext() == null) {
servletRenderer.renderUrl(writer, urlComponent);
return;
}
String result;
if
(isPortletModeChange(urlComponent,PortletActionContext.getRequest().getPortletMode())
- && StringUtils.isEmpty(urlComponent.getNamespace())
- ) {
+ && StringUtils.isEmpty(urlComponent.getNamespace()))
+{
String mode = urlComponent.getPortletMode();
PortletMode portletMode = new PortletMode(mode);
String action = urlComponent.getAction();
@@ -126,13 +132,10 @@ public class PortletUrlRenderer implemen
}
private String createDefaultUrl(UrlProvider urlComponent) {
-String result;
-ActionInvocation ai = (ActionInvocation)
urlComponent.getStack().getContext().get(
-ActionContext.ACTION_INVOCATION);
+ActionInvocation ai = (ActionInvocation)
urlComponent.getStack().getContext().get(ActionContext.ACTION_INVOCATION);
String action = ai.getProxy().getActionName();
-result = portletUrlHelper.buildUrl(action,
urlComponent.getNamespace(), urlComponent.getMethod(),
urlComponent.getParameters(),
+return portletUrlHelper.buildUrl(action, urlComponent.getNamespace(),
urlComponent.getMethod(), urlComponent.getParameters(),
urlComponent.getPortletUrlType(),
urlComponent.getPortletMode(), urlComponent.getWindowState());
-return result;
}
private boolean onlyValueSpecified(UrlProvider urlComponent) {
@@ -153,7 +156,7 @@ public class PortletUrlRenderer implemen
}
String namespace =
formComponent.determineNamespace(formComponent.namespace,
formComponent.getStack(),
formComponent.request);
-String action = null;
+String action;
if (formComponent.action != null) {
action = formComponent.findString(formComponent.action);
} else {
