svn commit: r1297994 - in /struts/struts2/trunk/plugins/portlet/src: main/java/org/apache/struts2/components/ test/java/org/apache/struts2/components/ test/java/org/apache/struts2/views/jsp/ test/reso
Author: lukaszlenart Date: Wed Mar 7 15:34:38 2012 New Revision: 1297994 URL: http://svn.apache.org/viewvc?rev=1297994&view=rev Log: WW-3769 adds missing line of code to generate namespace without explicit specifying it Added: struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/ struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java struts/struts2/trunk/plugins/portlet/src/test/resources/ struts/struts2/trunk/plugins/portlet/src/test/resources/struts.xml Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.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=1297994&r1=1297993&r2=1297994&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 Wed Mar 7 15:34:38 2012 @@ -75,6 +75,7 @@ public class PortletUrlRenderer implemen } String result; + urlComponent.setNamespace(urlComponent.determineNamespace(urlComponent.getNamespace(), urlComponent.getStack(), urlComponent.getHttpServletRequest())); if (onlyActionSpecified(urlComponent)) { result = portletUrlHelper.buildUrl(urlComponent.getAction(), urlComponent.getNamespace(), urlComponent.getMethod(), urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState()); Added: struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java?rev=1297994&view=auto == --- struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java (added) +++ struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java Wed Mar 7 15:34:38 2012 @@ -0,0 +1,11 @@ +package org.apache.struts2.components; + +import com.opensymphony.xwork2.Action; + +public class PortletAction { + +public String execute() { +return Action.SUCCESS; +} + +} Added: struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java?rev=1297994&view=auto == --- struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java (added) +++ struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java Wed Mar 7 15:34:38 2012 @@ -0,0 +1,50 @@ +package org.apache.struts2.components; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.portlet.PortletConstants; +import org.springframework.mock.web.portlet.MockMimeResponse; +import org.springframework.mock.web.portlet.MockPortletContext; +import org.springframework.mock.web.portlet.MockPortletRequest; + +import javax.portlet.PortletContext; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Collections; + +public class PortletUrlRendererTest extends StrutsTestCase { + +private ValueStack stack; + +public void setUp() throws Exception { +super.setUp(); + +ActionProxy actionProxy = getActionProxy("/portlettest/test"); // creates new empty ActionContext +ActionContext.getContext().put(ActionContext.ACTION_INVOCATION, actionProxy.getInvocation()); + +PortletContext portletCtx = new MockPortletContext(); +ActionContext.getContext().put(StrutsStatics.STRUTS_PORTLET_CONTEXT, portletCtx); +ActionContext.getContext().put(PortletConstants.REQUEST, new MockPortletRequest(portletCtx)); +ActionContext.getContext().put(PortletConstants.RESPONSE, new MockMimeResponse()); +ActionContext.getContext().put(PortletConstants.MOD
svn commit: r1297997 - /struts/struts2/trunk/pom.xml
Author: lukaszlenart Date: Wed Mar 7 15:47:52 2012 New Revision: 1297997 URL: http://svn.apache.org/viewvc?rev=1297997&view=rev Log: WW-3771 upgrades to the latest FreeMarker version Modified: struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1297997&r1=1297996&r2=1297997&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Wed Mar 7 15:47:52 2012 @@ -361,7 +361,7 @@ org.freemarker freemarker -2.3.18 +2.3.19
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Index edited by dkulp (11:44 AM) https://cwiki.apache.org/confluence/display/CAMEL/Index How do I set the MEP when interacting with JBI? edited by dkulp (10:05 AM) https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=97303 Better JMS Transport for CXF Webservice using Apache Camel edited by dkulp (10:01 AM) https://cwiki.apache.org/confluence/display/CAMEL/Better+JMS+Transport+for+CXF+Webservice+using+Apache+Camel Camel CXF Design edited by dkulp (09:52 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+CXF+Design SMPP edited by mazzag (09:31 AM) https://cwiki.apache.org/confluence/display/CAMEL/SMPP Mock edited by mazzag (07:40 AM) https://cwiki.apache.org/confluence/display/CAMEL/Mock Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Developing Assertions edited by ashakirin (12:16 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/Developing+Assertions How It Works edited by ashakirin (11:30 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/How+It+Works WS-Policy edited by ashakirin (11:07 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/WS-Policy How to Define Policies created by ashakirin (11:06 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/How+to+Define+Policies Apache Flex (https://cwiki.apache.org/confluence/display/FLEX) Pages - Decisions so far edited by rsan...@spectacompany.com.br (04:39 PM) https://cwiki.apache.org/confluence/display/FLEX/Decisions+so+far Comments https://cwiki.apache.org/confluence/display/FLEX/Status (1) Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA) Pages - Kafka Replication edited by nehanarkhede (08:12 PM) https://cwiki.apache.org/confluence/display/KAFKA/Kafka+Replication Developer Setup edited by prashanth.menon (04:51 PM) https://cwiki.apache.org/confluence/display/KAFKA/Developer+Setup Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Pages - Stochastic Singular Value Decomposition edited by dlyubi...@apache.org (05:43 PM) https://cwiki.apache.org/confluence/display/MAHOUT/Stochastic+Singular+Value+Decomposition Algorithms edited by dlyubi...@apache.org (05:42 PM) https://cwiki.apache.org/confluence/display/MAHOUT/Algorithms Comments https://cwiki.apache.org/confluence/display/MAHOUT/Creating+Vectors+from+Text (1) Apache MyFaces (https://cwiki.apache.org/confluence/display/MYFACES) Pages - ViewExpiredException and session expiry edited by peterkemp (09:14 PM) https://cwiki.apache.org/confluence/display/MYFACES/ViewExpiredException+and+session+expiry OFBiz Project Administration Workspace (https://cwiki.apache.org/confluence/display/OFBADMIN) Pages - Mini-language Reference created by adrianc (05:20 AM) https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Apache OFBiz User List edited by bobhoskins (12:25 PM) https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO 3.4 Unofficial Developer Snapshots edited by tjfrazier (06:39 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+Unofficial+Developer+Snapshots Apache Shiro (https://cwiki.apache.org/confluence/display/SHIRO) Pages - Articles edited by lhazlewood (04:09 PM) https://cwiki.apache.org/confluence/display/SHIRO/Articles Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP) Pages - Incubator Status Report (March 2012) edited by arvind (07:31 PM) https://cwiki.apache.org/confluence/display/SQOOP/Incubator+Status+Report+%28March+2012%29 - Users - jacksure https://cwiki.apache.org/co