[1/3] struts git commit: Disables params evaluation when creating results by convention
Repository: struts
Updated Branches:
refs/heads/support-2-3 7d8c3598e -> 030ffa335
Disables params evaluation when creating results by convention
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/030ffa33
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/030ffa33
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/030ffa33
Branch: refs/heads/support-2-3
Commit: 030ffa33543f8953306ed0c0dc815c7fb74d7129
Parents: 8e67b91
Author: Lukasz Lenart
Authored: Wed Aug 17 15:35:43 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 15:36:20 2016 +0200
--
.../convention/ConventionsServiceImpl.java | 26 ++--
1 file changed, 19 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/030ffa33/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
index 56815a6..6e5abda 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
@@ -107,14 +107,26 @@ public class ConventionsServiceImpl implements
ConventionsService {
public Map
getResultTypesByExtension(PackageConfig packageConfig) {
Map results =
packageConfig.getAllResultTypeConfigs();
+ResultTypeConfig dispatcher = disableParse(results.get("dispatcher"));
+ResultTypeConfig velocity = disableParse(results.get("velocity"));
+ResultTypeConfig freemarker = disableParse(results.get("freemarker"));
+
Map resultsByExtension = new HashMap();
-resultsByExtension.put("jsp", results.get("dispatcher"));
-resultsByExtension.put("jspf", results.get("dispatcher"));
-resultsByExtension.put("jspx", results.get("dispatcher"));
-resultsByExtension.put("vm", results.get("velocity"));
-resultsByExtension.put("ftl", results.get("freemarker"));
-resultsByExtension.put("html", results.get("dispatcher"));
-resultsByExtension.put("htm", results.get("dispatcher"));
+resultsByExtension.put("jsp", dispatcher);
+resultsByExtension.put("jspf", dispatcher);
+resultsByExtension.put("jspx", dispatcher);
+resultsByExtension.put("vm", velocity);
+resultsByExtension.put("ftl", freemarker);
+resultsByExtension.put("html", dispatcher);
+resultsByExtension.put("htm", dispatcher);
return resultsByExtension;
}
+
+private ResultTypeConfig disableParse(ResultTypeConfig resultConfig) {
+if (resultConfig != null) {
+return new
ResultTypeConfig.Builder(resultConfig).addParam("parse", "false").build();
+}
+return null;
+}
+
}
[2/3] struts git commit: Adds double check if resource exists
Adds double check if resource exists
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8e67b914
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8e67b914
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8e67b914
Branch: refs/heads/support-2-3
Commit: 8e67b9144aa643769b261e2492cb561e04d016ab
Parents: 77017cd
Author: Lukasz Lenart
Authored: Wed Aug 17 15:35:11 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 15:36:20 2016 +0200
--
.../convention/ConventionUnknownHandler.java| 28 +---
1 file changed, 18 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8e67b914/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index ed70858..2be1cec 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -43,6 +43,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
import javax.servlet.ServletContext;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -332,27 +333,34 @@ public class ConventionUnknownHandler implements
UnknownHandler {
Map
resultsByExtension) {
try {
boolean traceEnabled = LOG.isTraceEnabled();
-if (traceEnabled)
+if (traceEnabled) {
LOG.trace("Checking ServletContext for [#0]", path);
+}
-if (servletContext.getResource(path) != null) {
-if (traceEnabled)
-LOG.trace("Found");
+URL resource = servletContext.getResource(path);
+if (resource != null && resource.getPath().endsWith(path)) {
+if (traceEnabled) {
+LOG.trace("Found resource #0", resource);
+}
return buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
}
-if (traceEnabled)
-LOG.trace("Checking ClasLoader for #0", path);
+if (traceEnabled) {
+LOG.trace("Checking ClassLoader for #0", path);
+}
String classLoaderPath = path.startsWith("/") ? path.substring(1,
path.length()) : path;
-if (ClassLoaderUtil.getResource(classLoaderPath, getClass()) !=
null) {
-if (traceEnabled)
-LOG.trace("Found");
+resource = ClassLoaderUtil.getResource(classLoaderPath,
getClass());
+if (resource != null &&
resource.getPath().endsWith(classLoaderPath)) {
+if (traceEnabled) {
+LOG.trace("Found resource #0", resource);
+}
return buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
}
} catch (MalformedURLException e) {
-if (LOG.isErrorEnabled())
+if (LOG.isErrorEnabled()) {
LOG.error("Unable to parse template path: [#0] skipping...",
path);
+}
}
return null;
[3/3] struts git commit: Allows modify params on coping
Allows modify params on coping
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/77017cd6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/77017cd6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/77017cd6
Branch: refs/heads/support-2-3
Commit: 77017cd677c209324a9253f005246eba606d80d4
Parents: 7d8c359
Author: Lukasz Lenart
Authored: Wed Aug 17 15:34:37 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 15:36:20 2016 +0200
--
.../com/opensymphony/xwork2/config/entities/ResultTypeConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/77017cd6/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
index 85ef023..4a45db4 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
@@ -50,7 +50,7 @@ public class ResultTypeConfig extends Located implements
Serializable {
this.name = orig.name;
this.className = orig.className;
this.defaultResultParam = orig.defaultResultParam;
-this.params = orig.params;
+this.params = new LinkedHashMap(orig.params);
this.location = orig.location;
}
[3/3] struts git commit: Adds double check if resource exists
Adds double check if resource exists
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c1869f49
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c1869f49
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c1869f49
Branch: refs/heads/master
Commit: c1869f4989942dd33fa4e189e0ac1f766fb5ac14
Parents: 17d5e39
Author: Lukasz Lenart
Authored: Wed Aug 17 15:35:11 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 16:17:26 2016 +0200
--
.../convention/ConventionUnknownHandler.java| 16
1 file changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c1869f49/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index ace9446..cb10f1b 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -36,6 +36,12 @@ import org.apache.logging.log4j.Logger;
import javax.servlet.ServletContext;
import java.net.MalformedURLException;
import java.util.*;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
/**
*
@@ -313,16 +319,18 @@ public class ConventionUnknownHandler implements
UnknownHandler {
try {
LOG.trace("Checking ServletContext for {}", path);
-if (servletContext.getResource(path) != null) {
-LOG.trace("Found");
+URL resource = servletContext.getResource(path);
+if (resource != null && resource.getPath().endsWith(path)) {
+LOG.trace("Found resource {}", resource);
return buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
}
LOG.trace("Checking ClassLoader for {}", path);
String classLoaderPath = path.startsWith("/") ? path.substring(1,
path.length()) : path;
-if (ClassLoaderUtil.getResource(classLoaderPath, getClass()) !=
null) {
-LOG.trace("Found");
+resource = ClassLoaderUtil.getResource(classLoaderPath,
getClass());
+if (resource != null &&
resource.getPath().endsWith(classLoaderPath)) {
+LOG.trace("Found resource {}", resource);
return buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
}
} catch (MalformedURLException e) {
[1/3] struts git commit: Allows modify params on coping
Repository: struts
Updated Branches:
refs/heads/master fb527e4f4 -> c1869f498
Allows modify params on coping
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ea2564d7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ea2564d7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ea2564d7
Branch: refs/heads/master
Commit: ea2564d769bcea68ae45588da36dac20fab4affe
Parents: fb527e4
Author: Lukasz Lenart
Authored: Wed Aug 17 15:40:24 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 15:40:24 2016 +0200
--
.../com/opensymphony/xwork2/config/entities/ResultTypeConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ea2564d7/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
index bbed0e2..ff52590 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
@@ -52,7 +52,7 @@ public class ResultTypeConfig extends Located implements
Serializable {
this.name = orig.name;
this.className = orig.className;
this.defaultResultParam = orig.defaultResultParam;
-this.params = orig.params;
+this.params = new LinkedHashMap<>(orig.params);
this.location = orig.location;
}
[2/3] struts git commit: Disables params evaluation when creating results by convention
Disables params evaluation when creating results by convention
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/17d5e393
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/17d5e393
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/17d5e393
Branch: refs/heads/master
Commit: 17d5e3934407a0197f877bd6539a1505fc56233d
Parents: ea2564d
Author: Lukasz Lenart
Authored: Wed Aug 17 15:35:43 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 16:01:17 2016 +0200
--
.../convention/ConventionsServiceImpl.java | 26 ++--
1 file changed, 19 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/17d5e393/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
index 1a8af90..8e68538 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
@@ -107,14 +107,26 @@ public class ConventionsServiceImpl implements
ConventionsService {
public Map
getResultTypesByExtension(PackageConfig packageConfig) {
Map results =
packageConfig.getAllResultTypeConfigs();
+ResultTypeConfig dispatcher = disableParse(results.get("dispatcher"));
+ResultTypeConfig velocity = disableParse(results.get("velocity"));
+ResultTypeConfig freemarker = disableParse(results.get("freemarker"));
+
Map resultsByExtension = new HashMap<>();
-resultsByExtension.put("jsp", results.get("dispatcher"));
-resultsByExtension.put("jspf", results.get("dispatcher"));
-resultsByExtension.put("jspx", results.get("dispatcher"));
-resultsByExtension.put("vm", results.get("velocity"));
-resultsByExtension.put("ftl", results.get("freemarker"));
-resultsByExtension.put("html", results.get("dispatcher"));
-resultsByExtension.put("htm", results.get("dispatcher"));
+resultsByExtension.put("jsp", dispatcher);
+resultsByExtension.put("jspf", dispatcher);
+resultsByExtension.put("jspx", dispatcher);
+resultsByExtension.put("vm", velocity);
+resultsByExtension.put("ftl", freemarker);
+resultsByExtension.put("html", dispatcher);
+resultsByExtension.put("htm", dispatcher);
return resultsByExtension;
}
+
+private ResultTypeConfig disableParse(ResultTypeConfig resultConfig) {
+if (resultConfig != null) {
+return new
ResultTypeConfig.Builder(resultConfig).addParam("parse", "false").build();
+}
+return null;
+}
+
}
[2/2] struts git commit: Simplifies when map should be unmodifiable
Simplifies when map should be unmodifiable
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7f3defd6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7f3defd6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7f3defd6
Branch: refs/heads/master
Commit: 7f3defd67d9ce8074576ed792f5122193f31a29f
Parents: 1f5c197
Author: Lukasz Lenart
Authored: Wed Aug 17 16:59:51 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 16:59:51 2016 +0200
--
.../opensymphony/xwork2/config/entities/ResultTypeConfig.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/7f3defd6/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
index 65f6c29..a32ebca 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
@@ -69,7 +69,7 @@ public class ResultTypeConfig extends Located implements
Serializable {
}
public Map getParams() {
-return this.params;
+return Collections.unmodifiableMap(this.params);
}
@Override
@@ -148,14 +148,9 @@ public class ResultTypeConfig extends Located implements
Serializable {
}
public ResultTypeConfig build() {
-embalmTarget();
ResultTypeConfig result = target;
target = new ResultTypeConfig(target);
return result;
}
-
-protected void embalmTarget() {
-target.params = Collections.unmodifiableMap(target.params);
-}
}
}
[1/2] struts git commit: Drops unused setter
Repository: struts
Updated Branches:
refs/heads/master c1869f498 -> 7f3defd67
Drops unused setter
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1f5c1979
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1f5c1979
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1f5c1979
Branch: refs/heads/master
Commit: 1f5c1979d25710b9d3cf97578519e04149bccb59
Parents: c1869f4
Author: Lukasz Lenart
Authored: Wed Aug 17 16:18:16 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Aug 17 16:18:16 2016 +0200
--
.../opensymphony/xwork2/config/entities/ResultTypeConfig.java| 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1f5c1979/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
index ff52590..65f6c29 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
@@ -56,10 +56,6 @@ public class ResultTypeConfig extends Located implements
Serializable {
this.location = orig.location;
}
-public void setDefaultResultParam(String defaultResultParam) {
-this.defaultResultParam = defaultResultParam;
-}
-
public String getDefaultResultParam() {
return this.defaultResultParam;
}
