You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/07/09 21:06:41 UTC
[1/2] git commit: WW-4369 Solves problem with detecting primitives
Repository: struts
Updated Branches:
refs/heads/develop fa814744d -> 2da93000d
WW-4369 Solves problem with detecting primitives
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2b794d76
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2b794d76
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2b794d76
Branch: refs/heads/develop
Commit: 2b794d76e59c023348eec2d673d7d8b9abd8263b
Parents: fa81474
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jul 9 20:50:10 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jul 9 20:50:10 2014 +0200
----------------------------------------------------------------------
.../xwork2/conversion/impl/XWorkConverter.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/2b794d76/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
index c0aa30b..a91ca1c 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
@@ -354,7 +354,7 @@ public class XWorkConverter extends DefaultTypeConverter {
* @param className name of the class the TypeConverter must handle
* @return a TypeConverter to handle the specified class or null if none can be found
*/
- public TypeConverter lookup(String className) {
+ public TypeConverter lookup(String className, boolean isPrimitive) {
if (converterHolder.containsUnknownMapping(className) && !converterHolder.containsDefaultMapping(className)) {
return null;
}
@@ -362,7 +362,7 @@ public class XWorkConverter extends DefaultTypeConverter {
TypeConverter result = converterHolder.getDefaultMapping(className);
//Looks for super classes
- if (result == null) {
+ if (result == null && !isPrimitive) {
Class clazz = null;
try {
@@ -394,14 +394,17 @@ public class XWorkConverter extends DefaultTypeConverter {
* @return a TypeConverter to handle the specified class or null if none can be found
*/
public TypeConverter lookup(Class clazz) {
- if (clazz.isPrimitive()) {
+ TypeConverter result = lookup(clazz.getName(), clazz.isPrimitive());
+
+ if (result == null && clazz.isPrimitive()) {
/**
* if it is primitive use default converter which allows to define different converters per type
* @see XWorkBasicConverter
*/
return defaultTypeConverter;
}
- return lookup(clazz.getName());
+
+ return result;
}
protected Object getConverter(Class clazz, String property) {
[2/2] git commit: WW-4326 Defines bom to simplify version management
Posted by lu...@apache.org.
WW-4326 Defines bom to simplify version management
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2da93000
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2da93000
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2da93000
Branch: refs/heads/develop
Commit: 2da93000d76eb5230884d828959f09cb90ef6e8f
Parents: 2b794d7
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jul 9 21:06:29 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jul 9 21:06:29 2014 +0200
----------------------------------------------------------------------
bom/pom.xml | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 183 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/2da93000/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 0000000..b2f3e43
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-bom</artifactId>
+ <version>${struts-version.version}</version>
+ <packaging>pom</packaging>
+
+ <name>Struts 2 Bill of Materials</name>
+ <description>Struts 2 Bill of Materials</description>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <properties>
+ <struts-version.version>2.3.18-SNAPSHOT</struts-version.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-dojo-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-cdi-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-codebehind-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-convention-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-dwr-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-embeddedjsp-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-gxp-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-jasperreports-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-javatemplates-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-jsf-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-jfreechart-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-json-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-junit-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-osgi-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-oval-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-pell-multipart-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-plexus-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet-tiles-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-rest-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-sitegraph-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-sitemesh-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-struts1-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-testng-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-tiles-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-tiles3-plugin</artifactId>
+ <version>${struts-version.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
http://git-wip-us.apache.org/repos/asf/struts/blob/2da93000/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44db8a3..c7b69a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
</distributionManagement>
<modules>
+ <module>bom</module>
<module>xwork-core</module>
<module>core</module>
<module>apps</module>