[1/2] git commit: Adds parent pom to use common DM settings
Repository: struts
Updated Branches:
refs/heads/develop 87c204ef6 -> 4f4f52600
Adds parent pom to use common DM settings
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bc78860e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bc78860e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bc78860e
Branch: refs/heads/develop
Commit: bc78860efb8f937fc90e6d869d9edc6ca27ca437
Parents: 87c204e
Author: Lukasz Lenart
Authored: Sun Sep 21 12:50:30 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Sep 22 08:43:55 2014 +0200
--
bom/pom.xml | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bc78860e/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index b2f3e43..3ede2ba 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -4,7 +4,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
4.0.0
-org.apache.struts
+
+org.apache.struts
+struts-master
+9
+
+
struts2-bom
${struts-version.version}
pom
[2/2] git commit: WW-4165 Checks if dynamic attributes don't overlap tag attributes This can be done only in a component as when dynamic attributes are set by a container on the tag, the component was
WW-4165 Checks if dynamic attributes don't overlap tag attributes
This can be done only in a component as when dynamic attributes are set
by a container on the tag, the component wasn't instantiated yet - it
will be created in doStartTag method which is called after all
attributes were set
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4f4f5260
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4f4f5260
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4f4f5260
Branch: refs/heads/develop
Commit: 4f4f5260029f2074de6c925ae97c5cd6a6bc2a55
Parents: bc78860
Author: Lukasz Lenart
Authored: Mon Sep 22 09:01:11 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Sep 22 09:01:11 2014 +0200
--
.../java/org/apache/struts2/components/UIBean.java| 14 ++
.../apache/struts2/views/jsp/ui/AbstractUITag.java| 4
.../org/apache/struts2/views/jsp/ui/AnchorTest.java | 2 +-
.../apache/struts2/views/jsp/ui/ComponentTest.java| 3 ++-
.../org/apache/struts2/views/jsp/ui/RadioTest.java| 1 -
5 files changed, 9 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/main/java/org/apache/struts2/components/UIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java
b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 49d7063..5fd99a9 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -39,16 +39,10 @@ import org.apache.struts2.views.util.ContextUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
/**
* UIBean is the standard superclass of all Struts UI components.
@@ -1260,8 +1254,12 @@ public abstract class UIBean extends Component {
this.tooltipIconPath = tooltipIconPath;
}
- public void setDynamicAttributes(Map dynamicAttributes)
{
- this.dynamicAttributes.putAll(dynamicAttributes);
+ public void setDynamicAttributes(Map
tagDynamicAttributes) {
+for (String key : tagDynamicAttributes.keySet()) {
+if (!isValidTagAttribute(key)) {
+dynamicAttributes.put(key, tagDynamicAttributes.get(key));
+}
+}
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index d12b3a1..e57932a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -305,10 +305,6 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
}
public void setDynamicAttribute(String uri, String localName, Object
value) throws JspException {
-if (component.isValidTagAttribute(localName)) {
-return;
-}
-
if (ComponentUtils.altSyntax(getStack()) &&
ComponentUtils.isExpression(value)) {
dynamicAttributes.put(localName,
String.valueOf(ObjectUtils.defaultIfNull(findValue(value.toString()), value)));
} else {
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
index 6511944..bd007e9 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
@@ -89,9 +89,9 @@ public class AnchorTest extends AbstractUITagTest {
private AnchorTag createTag() throws JspException {
AnchorTag tag = new AnchorTag();
tag.setPageContext(pageContext);
-tag.doStartTag();
tag.setId("mylink");
return tag;
}
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java
--
Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_18 [deleted] fd1f4d6f0
Git Push Summary
Repository: struts Updated Branches: refs/heads/release/2.3.18 [created] 4f4f52600
git commit: [maven-release-plugin] prepare release STRUTS_2_3_18
Repository: struts Updated Branches: refs/heads/release/2.3.18 4f4f52600 -> 46e96c353 [maven-release-plugin] prepare release STRUTS_2_3_18 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/46e96c35 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46e96c35 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46e96c35 Branch: refs/heads/release/2.3.18 Commit: 46e96c353424832ab64f2c67e9cc09ae6a68d41e Parents: 4f4f526 Author: Lukasz Lenart Authored: Mon Sep 22 09:13:41 2014 +0200 Committer: Lukasz Lenart Committed: Mon Sep 22 09:13:41 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 12 +++- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +++-- xwork-core/pom.xml | 2 +- 52 files changed, 61 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/46e96c35/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 83bec60..685ffc7 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.18-SNAPSHOT +2.3.18 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/46e96c35/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 3335999..2c0961a 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.18-SNAPSHOT +2.3.18 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/46e96c35/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 7275fdf..a7d92bc 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailrea
Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_18 [created] f818c7261
git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/release/2.3.18 46e96c353 -> 424f2384b [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/424f2384 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/424f2384 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/424f2384 Branch: refs/heads/release/2.3.18 Commit: 424f2384b43662747a1822639d051df1a619c9c0 Parents: 46e96c3 Author: Lukasz Lenart Authored: Mon Sep 22 09:13:57 2014 +0200 Committer: Lukasz Lenart Committed: Mon Sep 22 09:13:57 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 9 ++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 52 files changed, 55 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/424f2384/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 685ffc7..a3a3dab 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.18 +2.5-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/424f2384/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 2c0961a..0b395cc 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.18 +2.5-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/424f2384/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index a7d92bc..6c3a5a4 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache
