svn commit: r1381560 - in /struts/struts2/trunk: plugins/convention/src/main/java/org/apache/struts2/convention/ plugins/convention/src/main/java/org/apache/struts2/convention/annotation/ plugins/conv
Author: lukaszlenart
Date: Thu Sep 6 11:25:26 2012
New Revision: 1381560
URL: http://svn.apache.org/viewvc?rev=1381560&view=rev
Log:
WW-3874 merges AnnotationTools into AnnotationUtils
Added:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy2Class.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClass.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClassExt.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation2.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/package-info.java
Removed:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AnnotationTools.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/annotation/AnnotationToolsTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java?rev=1381560&r1=1381559&r2=1381560&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
Thu Sep 6 11:25:26 2012
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.config.en
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.AnnotationUtils;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import org.apache.struts2.convention.annotation.AnnotationTools;
import org.apache.struts2.convention.annotation.ResultPath;
import java.util.HashMap;
@@ -58,7 +58,7 @@ public class ConventionsServiceImpl impl
*/
public String determineResultPath(Class actionClass) {
String localResultPath = resultPath;
-ResultPath resultPathAnnotation =
AnnotationTools.findAnnotation(actionClass, ResultPath.class);
+ResultPath resultPathAnnotation =
AnnotationUtils.findAnnotation(actionClass, ResultPath.class);
if (resultPathAnnotation != null) {
if (resultPathAnnotation.value().equals("") &&
resultPathAnnotation.property().equals("")) {
throw new ConfigurationException("The ResultPath annotation
must have either" +
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java?rev=1381560&r1=1381559&r2=1381560&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
Thu Sep 6 11:25:26 2012
@@ -20,19 +20,8 @@
*/
package org.apache.struts2.convention;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.AnnotationTools;
-import org.apache.struts2.convention.annotation.InterceptorRef;
-import org.apache.struts2.convention.annotation.InterceptorRefs;
-
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import
svn commit: r1381573 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
Author: lukaszlenart Date: Thu Sep 6 12:30:24 2012 New Revision: 1381573 URL: http://svn.apache.org/viewvc?rev=1381573&view=rev Log: WW-3344 corrects mistake in an example Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java?rev=1381573&r1=1381572&r2=1381573&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java Thu Sep 6 12:30:24 2012 @@ -21,18 +21,16 @@ package org.apache.struts2.components; -import java.util.LinkedHashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; - import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.LinkedHashMap; +import java.util.Map; /** * @@ -51,7 +49,7 @@ import com.opensymphony.xwork2.util.logg * * NOTE: The id and doubleId need not be supplied as they will generated provided * that the optiontransferselect tag is being used in a form tag. The generated id - * and doubleId will be_ and + * and doubleId will be _ and * _ respectively. * *
svn commit: r1381585 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ test/java/org/apache/struts2/views/freemarker/ test/java/o
Author: lukaszlenart
Date: Thu Sep 6 12:54:48 2012
New Revision: 1381585
URL: http://svn.apache.org/viewvc?rev=1381585&view=rev
Log:
WW-3644 changes support for expression as a dynamic attribute to parse only
values enclosed in %{ and }
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?rev=1381585&r1=1381584&r2=1381585&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Thu Sep 6 12:54:48 2012
@@ -278,7 +278,7 @@ public class Component {
public static String stripExpressionIfAltSyntax(ValueStack stack,
String expr) {
if (altSyntax(stack)) {
// does the expression start with %{ and end with }? if so, just
cut it off!
-if (expr.startsWith("%{") && expr.endsWith("}")) {
+if (isExpression(expr)) {
return expr.substring(2, expr.length() - 1);
}
}
@@ -511,10 +511,16 @@ public class Component {
}
/**
- * Overwrite to set if body shold be used.
+ * Overwrite to set if body should be used.
* @return always false for this component.
*/
public boolean usesBody() {
return false;
}
+
+public static boolean isExpression(Object value) {
+String expr = value.toString();
+return expr.startsWith("%{") && expr.endsWith("}");
+}
+
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?rev=1381585&r1=1381584&r2=1381585&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
Thu Sep 6 12:54:48 2012
@@ -22,6 +22,7 @@
package org.apache.struts2.views.jsp.ui;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.struts2.components.Component;
import org.apache.struts2.components.UIBean;
import org.apache.struts2.views.jsp.ComponentTagSupport;
@@ -291,10 +292,11 @@ public abstract class AbstractUITag exte
}
public void setDynamicAttribute(String uri, String localName, Object
value) throws JspException {
-if (value != null && value instanceof String) {
+if (Component.altSyntax(getStack()) && Component.isExpression(value)) {
dynamicAttributes.put(localName,
String.valueOf(ObjectUtils.defaultIfNull(findValue(value.toString()), value)));
} else {
dynamicAttributes.put(localName, value);
}
}
+
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java?rev=1381585&r1=1381584&r2=1381585&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
Thu Sep 6 12:54:48 2012
@@ -44,6 +44,8 @@ import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import static org.apache.struts2.views.jsp.AbstractUITagTest.normalize;
+
/**
* Test case for FreeMarkerResult.
*
@@ -262,7 +264,7 @@ public class FreeMarkerResultTest extend
+ "\n"
+ "Ford Motor Co\n"
+ "Toyota\n";
-assertEquals(expected, stringWriter.toString());
+assertEquals(normalize(expected), normalize(stringWriter.toString()));
}
public void testDynamicAttributesInTheme() throws Exception {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java?rev=1381585&r1=1381584&r2=1381585&view=diff
===
svn commit: r1381599 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/util/ core/src/main/java/org/apache/struts2/views/jsp/ core/src
Author: lukaszlenart
Date: Thu Sep 6 13:44:33 2012
New Revision: 1381599
URL: http://svn.apache.org/viewvc?rev=1381599&view=rev
Log:
WW-3875 extracts static util methods into separated class
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ComponentUtils.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ComponentUtilsTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?rev=1381599&r1=1381598&r2=1381599&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Thu Sep 6 13:44:33 2012
@@ -28,9 +28,9 @@ import org.apache.struts2.StrutsConstant
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.util.ComponentUtils;
import org.apache.struts2.util.FastByteArrayOutputStream;
import org.apache.struts2.views.jsp.TagUtils;
-import org.apache.struts2.views.util.ContextUtil;
import org.apache.struts2.views.util.UrlHelper;
import javax.servlet.http.HttpServletRequest;
@@ -265,35 +265,7 @@ public class Component {
* the parameter expression is returned as is.
*/
protected String stripExpressionIfAltSyntax(String expr) {
- return stripExpressionIfAltSyntax(stack, expr);
- }
-
-/**
- * If altsyntax (%{...}) is applied, simply strip the "%{" and "}" off.
- * @param stack the ValueStack where the context value is searched for.
- * @param expr the expression (must be not null)
- * @return the stripped expression if altSyntax is enabled. Otherwise
- * the parameter expression is returned as is.
- */
- public static String stripExpressionIfAltSyntax(ValueStack stack,
String expr) {
- if (altSyntax(stack)) {
-// does the expression start with %{ and end with }? if so, just
cut it off!
-if (isExpression(expr)) {
-return expr.substring(2, expr.length() - 1);
-}
-}
- return expr;
- }
-
-/**
- * Is the altSyntax enabled? [TRUE]
- *
- * @param stack the ValueStack where the context value is searched for.
- * @return true if altSyntax is activated. False otherwise.
- * See struts.properties where the altSyntax flag is defined.
- */
- public static boolean altSyntax(ValueStack stack) {
-return ContextUtil.isUseAltSyntax(stack.getContext());
+ return ComponentUtils.stripExpressionIfAltSyntax(stack, expr);
}
/**
@@ -302,7 +274,7 @@ public class Component {
* See struts.properties where the altSyntax flag is defined.
*/
public boolean altSyntax() {
-return altSyntax(stack);
+return ComponentUtils.altSyntax(stack);
}
/**
@@ -518,9 +490,4 @@ public class Component {
return false;
}
-public static boolean isExpression(Object value) {
-String expr = value.toString();
-return expr.startsWith("%{") && expr.endsWith("}");
-}
-
}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ComponentUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ComponentUtils.java?rev=1381599&view=auto
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ComponentUtils.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ComponentUtils.java
Thu Sep 6 13:44:33 2012
@@ -0,0 +1,51 @@
+package org.apache.struts2.util;
+
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.views.util.ContextUtil;
+
+/**
+ * Various static methods used with components
+ */
+public class ComponentUtils {
+
+/**
+ * If altSyntax (%{...}) is applied, simply strip the "%{" and "}" off.
+ *
+ * @param stack the ValueStack where the context value is searched for.
+ * @param expr the expression (must be not null)
+ * @return the stripped expression if altSyntax is enabled. Otherwise
+ * the parameter expre
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Ambari (Incubating) (https://cwiki.apache.org/confluence/display/AMBARI) Pages - Ambari-666 Development edited by mahadev (04:22 AM) https://cwiki.apache.org/confluence/display/AMBARI/Ambari-666+Development Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Log edited by njiang (11:30 PM) https://cwiki.apache.org/confluence/display/CAMEL/Log Crypto edited by sdanig (04:12 PM) https://cwiki.apache.org/confluence/display/CAMEL/Crypto Splitter edited by mazzag (01:35 PM) https://cwiki.apache.org/confluence/display/CAMEL/Splitter Multicast edited by mazzag (01:34 PM) https://cwiki.apache.org/confluence/display/CAMEL/Multicast Recipient List edited by mazzag (01:34 PM) https://cwiki.apache.org/confluence/display/CAMEL/Recipient+List Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - Index edited by matthew.morris...@sungard.com (01:54 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Index Test edited by sailajam (01:24 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Test Projects created by abhinavr (10:58 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Projects ASF CS 4.0 QA edited by abhinavr (12:54 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/ASF+CS+4.0+QA ASF CS 4.0 Test Execution edited by abhinavr (12:52 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/ASF+CS+4.0+Test+Execution Building with Maven edited by h...@apache.org (12:41 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Building+with+Maven Storage Migration created by sowmyak (07:51 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Storage+Migration Local Data Volume created by sowmyak (05:40 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Local+Data+Volume Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - AvroSerDe - working with Avro from Hive edited by jgho...@apache.org (08:51 PM) https://cwiki.apache.org/confluence/display/Hive/AvroSerDe+-+working+with+Avro+from+Hive Apache Karaf (https://cwiki.apache.org/confluence/display/KARAF) Pages - Board Reports edited by nanthrax (07:33 AM) https://cwiki.apache.org/confluence/display/KARAF/Board+Reports Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Comments https://cwiki.apache.org/confluence/display/MAHOUT/Partial+Implementation (1) Apache Maven (https://cwiki.apache.org/confluence/display/MAVEN) Comments https://cwiki.apache.org/confluence/display/MAVEN/Scheme+for+managing+Maven+source+in+Git (3) Apache MRUnit (https://cwiki.apache.org/confluence/display/MRUNIT) Pages - Board Report (September 2012) created by bro...@gmail.com (03:04 PM) https://cwiki.apache.org/confluence/display/MRUNIT/Board+Report+%28September+2012%29 Apache Sling (https://cwiki.apache.org/confluence/display/SLING) Pages - Status Report September 2012 created by cziege...@apache.org (03:37 AM) https://cwiki.apache.org/confluence/display/SLING/Status+Report+September+2012 Apache Syncope (https://cwiki.apache.org/confluence/display/SYNCOPE) Pages - Create a new Syncope project edited by fmartelli (09:28 AM) https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project Espressivo edited by fmartelli (09:27 AM) https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Migration to Wicket 6.0 edited by cad...@gmail.com (06:24 PM) https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0 Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages - Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Build The Application edited by bphill...@ku.edu (10:59 AM) https://cwiki.apache.org/confluence/display/WW/Create+Struts+2+Web+Application+With+Artifacts+In+WEB-INF+lib+and+Use+Ant+To+Build+The+Application Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
svn commit: r1381887 - in /struts/struts2/trunk/plugins: ./ portlet-tiles/ portlet-tiles/src/ portlet-tiles/src/main/ portlet-tiles/src/main/java/ portlet-tiles/src/main/java/org/ portlet-tiles/src/ma
Author: lukaszlenart Date: Fri Sep 7 05:48:49 2012 New Revision: 1381887 URL: http://svn.apache.org/viewvc?rev=1381887&view=rev Log: WW-2749 adds support for Tiles in Porlets as a dedicated plugin with new PortletTilesResult Added: struts/struts2/trunk/plugins/portlet-tiles/ struts/struts2/trunk/plugins/portlet-tiles/pom.xml struts/struts2/trunk/plugins/portlet-tiles/src/ struts/struts2/trunk/plugins/portlet-tiles/src/main/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java struts/struts2/trunk/plugins/portlet-tiles/src/main/resources/ struts/struts2/trunk/plugins/portlet-tiles/src/main/resources/LICENSE.txt - copied unchanged from r1381604, struts/struts2/trunk/plugins/portlet/src/main/resources/LICENSE.txt struts/struts2/trunk/plugins/portlet-tiles/src/main/resources/NOTICE.txt - copied unchanged from r1381604, struts/struts2/trunk/plugins/portlet/src/main/resources/NOTICE.txt struts/struts2/trunk/plugins/portlet-tiles/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/pom.xml struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java Modified: struts/struts2/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=1381887&r1=1381886&r2=1381887&view=diff == --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Fri Sep 7 05:48:49 2012 @@ -57,6 +57,7 @@ dojo rest portlet +portlet-tiles junit testng dwr Added: struts/struts2/trunk/plugins/portlet-tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet-tiles/pom.xml?rev=1381887&view=auto == --- struts/struts2/trunk/plugins/portlet-tiles/pom.xml (added) +++ struts/struts2/trunk/plugins/portlet-tiles/pom.xml Fri Sep 7 05:48:49 2012 @@ -0,0 +1,67 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +4.0.0 + +org.apache.struts +struts2-plugins +2.3.5-SNAPSHOT + +org.apache.struts +struts2-portlet-tiles-plugin +jar +Struts 2 Portlet Tiles Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet-tiles/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet-tiles/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/portlet-tiles/ + + + + + org.apache.struts + struts2-tiles-plugin + + + org.apache.struts + struts2-portlet-plugin + + +javax.servlet +jsp-api +provided + + +javax.portlet +portlet-api +provided + + +org.apache.tiles +tiles-jsp +runtime + + + Added: struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java?rev=1381887&view=auto == --- struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java (added) +++ struts/struts2/trunk/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java Fri Sep 7 05:48:49 2012 @@ -0,0 +1,78 @@ +package org.apache.struts2.views.tiles; + +import com.opensymphony.xwork2.ActionInvocation; +import freemarker.template.TemplateException; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.portlet.PortletConstants; +import org.apache.struts2.portlet.context.PortletActionContext; +import org.apache.tiles.TilesContainer; +import org.apache.tiles.TilesException; +import org.apache.tiles.access.TilesAccess; + +import javax.portlet.ActionResponse; +import javax.portlet.PortletException; +
svn commit: r1381889 - /struts/struts2/trunk/plugins/portlet-tiles/pom.xml
Author: lukaszlenart
Date: Fri Sep 7 05:53:33 2012
New Revision: 1381889
URL: http://svn.apache.org/viewvc?rev=1381889&view=rev
Log:
WW-2749 adds missing tag
Modified:
struts/struts2/trunk/plugins/portlet-tiles/pom.xml
Modified: struts/struts2/trunk/plugins/portlet-tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet-tiles/pom.xml?rev=1381889&r1=1381888&r2=1381889&view=diff
==
--- struts/struts2/trunk/plugins/portlet-tiles/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet-tiles/pom.xml Fri Sep 7 05:53:33 2012
@@ -43,10 +43,12 @@
org.apache.struts
struts2-tiles-plugin
+${project.version}
org.apache.struts
struts2-portlet-plugin
+${project.version}
javax.servlet
