git commit: Uses html instead of jsp index file as access to jsp is blocked
Repository: struts
Updated Branches:
refs/heads/develop 583234b8c -> cefdd16e3
Uses html instead of jsp index file as access to jsp is blocked
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cefdd16e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cefdd16e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cefdd16e
Branch: refs/heads/develop
Commit: cefdd16e391a84ea0553a4a6b30f12d3a8cf7700
Parents: 583234b
Author: Lukasz Lenart
Authored: Mon Aug 25 08:56:05 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 25 08:56:05 2014 +0200
--
apps/showcase/src/main/webapp/index.html | 10 ++
apps/showcase/src/main/webapp/index.jsp | 1 -
2 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/cefdd16e/apps/showcase/src/main/webapp/index.html
--
diff --git a/apps/showcase/src/main/webapp/index.html
b/apps/showcase/src/main/webapp/index.html
new file mode 100644
index 000..402dd76
--- /dev/null
+++ b/apps/showcase/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+Loading ...
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/cefdd16e/apps/showcase/src/main/webapp/index.jsp
--
diff --git a/apps/showcase/src/main/webapp/index.jsp
b/apps/showcase/src/main/webapp/index.jsp
deleted file mode 100644
index 391e002..000
--- a/apps/showcase/src/main/webapp/index.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<% response.sendRedirect("showcase.action"); %>
git commit: WW-4390 Adds additional use case to proof that everything works
Repository: struts
Updated Branches:
refs/heads/develop cefdd16e3 -> bf0826f59
WW-4390 Adds additional use case to proof that everything works
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bf0826f5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bf0826f5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bf0826f5
Branch: refs/heads/develop
Commit: bf0826f591ee0a9c9a531ed42ec77dc7590a3a58
Parents: cefdd16
Author: Lukasz Lenart
Authored: Mon Aug 25 10:33:15 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 25 10:33:15 2014 +0200
--
.../DefaultExcludedPatternsCheckerTest.java| 17 +
1 file changed, 17 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bf0826f5/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
index 99f3e9e..5c9276c 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -83,4 +83,21 @@ public class DefaultExcludedPatternsCheckerTest extends
XWorkTestCase {
}
}
+public void testStrutsTokenIsExcluded() throws Exception {
+// given
+List tokens = new ArrayList();
+tokens.add("struts.token.name");
+tokens.add("struts.token");
+
+ExcludedPatternsChecker checker = new DefaultExcludedPatternsChecker();
+
+for (String token : tokens) {
+// when
+ExcludedPatternsChecker.IsExcluded actual =
checker.isExcluded(token);
+
+// then
+assertTrue("Param '" + token + "' is not excluded!",
actual.isExcluded());
+}
+}
+
}
\ No newline at end of file
[3/3] git commit: WW-4024 Allows specify scheme via expression
WW-4024 Allows specify scheme via expression
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/69baf692
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/69baf692
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/69baf692
Branch: refs/heads/develop
Commit: 69baf692a44798ed4e1a5ab1e5e0236bba315b39
Parents: 367e3ef
Author: Lukasz Lenart
Authored: Mon Aug 25 21:34:54 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 25 21:34:54 2014 +0200
--
.../apache/struts2/components/ServletUrlRenderer.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/69baf692/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index 04a3509..0b4e13b 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -25,6 +25,7 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang3.StringUtils;
@@ -68,7 +69,11 @@ public class ServletUrlRenderer implements UrlRenderer {
String scheme = urlComponent.getHttpServletRequest().getScheme();
if (urlComponent.getScheme() != null) {
-scheme = urlComponent.getScheme();
+ValueStack vs = ActionContext.getContext().getValueStack();
+scheme = vs.findString(urlComponent.getScheme());
+if (scheme == null) {
+scheme = urlComponent.getScheme();
+}
}
String result;
@@ -127,6 +132,9 @@ public class ServletUrlRenderer implements UrlRenderer {
String namespace =
formComponent.determineNamespace(formComponent.namespace,
formComponent.getStack(), formComponent.request);
String action;
+ValueStack vs = ActionContext.getContext().getValueStack();
+String scheme = vs.findString("scheme");
+
if (formComponent.action != null) {
action = formComponent.findString(formComponent.action);
} else {
@@ -161,7 +169,7 @@ public class ServletUrlRenderer implements UrlRenderer {
ActionMapping mapping = new ActionMapping(actionName, namespace,
actionMethod, formComponent.parameters);
String result =
urlHelper.buildUrl(formComponent.actionMapper.getUriFromActionMapping(mapping),
-formComponent.request, formComponent.response,
actionParams, null, formComponent.includeContext, true, false, false);
+formComponent.request, formComponent.response,
actionParams, scheme, formComponent.includeContext, true, false, false);
formComponent.addParameter("action", result);
// let's try to get the actual action class and name
@@ -196,7 +204,7 @@ public class ServletUrlRenderer implements UrlRenderer {
LOG.warn("No configuration found for the specified action: '"
+ actionName + "' in namespace: '" + namespace + "'. Form action defaulting to
'action' attribute's literal value.");
}
-String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, null, null, formComponent.includeContext, true);
+String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, null, scheme, formComponent.includeContext, true);
formComponent.addParameter("action", result);
// namespace: cut out anything between the start and the last /
[2/3] git commit: Formats source code
Formats source code
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/367e3ef4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/367e3ef4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/367e3ef4
Branch: refs/heads/develop
Commit: 367e3ef4937a1c5d6775d805a9ae27faa7f50f03
Parents: 6f58de3
Author: Lukasz Lenart
Authored: Mon Aug 25 21:23:20 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 25 21:23:20 2014 +0200
--
.../struts2/components/ServletUrlRenderer.java | 275 ++-
1 file changed, 138 insertions(+), 137 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/367e3ef4/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index df72d84..04a3509 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -41,7 +41,6 @@ import java.util.Map;
/**
* Implementation of the {@link UrlRenderer} interface that creates URLs
suitable in a servlet environment.
- *
*/
public class ServletUrlRenderer implements UrlRenderer {
/**
@@ -63,40 +62,40 @@ public class ServletUrlRenderer implements UrlRenderer {
}
/**
-* {@inheritDoc}
-*/
- public void renderUrl(Writer writer, UrlProvider urlComponent) {
- String scheme =
urlComponent.getHttpServletRequest().getScheme();
-
- if (urlComponent.getScheme() != null) {
- scheme = urlComponent.getScheme();
- }
-
- String result;
- ActionInvocation ai = (ActionInvocation)
ActionContext.getContext().get(ActionContext.ACTION_INVOCATION);
- if (urlComponent.getValue() == null && urlComponent.getAction()
!= null) {
- result =
urlComponent.determineActionURL(urlComponent.getAction(),
urlComponent.getNamespace(), urlComponent.getMethod(),
urlComponent.getHttpServletRequest(), urlComponent.getHttpServletResponse(),
urlComponent.getParameters(), scheme, urlComponent.isIncludeContext(),
urlComponent.isEncode(), urlComponent.isForceAddSchemeHostAndPort(),
urlComponent.isEscapeAmp());
- } else if (urlComponent.getValue() == null &&
urlComponent.getAction() == null && ai != null) {
- // both are null, we will default to the current action
-
- final String action = ai.getProxy().getActionName();
- final String namespace = ai.getProxy().getNamespace();
- final String method = urlComponent.getMethod() != null
|| !ai.getProxy().isMethodSpecified() ? urlComponent.getMethod() :
ai.getProxy().getMethod();
- result = urlComponent.determineActionURL(action,
namespace, method, urlComponent.getHttpServletRequest(),
urlComponent.getHttpServletResponse(), urlComponent.getParameters(), scheme,
urlComponent.isIncludeContext(), urlComponent.isEncode(),
urlComponent.isForceAddSchemeHostAndPort(), urlComponent.isEscapeAmp());
- } else {
- String _value = urlComponent.getValue();
-
- // We don't include the request parameters cause they
would have been
- // prioritised before this [in start(Writer) method]
- if (_value != null && _value.indexOf("?") > 0) {
- _value = _value.substring(0, _value.indexOf("?"));
- }
- result = urlHelper.buildUrl(_value,
urlComponent.getHttpServletRequest(), urlComponent.getHttpServletResponse(),
urlComponent.getParameters(), scheme, urlComponent.isIncludeContext(),
urlComponent.isEncode(), urlComponent.isForceAddSchemeHostAndPort(),
urlComponent.isEscapeAmp());
- }
-String anchor = urlComponent.getAnchor();
- if (StringUtils.isNotEmpty(anchor)) {
- result += '#' + urlComponent.findString(anchor);
- }
+ * {@inheritDoc}
+ */
+public void renderUrl(Writer writer, UrlProvider urlComponent) {
+String scheme = urlComponent.getHttpServletRequest().getScheme();
+
+if (urlComponent.getScheme() != null) {
+scheme = urlComponent.getScheme();
+}
+
+String result;
+ActionInvocation ai = (ActionInvocation)
ActionContext.getContext().get(ActionContext.ACTION_INVOCATION);
+if (urlComponent.getValue() == null && urlComponent.getAction() !=
null) {
+
[1/3] git commit: Solves minor issue with example
Repository: struts Updated Branches: refs/heads/develop bf0826f59 -> 69baf692a Solves minor issue with example Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6f58de3f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6f58de3f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6f58de3f Branch: refs/heads/develop Commit: 6f58de3f8b2dbdf7c10824dd8e599f16677873d0 Parents: bf0826f Author: Lukasz Lenart Authored: Mon Aug 25 20:55:05 2014 +0200 Committer: Lukasz Lenart Committed: Mon Aug 25 20:55:05 2014 +0200 -- .../xwork2/validator/validators/RegexFieldValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/6f58de3f/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java -- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java index aa0bc8a..0c6fc13 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java @@ -53,7 +53,7 @@ import java.util.regex.Pattern; * ** myStrangePostcode - * /param> + * * * *
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Camel Pages Page: XSLT edited by Claus Ibsen [12:39 PM] (View Changes) Page: Component List edited by Claus Ibsen [12:30 PM] (View Changes) Page: Camel 2.14.0 Release edited by Claus Ibsen [12:03 PM] (View Changes) Page: Kafka created by Claus Ibsen [09:50 AM] Page: SJMS edited by Claus Ibsen [06:26 AM] (View Changes) Apache Connectors Framework Pages Page: Release Process edited by Karl Wright [01:19 PM] (View Changes) Apache Hive Pages Page: Hive on Spark: Getting Started edited by Lefty Leverenz [04:58 AM] (View Changes) OFBiz (Open For Business) Project Open Wiki Pages Page: OFBiz End User Guide (In Progress) created by Sharan Foga [11:59 AM] Page: Sharan - Documentation WIP created by Sharan Foga [11:44 AM] Page: OFBTECH Proposed Main Page (In Progress) edited by Sharan Foga [11:37 AM] (View Changes) Page: OFBTECH Page Review edited by Sharan Foga [11:22 AM] (View Changes) Apache OpenOffice Community Pages Page: Release Planning Template edited by Kay Schenk [10:36 PM] (View Changes) Page: AOO 4.1.1 Release Notes edited by Yakov [11:11 AM] (View Changes) Page: AOO 4.1.1 Release Notes (Russian) created by Yakov [08:15 AM] Page: AOO 4.1.1 Notas de Lanzamiento created by Alexandro Colorado [02:32 AM] Apache Pig Pages Page: PigTools edited by Eyal Allweil [07:48 PM] (View Changes) Apache Solr Reference Guide Pages Page: Internal - TODO List edited by Hoss Man [11:39 PM] (View Changes) Page: The DisMax Query Parser ed
