[prev in list] [next in list] [prev in thread] [next in thread]
List: struts-dev
Subject: struts git commit: Fixes issues in config-browse plugin
From: lukaszlenart () apache ! org
Date: 2016-09-28 9:42:33
Message-ID: 9cf8d87dfe7e4f5e85cbc686ba9c4624 () git ! apache ! org
[Download RAW message or body]
Repository: struts
Updated Branches:
refs/heads/support-2-3 b348fc552 -> ba0563183
Fixes issues in config-browse plugin
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba056318
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba056318
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba056318
Branch: refs/heads/support-2-3
Commit: ba0563183b128dcef88b469f46e528a12e0179e7
Parents: b348fc5
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Wed Sep 28 11:32:14 2016 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Wed Sep 28 11:42:24 2016 +0200
----------------------------------------------------------------------
.../org/apache/struts2/config_browser/ShowBeansAction.java | 1 +
.../apache/struts2/config_browser/ShowConstantsAction.java | 1 +
.../src/main/resources/config-browser/actionNames.ftl | 2 +-
.../src/main/resources/config-browser/showConfig.ftl | 8 ++++----
.../src/main/resources/config-browser/validatorDetails.ftl | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ba056318/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java \
b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
index debc17c..8ad85c9 100644
--- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
+++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
@@ -50,6 +50,7 @@ public class ShowBeansAction extends ActionNamesAction {
@Inject
public void setContainer(Container container) {
+ super.setContainer(container);
bindings = new TreeMap<String, Set<Binding>>();
bindings.put(ObjectFactory.class.getName(), addBindings(container, \
ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY));
bindings.put(XWorkConverter.class.getName(), addBindings(container, \
XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER));
http://git-wip-us.apache.org/repos/asf/struts/blob/ba056318/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java \
b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
index cf292e0..3b05645 100644
--- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
+++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
@@ -36,6 +36,7 @@ public class ShowConstantsAction extends ActionNamesAction {
@Inject
public void setContainer(Container container) {
+ super.setContainer(container);
constants = new HashMap<String, String>();
for (String key : container.getInstanceNames(String.class)) {
constants.put(key, container.getInstance(String.class, key));
http://git-wip-us.apache.org/repos/asf/struts/blob/ba056318/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl \
b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl index \
d7e8651..30d73c5 100644
--- a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
@@ -22,7 +22,7 @@
-->
<#include "tigris-macros.ftl">
<@startPage pageTitle="Actions in namespace"/>
-<h3>Actions in <#if namespace == ""> default namespace <#else> ${namespace} \
</#if></h3> +<h3>Actions in <#if namespace == ""> default namespace <#else> \
${namespace?html} </#if></h3> <table>
<tr>
<td>
http://git-wip-us.apache.org/repos/asf/struts/blob/ba056318/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl \
b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl index \
34987a1..d140fca 100644
--- a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
@@ -29,7 +29,7 @@
<tr><td>Action name:</td><td>${actionName}</td></tr>
<tr><td>Namespace:</td><td> ${namespace}</td></tr>
<tr><td>Action class:</td><td> ${config.className}</td></tr>
- <tr><td>Action method:</td><td> <#if \
config.methodName?exists>${config.methodName}</#if></td></tr> + <tr><td>Action \
method:</td><td> <#if config.methodName??>${config.methodName}</#if></td></tr> \
<tr><td>Parameters:</td><td> <#list config.params?keys as p> ${p}
</#list></td></tr>
@@ -41,9 +41,9 @@
</table>
<!-- URLTag is faulty -->
-<@s.url id="url" action="showConfig" includeParams="none">
- <@s.param name="namespace">${namespace}</@s.param>
- <@s.param name="actionName">${actionName}</@s.param>
+<@s.url var="url" action="showConfig" includeParams="none">
+ <@s.param name="namespace">${namespace?html}</@s.param>
+ <@s.param name="actionName">${actionName?html}</@s.param>
</@s.url>
<#assign url = url + "&detailView=">
<!-- Set all to false -->
http://git-wip-us.apache.org/repos/asf/struts/blob/ba056318/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl \
b/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl index \
d890a9d..77f4264 100644
--- a/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl
@@ -25,7 +25,7 @@
<#call startPage pageTitle="Validator Details"/>
<table>
<tr><td>Validated Class:</td><td>${action.stripPackage(clazz)}</td></tr>
-<tr><td>Context:</td><td>${context}</td></tr>
+<tr><td>Context:</td><td>${context?html}</td></tr>
<tr><td>Validator Number:</td><td>${selected}</td></tr>
<tr><td>Validator Type:</td><td>${action.stripPackage(selectedValidator.class)}</td></tr>
</table>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic