[struts] branch master updated: WW-4952 Uses struts parent 13 to fix issue with wrong release profile

2018-10-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
 new 13d9053  WW-4952 Uses struts parent 13 to fix issue with wrong release 
profile
13d9053 is described below

commit 13d9053050c9e4fb2ef049db6a37d3f6eebf48fa
Author: Lukasz Lenart 
AuthorDate: Thu Oct 4 09:13:08 2018 +0200

WW-4952 Uses struts parent 13 to fix issue with wrong release profile
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a91510f..41f2fae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.struts
 struts-master
-12
+13
 
 
 4.0.0



[struts-site] branch asf-site updated: Updates production by Jenkins

2018-10-04 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ecc9b53  Updates production by Jenkins
ecc9b53 is described below

commit ecc9b53dacb86c6125659e0f239d2a97f89274d8
Author: jenkins 
AuthorDate: Thu Oct 4 06:45:54 2018 +

Updates production by Jenkins
---
 content/core-developers/freemarker-support.html | 89 ++---
 1 file changed, 35 insertions(+), 54 deletions(-)

diff --git a/content/core-developers/freemarker-support.html 
b/content/core-developers/freemarker-support.html
index b01a0ee..50c6cc7 100644
--- a/content/core-developers/freemarker-support.html
+++ b/content/core-developers/freemarker-support.html
@@ -129,11 +129,11 @@
 https://github.com/apache/struts-site/edit/master/source/core-developers/freemarker-support.md;
 title="Edit this page on GitHub">Edit on GitHub
 Freemarker Support
 
-Freemarker views can be rendered using the webwork result type freemarker.
+Freemarker views can be rendered using a result type freemarker.
 
-Configure your action to use the freemarker result type
+Configure 
your action to use the freemarker result type
 
-The freemarker result type is 
defined in struts-default.xml, so 
normally you just include it, and define your resuts to use type="freemarker".
+The freemarker result type is 
defined in struts-default.xml, so 
normally you just include it, and define your results to use type="freemarker".
 
 include file="struts-default.xml"/
 ...
@@ -145,81 +145,61 @@
 
 
 
-Property Resoloution
+Property Resolution
 
 Your action properties are automatically resolved - just like in a velocity 
view.
 
-for example
-${name} will result in stack.findValue("name"), which 
generaly  results in action.getName() being executed.
+for example
 
-A search process is used to resolve the variable, searching the following 
scopes in order, until a value is found :
+${name} will result in stack.findValue("name"), which 
generally  results in action.getName() being executed.
+
+A search process is used to resolve the variable, searching the following 
scopes in order, until a value is found:
 
 
-  
-freemarker variables
-  
-  
-value stack
-  
-  
-request attributes
-  
-  
-session attributes
-  
-  
-servlet context attributes
-  
+  freemarker variables
+  value stack
+  request attributes
+  session attributes
+  servlet context attributes
 
 
-Objects in the Context
+Objects in the Context
 
-The following variables exist in the FreeMarker views
+The following variables exist in the FreeMarker views:
 
 
-  
-req - the current 
HttpServletRequest
-  
-  
-res - the current 
HttpServletResponse
-  
-  
-stack - the current 
OgnlValueStack
-  
-  
-ognl - the OgnlTool instance
-
+  req - the current HttpServletRequest
+  res - the current HttpServletResponse
+  stack - the current OgnlValueStack
+  ognl - the OgnlTool instance
 
-  This class contains useful methods to execute OGNL expressions 
against arbitary objects, and a method to generate a select list using the 
s:select pattern. (i.e. taking the name of the list property, a listKey 
and listValue)
+  This class contains useful methods to execute OGNL expressions 
against arbitary objects, and a method to generate a select list using 
+the s:select/ pattern. (i.e. 
taking the name of the list property, a listKey and listValue)
 
   
-  
-struts - an instance of 
StrutsBeanWrapper
-  
-  
-action - the current Struts 
action
-  
-  
-exception - optional  
the Exception instance, if the view is a JSP exception or Servlet exception 
view
-  
+  struts - an instance of StrutsBeanWrapper
+  action - the current Struts 
action
+  exception - optional  
the Exception instance, if the view is a JSP exception or Servlet exception 
view
 
 
-FreeMarker configuration with recent releases
+FreeMarker 
configuration with recent releases
 
-To configure the freemarker engine that Struts uses, just add a file freemarker.properties to the classpath. The 
supported properties are those that the Freemarker Configuration object expects 
- see the http://freemarker\.org/docs/api/freemarker/template/Configuration\.html\#setSetting(java\.lang\.String,%20java\.lang\.String)">Freemarker
 
documentation^[http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting(
 [...]
+To configure the freemarker engine that Struts uses, just add a file freemarker.properties to the classpath. The 
supported properties 
+are those that the Freemarker Configuration object expects - see the https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-;>Freemarker
 documentation
+for these.
 
 default_encoding=ISO-8859-1
 template_update_delay=5
 locale=no_NO
-
 
 
 

[struts-site] branch master updated: Fixes variant issues with styling and typos

2018-10-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 32acb88  Fixes variant issues with styling and typos
32acb88 is described below

commit 32acb88a4ca10fa7a716420011d330ec5512fcf2
Author: Lukasz Lenart 
AuthorDate: Thu Oct 4 08:42:31 2018 +0200

Fixes variant issues with styling and typos
---
 source/core-developers/freemarker-support.md | 82 +---
 1 file changed, 37 insertions(+), 45 deletions(-)

diff --git a/source/core-developers/freemarker-support.md 
b/source/core-developers/freemarker-support.md
index 06682ab..1eba2fe 100644
--- a/source/core-developers/freemarker-support.md
+++ b/source/core-developers/freemarker-support.md
@@ -5,12 +5,11 @@ title: Freemarker Support
 
 # Freemarker Support
 
-Freemarker views can be rendered using the webwork result type `freemarker`\.
+Freemarker views can be rendered using a result type `freemarker`.
 
-__Configure your action to use the freemarker result type__
-
-The `freemarker` result type is defined in `struts-default.xml`, so normally 
you just include it, and define your resuts to use `type="freemarker"`\.
+## Configure your action to use the freemarker result type
 
+The `freemarker` result type is defined in `struts-default.xml`, so normally 
you just include it, and define your results to use `type="freemarker"`.
 
 ```xml
 
@@ -22,62 +21,54 @@ The `freemarker` result type is defined in 
`struts-default.xml`, so normally you
 
 ```
 
-__Property Resoloution__
+## Property Resolution
 
-Your action properties are automatically resolved \- just like in a velocity 
view\.
+Your action properties are automatically resolved - just like in a velocity 
view.
 
 **for example**
-`${name}` will result in `stack.findValue("name")`, which _generaly_  results 
in `action.getName()` being executed\.
-
-A search process is used to resolve the variable, searching the following 
scopes in order, until a value is found :
-
-+ freemarker variables
-
-+ value stack
-
-+ request attributes
-
-+ session attributes
-
-+ servlet context attributes
-
-__Objects in the Context__
 
-The following variables exist in the FreeMarker views
+`${name}` will result in `stack.findValue("name")`, which _generally_  results 
in `action.getName()` being executed.
 
-+ `req` \- the current HttpServletRequest
+A search process is used to resolve the variable, searching the following 
scopes in order, until a value is found:
 
-+ `res` \- the current HttpServletResponse
+- freemarker variables
+- value stack
+- request attributes
+- session attributes
+- servlet context attributes
 
-+ `stack` \- the current OgnlValueStack
+## Objects in the Context
 
-+ `ognl` \- the OgnlTool instance
+The following variables exist in the FreeMarker views:
 
-  + This class contains useful methods to execute OGNL expressions against 
arbitary objects, and a method to generate a select list using the \ 
pattern\. (i\.e\. taking the name of the list property, a listKey and listValue)
+- `req` - the current `HttpServletRequest`
+- `res` - the current `HttpServletResponse`
+- `stack` - the current `OgnlValueStack`
+- `ognl` - the `OgnlTool` instance
+  - This class contains useful methods to execute OGNL expressions against 
arbitary objects, and a method to generate a select list using 
+the `` pattern. (i.e. taking the name of the list property, a 
listKey and listValue)
+- `struts` - an instance of `StrutsBeanWrapper`
+- `action` - the current Struts action
+- `exception` - _optional_  the Exception instance, if the view is a JSP 
exception or Servlet exception view
 
-+ `struts` \- an instance of StrutsBeanWrapper
+## FreeMarker configuration with recent releases
 
-+ `action` \- the current Struts action
+To configure the freemarker engine that Struts uses, just add a file 
`freemarker.properties` to the classpath. The supported properties 
+are those that the Freemarker Configuration object expects - see the 
[Freemarker 
documentation](https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-)
+for these.
 
-+ `exception` \- _optional_  the Exception instance, if the view is a JSP 
exception or Servlet exception view
-
-__FreeMarker configuration with recent releases__
-
-To configure the freemarker engine that Struts uses, just add a file 
`freemarker.properties` to the classpath\. The supported properties are those 
that the Freemarker Configuration object expects \- see the [Freemarker 
documentation](http://freemarker\.org/docs/api/freemarker/template/Configuration\.html\#setSetting(java\.lang\.String,%20java\.lang\.String))^[http://freemarker\.org/docs/api/freemarker/template/Configuration\.html\#setSetting(java\.lang\.String,%20java\.lang\.String)]
 for [...]
-
-
-~~~
+```