svn commit: r1439344 - in /struts/struts2/trunk/plugins: ./ tiles3/ tiles3/src/ tiles3/src/main/ tiles3/src/main/java/ tiles3/src/main/java/org/ tiles3/src/main/java/org/apache/ tiles3/src/main/java/o
Author: lukaszlenart Date: Mon Jan 28 11:18:26 2013 New Revision: 1439344 URL: http://svn.apache.org/viewvc?rev=1439344&view=rev Log: WW-3931 adds new plugin to support Tiles 3 result type Added: struts/struts2/trunk/plugins/tiles3/ struts/struts2/trunk/plugins/tiles3/pom.xml struts/struts2/trunk/plugins/tiles3/src/ struts/struts2/trunk/plugins/tiles3/src/main/ struts/struts2/trunk/plugins/tiles3/src/main/java/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java struts/struts2/trunk/plugins/tiles3/src/main/resources/ struts/struts2/trunk/plugins/tiles3/src/main/resources/LICENSE.txt struts/struts2/trunk/plugins/tiles3/src/main/resources/NOTICE.txt struts/struts2/trunk/plugins/tiles3/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/pom.xml Modified: struts/struts2/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=1439344&r1=1439343&r2=1439344&view=diff == --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Mon Jan 28 11:18:26 2013 @@ -67,6 +67,7 @@ embeddedjsp gxp cdi +tiles3 Added: struts/struts2/trunk/plugins/tiles3/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles3/pom.xml?rev=1439344&view=auto == --- struts/struts2/trunk/plugins/tiles3/pom.xml (added) +++ struts/struts2/trunk/plugins/tiles3/pom.xml Mon Jan 28 11:18:26 2013 @@ -0,0 +1,61 @@ + + +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.9-SNAPSHOT + + +struts2-tiles3-plugin +jar +Struts 2 Tiles 3 Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles3/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles3/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/tiles3/ + + + + +org.apache.tiles +tiles-core +3.0.1 + + +org.apache.tiles +tiles-extras +3.0.1 + + +org.apache.tiles +tiles-jsp +3.0.1 +runtime + + + + Added: struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java?rev=1439344&view=auto == --- struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java (added) +++ struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java Mon Jan 28 11:18:26 2013 @@ -0,0 +1,74 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.struts2.views.tiles; + +import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.tiles.TilesContainer; +import org.apache.tiles.access.TilesAccess; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.servlet.ServletRequest; +import org.apache.tiles.request.servlet.ServletUtil; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest;
svn commit: r1439410 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Author: lukaszlenart
Date: Mon Jan 28 14:06:10 2013
New Revision: 1439410
URL: http://svn.apache.org/viewvc?rev=1439410&view=rev
Log:
WW-3973 adds disclaimer about ParameterNameAware
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java?rev=1439410&r1=1439409&r2=1439410&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Mon Jan 28 14:06:10 2013
@@ -46,13 +46,13 @@ import java.util.regex.Pattern;
/**
*
* This interceptor sets all parameters on the value stack.
- *
+ *
* This interceptor gets all parameters from {@link
ActionContext#getParameters()} and sets them on the value stack by
* calling {@link ValueStack#setValue(String, Object)}, typically resulting in
the values submitted in a form
* request being applied to an action in the value stack. Note that the
parameter map must contain a String key and
* often containers a String[] for the value.
- *
- * The interceptor takes one parameter named 'ordered'. When set to true
action properties are guaranteed to be
+ *
+ * The interceptor takes one parameter named 'ordered'. When set to true
action properties are guaranteed to be
* set top-down which means that top action's properties are set first. Then
it's subcomponents properties are set.
* The reason for this order is to enable a 'factory' pattern. For example,
let's assume that one has an action
* that contains a property named 'modelClass' that allows to choose what is
the underlying implementation of model.
@@ -60,41 +60,39 @@ import java.util.regex.Pattern;
* implementation during action.setModelClass() call. Similiarily it's
possible to use action.setPrimaryKey()
* property set call to actually load the model class from persistent storage.
Without any assumption on parameter
* order you have to use patterns like 'Preparable'.
- *
- * Because parameter names are effectively OGNL statements, it is
important that security be taken in to account.
+ *
+ * Because parameter names are effectively OGNL statements, it is important
that security be taken in to account.
* This interceptor will not apply any values in the parameters map if the
expression contains an assignment (=),
* multiple expressions (,), or references any objects in the context (#).
This is all done in the {@link
* #acceptableName(String)} method. In addition to this method, if the action
being invoked implements the {@link
* ParameterNameAware} interface, the action will be consulted to determine if
the parameter should be set.
- *
- * In addition to these restrictions, a flag ({@link
ReflectionContextState#DENY_METHOD_EXECUTION}) is set such that
+ *
+ * In addition to these restrictions, a flag ({@link
ReflectionContextState#DENY_METHOD_EXECUTION}) is set such that
* no methods are allowed to be invoked. That means that any expression such
as person.doSomething() or
* person.getName() will be explicitely forbidden. This is needed to
make sure that your application is not
* exposed to attacks by malicious users.
- *
- * While this interceptor is being invoked, a flag ({@link
ReflectionContextState#CREATE_NULL_OBJECTS}) is turned
+ *
+ * While this interceptor is being invoked, a flag ({@link
ReflectionContextState#CREATE_NULL_OBJECTS}) is turned
* on to ensure that any null reference is automatically created - if
possible. See the type conversion documentation
* and the {@link InstantiatingNullHandler} javadocs for more information.
- *
- * Finally, a third flag ({@link
XWorkConverter#REPORT_CONVERSION_ERRORS}) is set that indicates any errors when
+ *
+ * Finally, a third flag ({@link XWorkConverter#REPORT_CONVERSION_ERRORS}) is
set that indicates any errors when
* converting the the values to their final data type (String[] -> int) an
unrecoverable error occured. With this
* flag set, the type conversion errors will be reported in the action
context. See the type conversion documentation
* and the {@link XWorkConverter} javadocs for more information.
- *
- * If you are looking for detailed logging information about your
parameters, turn on DEBUG level logging for this
+ *
+ * If you are looking for detailed logging information about your parameters,
turn on DEBUG level logging for this
* interceptor. A detailed log of all the parameter keys and values will be
reported.
- *
- *
+ *
* Note: Since XWork 2.0.2, this interceptor extends {@l
svn commit: r1439606 - in /struts/struts2/trunk/archetypes/struts2-archetype-portlet: pom.xml src/main/resources/archetype-resources/pom.xml
Author: lukaszlenart
Date: Mon Jan 28 20:17:03 2013
New Revision: 1439606
URL: http://svn.apache.org/viewvc?rev=1439606&view=rev
Log:
WW-3974 solves problem with parsing properties
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml?rev=1439606&r1=1439605&r2=1439606&view=diff
==
--- struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml Mon Jan
28 20:17:03 2013
@@ -25,13 +25,6 @@
src/main/resources
-true
-
-**/*.*
-
-
-
-
src/main/resources/archetype-resources/src
false
**/*.*
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=1439606&r1=1439605&r2=1439606&view=diff
==
---
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
Mon Jan 28 20:17:03 2013
@@ -3,11 +3,11 @@
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
-\${groupId}
-\${artifactId}
-\${version}
+${groupId}
+${artifactId}
+${version}
war
-\${artifactId}
+${artifactId}
UTF-8
@@ -25,13 +25,13 @@
org.apache.struts
struts2-core
-\${struts2.version}
+${struts2.version}
org.apache.struts
struts2-portlet-plugin
-\${struts2.version}
+${struts2.version}
@@ -68,7 +68,7 @@
maven-war-plugin
${plugin.war.version}
-
\${project.build.directory}/pluto-resources/web.xml
+
${project.build.directory}/pluto-resources/web.xml
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Bigtop (https://cwiki.apache.org/confluence/display/BIGTOP) Pages - How to install Hadoop distribution from Bigtop 0.5.0 edited by mazzag (02:15 PM) https://cwiki.apache.org/confluence/display/BIGTOP/How+to+install+Hadoop+distribution+from+Bigtop+0.5.0 Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - IPv6 support edited by yasker (09:52 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/IPv6+support VM Snapshots edited by mice_xia (09:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/VM+Snapshots Setting up a CloudStack dev environment on Windows edited by siwater (08:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+a+CloudStack+dev+environment+on+Windows Apache CloudStack Weekly News - 28 January 2013 edited by jzb (05:34 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Weekly+News+-+28+January+2013 Release Procedure edited by jzb (02:32 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Release+Procedure LXC Support in Cloudstack edited by pngu...@gilt.com (01:32 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/LXC+Support+in+Cloudstack Event Notification with message oriented middleware Proposal edited by murali.reddy (09:27 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Event+Notification+with+message+oriented+middleware+Proposal CloudStack 4.0 test procedure edited by chip.child...@gmail.com (09:18 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+4.0+test+procedure Base Image Updation facility TestPlan created by kiran.kon...@citrix.com (03:45 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Base+Image+Updation+facility+TestPlan Draft - CloudStack Community Events Plan edited by sebgoa (04:51 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan Apache CloudStack v 4.1 Documentation Plan edited by radhikap (03:52 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+v+4.1+Documentation+Plan Cisco VNMC integration edited by koushikd (01:51 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Cisco+VNMC+integration Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Invokers edited by cohei...@apache.org (12:17 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/Invokers Server, Service, and Client FactoryBeans edited by cohei...@apache.org (11:12 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/Server%2C+Service%2C+and+Client+FactoryBeans Apache Directory Development (https://cwiki.apache.org/confluence/display/DIRxDEV) Pages - Releasing Apache Directory LDAP API edited by pamarcelot (09:56 AM) https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+Apache+Directory+LDAP+API Releasing ApacheDS edited by pamarcelot (09:56 AM) https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+ApacheDS Releasing Studio edited by pamarcelot (09:55 AM) https://cwiki.apache.org/confluence/display/DIRxDEV/Releasing+Studio Guide to Directory Releases edited by pamarcelot (09:52 AM) https://cwiki.apache.org/confluence/display/DIRxDEV/Guide+to+Directory+Releases Drill Wiki (https://cwiki.apache.org/confluence/display/DRILL) Pages - Demo HowTo created by ted.dunn...@gmail.com (07:59 PM) https://cwiki.apache.org/confluence/display/DRILL/Demo+HowTo Apache Drill Wiki edited by ted.dunn...@gmail.com (07:04 PM) https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Wiki Synthetic Log Traffic Statistics created by ted.dunn...@gmail.com (02:21 AM) https://cwiki.apache.org/confluence/display/DRILL/Synthetic+Log+Traffic+Statistics Apache Flex (https://cwiki.apache.org/confluence/display/FLEX) Pages - Simulating AS3 language features in JavaScript using AMD and ES5 edited by fr...@jangaroo.net (12:06 PM) https://cwiki.apache.org/confluence/display/FLEX/Simulating+AS3+language+features+in+JavaScript+using+AMD+and+ES5 Apache Geronimo (https://cwiki.apache.org/confluence/display/GMOxSITE) Pages - Apache Geronimo v2.1.6 Release edited by gawor (01:23 AM) https://cwiki.apache.org/confluence/display/GMOxSITE/Apache+Geronimo+v2.1.6+Release Apache Geronimo
