struts-site git commit: Simplifies gems selection
Repository: struts-site Updated Branches: refs/heads/master 6d54e8eae -> bac5359ab Simplifies gems selection Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/bac5359a Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/bac5359a Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/bac5359a Branch: refs/heads/master Commit: bac5359ab64fd15f2b1bff5f662310dbb1d64e10 Parents: 6d54e8e Author: Lukasz Lenart Authored: Mon Jul 31 13:35:49 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 13:35:49 2017 +0200 -- Gemfile | 7 ++- Gemfile.lock | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/bac5359a/Gemfile -- diff --git a/Gemfile b/Gemfile index 00fc2c7..c99d6dd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,3 @@ -source 'https://rubygems.org' +source "https://rubygems.org"; -ruby '2.2.4' - -gem 'json', '>= 1' -gem 'jekyll', '~> 3' +gem "jekyll" http://git-wip-us.apache.org/repos/asf/struts-site/blob/bac5359a/Gemfile.lock -- diff --git a/Gemfile.lock b/Gemfile.lock index 6956446..3a255aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,6 @@ GEM sass (~> 3.4) jekyll-watch (1.3.1) listen (~> 3.0) -json (1.8.3) kramdown (1.10.0) liquid (3.0.6) listen (3.0.6) @@ -34,8 +33,7 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3) - json (>= 1) + jekyll BUNDLED WITH 1.11.2
struts-site git commit: Ignores bundler folders
Repository: struts-site Updated Branches: refs/heads/master bac5359ab -> 2169c1295 Ignores bundler folders Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/2169c129 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/2169c129 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/2169c129 Branch: refs/heads/master Commit: 2169c1295921ca2ecd6f7acaad281274a04be461 Parents: bac5359 Author: Lukasz Lenart Authored: Mon Jul 31 13:48:20 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 13:48:20 2017 +0200 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/2169c129/.gitignore -- diff --git a/.gitignore b/.gitignore index e91074d..a8d7b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ content .idea .java-version target +.bundle \ No newline at end of file
struts-site git commit: Ignores bundler folders
Repository: struts-site Updated Branches: refs/heads/asf-site 339b701ce -> 2d7a9445c Ignores bundler folders Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/2d7a9445 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/2d7a9445 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/2d7a9445 Branch: refs/heads/asf-site Commit: 2d7a9445cba5e02bb00e18c9641182cc14177cd6 Parents: 339b701 Author: Lukasz Lenart Authored: Mon Jul 31 13:49:08 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 13:49:08 2017 +0200 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/2d7a9445/.gitignore -- diff --git a/.gitignore b/.gitignore index 3e0ee83..dfe463f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Gemfile* PLACEHOLDER README.md _config.yml +.bundle
struts-site git commit: Cleans up exported page
Repository: struts-site Updated Branches: refs/heads/master 2169c1295 -> d9b02b9cc Cleans up exported page Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/d9b02b9c Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/d9b02b9c Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/d9b02b9c Branch: refs/heads/master Commit: d9b02b9ccbd1fb683703acc64f6c6c440ed92ce4 Parents: 2169c12 Author: Lukasz Lenart Authored: Mon Jul 31 13:59:02 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 13:59:02 2017 +0200 -- .../core-developers/exceptio-configuration.md | 190 --- .../core-developers/exception-configuration.md | 130 + source/core-developers/index.md | 2 +- 3 files changed, 131 insertions(+), 191 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/d9b02b9c/source/core-developers/exceptio-configuration.md -- diff --git a/source/core-developers/exceptio-configuration.md b/source/core-developers/exceptio-configuration.md deleted file mode 100644 index b98b1be..000 --- a/source/core-developers/exceptio-configuration.md +++ /dev/null @@ -1,190 +0,0 @@ -layout: core-developers -title: Exception Configuration - -# Exception Configuration - -Exception mappings is a powerful feature for dealing with an Action class that throws an Exception\. The core idea is that an Exception thrown during the Action method can be automatically caught and mapped to a predefined Result\. This declarative strategy is especially useful for frameworks, like Hibernate and Acegi, that throw RuntimeExceptions\. - -As with many other parts of the framework, an Interceptor is needed to activate the exception mapping functionality\. Below is a snippet from - -~~~ -struts-default.xml -~~~ - which has the exception mapping already activated\. - -**snippet of struts\-default\.xml** - - -~~~ - -... - -... - -... - - - - - - - - - - - - - - - - - - - -input,back,cancel,browse - - -input,back,cancel,browse - - -... - -~~~ - -To use exception mapping, we simply need to map Exceptions to specific Results\. The framework provides two ways to declare an exception mapping - -~~~ - -~~~ - \- globally or for a specific action mapping\. The exception mapping element takes two attributes, - -~~~ -exception -~~~ - and - -~~~ -result -~~~ -\. - -When declaring an exception mapping, the Interceptor will find the closest class inheritance match between the Exception thrown and the Exception declared\. The Interceptor will examine all declared mappings applicable to the action mapping, first local and then global mappings\. If a match is found, the Result is processed, just as if it had been returned by the Action\. - -(information) This process follows the same rules as a Result returned from an Action\. It first looks for the Result in the local action mapping, and if not found, it looks for a global Result\. - -Below is an example of global and local exception mappings\. - -**snippet from struts\.xml** - - -~~~ - - - -... - -/Login.action -/Exception.jsp - - - - - - -... - - -SQLExceptionAction -/DataAccess.jsp - -... - - - -~~~ - -In the example above, here is what happens based upon each Exception: - -+ A - -~~~ -java.sql.SQLException -~~~ - will chain to the - -~~~ -SQLExceptionAction -~~~ - (action mapping not shown) - -+ A - -~~~ -com.company.SecurityException -~~~ - will redirect to - -~~~ -Login.action -~~~ - -+ Any other exception that extends - -~~~ -java.lang.Exception -~~~ - will return the - -~~~ -/Exception.jsp -~~~ - page - -#Exception Values on the ValueStack# - -By default, the - -~~~ -ExceptionMappingInterceptor -~~~ - adds the following values to the Value Stack: - -| exception | The exception object itself | -|---|-| -| exceptionStack | The value from the stack trace | - -**Sample JSP using Error and Exception Values** - - -~~~ - -An unexpected error has occurred - -Please report this error to your system administrator -or appropriate technical support personnel. -Thank you for your cooperation. - - -Error Message - - - - - -Technical Details - - - - -~~~ - -#Exception in constructors# - -Global exception mappings are designed to be used with exceptions thrown by action method
[3/4] struts-site git commit: Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/struts-site into asf-site
Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/struts-site into asf-site Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/03ddb8d9 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/03ddb8d9 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/03ddb8d9 Branch: refs/heads/asf-site Commit: 03ddb8d942ffe5769b4e14fe7fea372f12261eeb Parents: ce7a416 2d7a944 Author: jenkins Authored: Mon Jul 31 11:50:04 2017 + Committer: jenkins Committed: Mon Jul 31 11:50:04 2017 + -- .gitignore | 1 + 1 file changed, 1 insertion(+) --
[2/4] struts-site git commit: Updates production by Jenkins
Updates production by Jenkins Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/ce7a4169 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/ce7a4169 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/ce7a4169 Branch: refs/heads/asf-site Commit: ce7a416993b24a028bf597c7e50c331a30c7c10b Parents: 339b701 Author: jenkins Authored: Mon Jul 31 11:39:31 2017 + Committer: jenkins Committed: Mon Jul 31 11:39:31 2017 + -- content/announce-2008.html| 320 +++ content/announce-2009.html| 114 +-- content/announce-2010.html| 202 ++--- content/announce-2012.html| 562 ++-- content/css/maven-base.css| 284 +++--- content/css/maven-classic.css | 1732 ++-- content/css/maven-theme.css | 164 ++-- content/css/print.css | 14 +- content/dtds/struts-2.1.7.dtd | 298 +++ content/dtds/struts-2.1.dtd | 292 +++--- content/img/download-icon.svg | 20 +- content/img/primer-icon.svg | 24 +- content/img/struts-logo.svg | 70 +- content/planetstruts.txt | 60 +- content/robots.txt|2 +- 15 files changed, 2079 insertions(+), 2079 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/announce-2008.html -- diff --git a/content/announce-2008.html b/content/announce-2008.html index 0392452..d3a770e 100644 --- a/content/announce-2008.html +++ b/content/announce-2008.html @@ -123,166 +123,166 @@ -Announcements - 2008 - - - Skip to: Announcements - 2007 - - -04 December 2008 - Struts 1.3.10 General Availability Release - - The Apache Struts group is pleased to announce that Struts 1.3.10 - is available as a "General Availability" release. The GA designation is - our highest quality grade. - - - Struts 1.3.10 is available in a full distribution, or as separate - library, source, example and documentation distributions. - - - http://struts.apache.org/download.cgi#struts1310";> -http://struts.apache.org/download.cgi#struts1310 - - - It is also available in the central Maven repository under Group ID - "org.apache.struts". - - -24 November 2008 - Struts 2.0.14 General Availability Release - - The Apache Struts group is pleased to announce that Struts 2.0.14 is - available as a "General Availability" release. The GA designation is - our highest quality grade. - - - Apache Struts 2 is an elegant, extensible framework for creating - enterprise-ready Java web applications. The framework is designed to - streamline the full development cycle, from building, to deploying, to - maintaining applications over time. - - - This release is a bugfix release for version 2.0.12, which provided important - security fixes. - Struts 2.0.14 addresses two major bugs introduced with these security fixes, - keeping the FilterDispatcher from serving built in static resources, - and keeping conversion error messages from being displayed. - - - All developers are strongly encouraged to update existing Struts 2 applications - to Struts 2.0.14. - - - Struts 2.0.14 is available in a full distribution, - or as separate library, source, example and documentation - distributions, from the - http://struts.apache.org/download.cgi#struts2014";>releases page. - The release is also available through the central Maven repository under Group ID - "org.apache.struts". The - http://struts.apache.org/2.0.14/docs/release-notes-2014.html";>release notes - are available online. - - - The 2.0.x series of the Apache Struts framework has a minimum - requirement of the following specification versions: Servlet API 2.4, - JSP API 2.0, Java 5, Backported Java 4 JARs are also available. - - - Should any issues arise with your use of any version of the Struts - framework, please post your comments to the user list, and, if - appropriate, file a - https://issues.apache.org/struts/secure/Dashboard.jspa";>tracking ticket. - - - -20 October 2008 - Struts 2.0.12 General Availability Release - - The Apache Struts group is pleased to announce that Struts 2.0.12 is - available as a "General Availability" release. The GA designation is - our highest quality grade. - - - Apache Struts 2 is an elegant, extensible framework for creating - enterprise-ready Java web applications. The framework is designed to - streamline the full development cycle, from building, to deploying, to - maintaining applications over time. - - - This release includes a number of bug fixes since the - 2.0.11.2 GA release, including important security fixes regarding remote - server context manipulation by injecting OGNL expressions in request parameters - and possible server filesystem r
[1/4] struts-site git commit: Updates production by Jenkins
Repository: struts-site Updated Branches: refs/heads/asf-site 2d7a9445c -> 950f032b7 http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/css/print.css -- diff --git a/content/css/print.css b/content/css/print.css index 2ab336b..2b11058 100644 --- a/content/css/print.css +++ b/content/css/print.css @@ -1,7 +1,7 @@ -#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { - display: none; -} -#bodyColumn, body.docs div.docs { - margin: 0 !important; - border: none !important -} +#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { + display: none; +} +#bodyColumn, body.docs div.docs { + margin: 0 !important; + border: none !important +} http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/dtds/struts-2.1.7.dtd -- diff --git a/content/dtds/struts-2.1.7.dtd b/content/dtds/struts-2.1.7.dtd index 239b4db..94ce3c9 100644 --- a/content/dtds/struts-2.1.7.dtd +++ b/content/dtds/struts-2.1.7.dtd @@ -1,149 +1,149 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/dtds/struts-2.1.dtd -- diff --git a/content/dtds/struts-2.1.dtd b/content/dtds/struts-2.1.dtd index c4a5c95..2a9e818 100644 --- a/content/dtds/struts-2.1.dtd +++ b/content/dtds/struts-2.1.dtd @@ -1,146 +1,146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/img/download-icon.svg -- diff --git a/content/img/download-icon.svg b/content/img/download-icon.svg index 298b099..3a056e0 100755 --- a/content/img/download-icon.svg +++ b/content/img/download-icon.svg @@ -1,10 +1,10 @@ - - -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" -width="17px" height="19px" viewBox="0 0 17 19" enable-background="new 0 0 17 19" xml:space="preserve"> - - - - - + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" +width="17px" height="19px" viewBox="0 0 17 19" enable-background="new 0 0 17 19" xml:space="preserve"> + + + + + http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/img/primer-icon.svg -- diff --git a/content/img/primer-icon.svg b/content/img/primer-icon.svg index e72a4bf..24d262f 100755 --- a/content/img/primer-icon.svg +++ b/content/img/primer-icon.svg @@ -1,12 +1,12 @@ - - -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" -width="28.991px" height="20px" viewBox="2.009 3.5 28.991 20" enable-background="new 2.009 3.5 28.991 20" xml:space="preserve"> - - - + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" +width="28.991px" height="20px" viewBox="2.009 3.5 28.991 20" enable-background="new 2.009 3.5 28.991 20" xml:space="preserve"> + + + http://git-wip-us.apache.org/repos/asf/struts-site/blob/ce7a4169/content/img/struts-logo.svg -- diff --git a/content/img/struts-logo.svg b/content/img/struts-logo.svg index 23971b7..3c37644 100755 --- a/content/img/struts-logo.svg +++ b/content/img/struts-logo.svg @@ -1,35 +1,35 @@ - - -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" -viewBox="0 0 210 60" enable-background="new 0 0 210 60" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - - - + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +http://www.w3.org/2000/svg"; xmlns:xlink="http
[4/4] struts-site git commit: Updates production by Jenkins
Updates production by Jenkins Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/950f032b Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/950f032b Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/950f032b Branch: refs/heads/asf-site Commit: 950f032b7fd8bbb469bccc49eb81bd98cdf0279f Parents: 03ddb8d Author: jenkins Authored: Mon Jul 31 11:59:41 2017 + Committer: jenkins Committed: Mon Jul 31 11:59:41 2017 + -- .../exception-configuration.html| 321 +++ content/core-developers/index.html | 2 +- 2 files changed, 322 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/950f032b/content/core-developers/exception-configuration.html -- diff --git a/content/core-developers/exception-configuration.html b/content/core-developers/exception-configuration.html new file mode 100644 index 000..410c97f --- /dev/null +++ b/content/core-developers/exception-configuration.html @@ -0,0 +1,321 @@ + + + + + + + + + + Exception Configuration + + + + + + + + + + + + + +http://github.com/apache/struts"; class="github-ribbon"> + https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa.png"; alt="Fork me on GitHub"> + + + + + + + + +Menu +Toggle navigation + + + + + + + + + + +Home + + +Welcome +Downloads +Announcements +http://www.apache.org/licenses/";>License +http://apache.org/foundation/thanks.html";>Thanks! +http://apache.org/foundation/sponsorship.html";>Sponsorship + + + + +Support + + +User Mailing List +https://issues.apache.org/jira/browse/WW";>Issue Tracker +Reporting Security Issues + +Project info +Struts Core dependencies +Plugin dependencies + + + + +Documentation + + +Birds Eye +Key Technologies +Kickstart FAQ +https://cwiki.apache.org/confluence/display/WW/Home";>Wiki + +Getting Started +Security Guide +Tutorials +FAQs +Guides + +Struts Core API +Plugin APIs +Tag reference +http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin registry + +Core Developers Guide (WIP) +Plugins (WIP) + + + + +Contributing + + +You at Struts +How to Help FAQ +Development Lists + +Submitting patches +Source Code +Coding standards + +Release Guidelines +PMC Charter +Volunteers +https://git-wip-us.apache.org/repos/asf?p=struts.git";>Source Repository + + +http://www.apache.org/";> + + + + + + + + + + +<< back to Core Developers Guide +Exception Configuration + +Exception mappings is a powerful feature for dealing with an Action class that throws an Exception. The core idea is +that an Exception thrown during the Action method can be automatically caught and mapped to a predefined Result. This +declarative strategy is especially useful for frameworks, like Hibernate and Acegi, that throw RuntimeExceptions. + +As with many other parts of the framework, an Interceptor is needed to activate the exception mapping functionality. +Below is a snippet from struts-default.xml which has the exception mapping already activated. + +snippet of struts-default.xml + +... ++... + + ++... + + + + + +
[2/2] struts-site git commit: Cleans up exported page
Cleans up exported page Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/c758d113 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/c758d113 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/c758d113 Branch: refs/heads/master Commit: c758d11388302b85c8ef02897aa055c2650fd769 Parents: e28a4a6 Author: Lukasz Lenart Authored: Mon Jul 31 15:32:01 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 15:32:01 2017 +0200 -- .../interceptor-configuration.md| 50 1 file changed, 19 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/c758d113/source/core-developers/interceptor-configuration.md -- diff --git a/source/core-developers/interceptor-configuration.md b/source/core-developers/interceptor-configuration.md index 8b202f8..e6a120b 100644 --- a/source/core-developers/interceptor-configuration.md +++ b/source/core-developers/interceptor-configuration.md @@ -5,7 +5,9 @@ title: Interceptor Configuration # Interceptor Configuration -Interceptors allow you to define code to be executed before and/or after the execution of an Action method\. (The "Filter" pattern\.) Interceptors can be a powerful tool when developing applications\. There are many, many use cases for Interceptors, including validation, property population, security, logging, and profiling\. +Interceptors allow you to define code to be executed before and/or after the execution of an Action method. +(The "Filter" pattern.) Interceptors can be a powerful tool when developing applications. There are many, many use cases +for Interceptors, including validation, property population, security, logging, and profiling. | Validation | Examine input for correctness | ||---| @@ -13,15 +15,16 @@ Interceptors allow you to define code to be executed before and/or after the exe | Logging | Journal details regarding each action | | Profiling | Time action throughput, looking for performance bottlenecks | -Interceptors can be chained together to create an Interceptor "Stack"\. If an action neeeds to check the client's credentials, log the action, and time the action, all of these routines, and more, could be made part of the same Interceptor Stack\. +Interceptors can be chained together to create an Interceptor "Stack". If an action needs to check the client's +credentials, log the action, and time the action, all of these routines, and more, could be made part of the same +Interceptor Stack. -Interceptors are implemented as Java classes, so each Interceptor has a class name\. To make it easier to reference Interceptors, each class can be registered with the framework and given a unique, simpler name\. +Interceptors are implemented as Java classes, so each Interceptor has a class name. To make it easier to reference +Interceptors, each class can be registered with the framework and given a unique, simpler name. **Registering Interceptors** - -~~~ - +```xml @@ -29,40 +32,25 @@ Interceptors are implemented as Java classes, so each Interceptor has a class na +``` -~~~ - - (ok) Individual Interceptors and Interceptors Stacks can be "mixed and matched" in any order when defining an Interceptor Stack\. - - (ok) The framework will invoke each Interceptor on the stack **in the order it is defined**\. - -Most applications will define a default Interceptor Stack, such as - +> Individual Interceptors and Interceptors Stacks can be "mixed and matched" in any order when defining an Interceptor Stack. +> The framework will invoke each Interceptor on the stack **in the order it is defined**. -~~~ - -~~~ - -but any action may also define its own local stack\. +Most applications will define a default Interceptor Stack, such as `` +but any action may also define its own local stack. **A local Interceptor Stack** - -~~~ - +```xml ... +``` -~~~ - -The default configuration ( - -~~~ - -~~~ -) sets up a default Interceptor Stack that will work well for most applications\. +The default configuration - [struts-default.xml](struts-default-xml.html); sets up a default Interceptor Stack that +will work well for most applications. -(light\-on) For more, see [Interceptors](interceptors.html). \ No newline at end of file +> For more, see [Interceptors](interceptors.html).
[1/2] struts-site git commit: Cleans up exported page
Repository: struts-site Updated Branches: refs/heads/master d9b02b9cc -> c758d1138 Cleans up exported page Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/e28a4a6a Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/e28a4a6a Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/e28a4a6a Branch: refs/heads/master Commit: e28a4a6a6522605ad61a239d6fe252780a09b061 Parents: d9b02b9 Author: Lukasz Lenart Authored: Mon Jul 31 15:28:49 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 15:28:49 2017 +0200 -- source/core-developers/include-configuration.md | 32 +--- 1 file changed, 8 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/e28a4a6a/source/core-developers/include-configuration.md -- diff --git a/source/core-developers/include-configuration.md b/source/core-developers/include-configuration.md index 2a3dbf1..9d28fba 100644 --- a/source/core-developers/include-configuration.md +++ b/source/core-developers/include-configuration.md @@ -5,16 +5,10 @@ title: Include Configuration # Include Configuration -A popular strategy is "divide and conquer"\. The framework lets you apply "divide and conquer" to configuration files using the - -~~~ - -~~~ - element\. - - -~~~ +A popular strategy is "divide and conquer". The framework lets you apply "divide and conquer" to configuration files +using the `` element. +```xml http://struts.apache.org/dtds/struts-2.0.dtd";> @@ -25,19 +19,9 @@ A popular strategy is "divide and conquer"\. The framework lets you apply "divid +``` +Each included file must be in the same format as `struts.xml`, including the `DOCTYPE`. The include files can be placed +anywhere on the classpath and should be referred to by that path by the "file" attribute. -~~~ - -Each included file must be in the same format as - -~~~ -struts.xml -~~~ -, including the - -~~~ -DOCTYPE -~~~ -\. The include files can be placed anywhere on the classpath and should be referred to by that path by the "file" attribute\. - -In a large\-team environment, the include files can be used to organize different modules of the application that are being developed by different team members\. +In a large-team environment, the include files can be used to organize different modules of the application that are +being developed by different team members.
struts-site git commit: Updates production by Jenkins
Repository: struts-site Updated Branches: refs/heads/asf-site 950f032b7 -> 36e3e8378 Updates production by Jenkins Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/36e3e837 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/36e3e837 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/36e3e837 Branch: refs/heads/asf-site Commit: 36e3e83783a1dc803f9b87f78dd67a2caea56050 Parents: 950f032 Author: jenkins Authored: Mon Jul 31 13:32:40 2017 + Committer: jenkins Committed: Mon Jul 31 13:32:40 2017 + -- .../core-developers/include-configuration.html | 29 +++-- .../interceptor-configuration.html | 66 ++-- 2 files changed, 39 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/36e3e837/content/core-developers/include-configuration.html -- diff --git a/content/core-developers/include-configuration.html b/content/core-developers/include-configuration.html index 45a61ae..e3ec8f1 100644 --- a/content/core-developers/include-configuration.html +++ b/content/core-developers/include-configuration.html @@ -126,15 +126,10 @@ << back to Core Developers Guide Include Configuration -A popular strategy is âdivide and conquerâ. The framework lets you apply âdivide and conquerâ to configuration files using the +A popular strategy is âdivide and conquerâ. The framework lets you apply âdivide and conquerâ to configuration files +using theelement. - - - -element. - - -; @@ -144,23 +139,13 @@ - - - - -Each included file must be in the same format as - -struts.xml - - -, including the - -DOCTYPE -. The include files can be placed anywhere on the classpath and should be referred to by that path by the âfileâ attribute. +Each included file must be in the same format as struts.xml, including the DOCTYPE. The include files can be placed +anywhere on the classpath and should be referred to by that path by the âfileâ attribute. -In a large-team environment, the include files can be used to organize different modules of the application that are being developed by different team members. +In a large-team environment, the include files can be used to organize different modules of the application that are +being developed by different team members. http://git-wip-us.apache.org/repos/asf/struts-site/blob/36e3e837/content/core-developers/interceptor-configuration.html -- diff --git a/content/core-developers/interceptor-configuration.html b/content/core-developers/interceptor-configuration.html index d3b554b..7845aec 100644 --- a/content/core-developers/interceptor-configuration.html +++ b/content/core-developers/interceptor-configuration.html @@ -126,7 +126,9 @@ << back to Core Developers Guide Interceptor Configuration -Interceptors allow you to define code to be executed before and/or after the execution of an Action method. (The âFilterâ pattern.) Interceptors can be a powerful tool when developing applications. There are many, many use cases for Interceptors, including validation, property population, security, logging, and profiling. +Interceptors allow you to define code to be executed before and/or after the execution of an Action method. +(The âFilterâ pattern.) Interceptors can be a powerful tool when developing applications. There are many, many use cases +for Interceptors, including validation, property population, security, logging, and profiling. @@ -151,55 +153,51 @@ -Interceptors can be chained together to create an Interceptor âStackâ. If an action neeeds to check the clientâs credentials, log the action, and time the action, all of these routines, and more, could be made part of the same Interceptor Stack. +Interceptors can be chained together to create an Interceptor âStackâ. If an action needs to check the clientâs +credentials, log the action, and time the action, all of these routines, and more, could be made part of the same +Interceptor Stack. -Interceptors are implemented as Java classes, so each Interceptor has a class name. To make it easier to reference Interceptors, each class can be registered with the framework and given a unique, simpler name. +Interceptors are implemented as Java classes, so each Interceptor ha
struts-site git commit: Adds possibility to fetch remote content
Repository: struts-site Updated Branches: refs/heads/master c758d1138 -> ad23e37fa Adds possibility to fetch remote content Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/ad23e37f Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/ad23e37f Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/ad23e37f Branch: refs/heads/master Commit: ad23e37fa5e1000bfb0d674eb06e1956ddb00426 Parents: c758d11 Author: Lukasz Lenart Authored: Mon Jul 31 16:10:57 2017 +0200 Committer: Lukasz Lenart Committed: Mon Jul 31 16:10:57 2017 +0200 -- Gemfile | 1 + Gemfile.lock | 2 ++ source/_plugins/remote_file_content.rb | 36 + source/core-developers/struts-default-xml.md | 38 +++ 4 files changed, 51 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/ad23e37f/Gemfile -- diff --git a/Gemfile b/Gemfile index c99d6dd..0bd62a9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org"; gem "jekyll" +gem "json" http://git-wip-us.apache.org/repos/asf/struts-site/blob/ad23e37f/Gemfile.lock -- diff --git a/Gemfile.lock b/Gemfile.lock index 3a255aa..7893558 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,7 @@ GEM sass (~> 3.4) jekyll-watch (1.3.1) listen (~> 3.0) +json (2.1.0) kramdown (1.10.0) liquid (3.0.6) listen (3.0.6) @@ -34,6 +35,7 @@ PLATFORMS DEPENDENCIES jekyll + json BUNDLED WITH 1.11.2 http://git-wip-us.apache.org/repos/asf/struts-site/blob/ad23e37f/source/_plugins/remote_file_content.rb -- diff --git a/source/_plugins/remote_file_content.rb b/source/_plugins/remote_file_content.rb new file mode 100644 index 000..686665d --- /dev/null +++ b/source/_plugins/remote_file_content.rb @@ -0,0 +1,36 @@ +require 'net/http' +require 'uri' + +module Jekyll + + class RemoteFileContent < Liquid::Tag + +def initialize(tag_name, markup, tokens) + url = markup + + puts 'Fetching content of url: ' + url + + if url =~ URI::regexp +@content = fetchContent(url) + else +raise 'Invalid URL passed to RemoteFileContent' + end + + super +end + +def render(context) + if @content +@content + else +raise 'Something went wrong in RemoteFileContent' + end +end + +def fetchContent(url) + Net::HTTP.get(URI.parse(URI.encode(url.strip))) +end + end +end + +Liquid::Template.register_tag('remote_file_content', Jekyll::RemoteFileContent) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-site/blob/ad23e37f/source/core-developers/struts-default-xml.md -- diff --git a/source/core-developers/struts-default-xml.md b/source/core-developers/struts-default-xml.md index 9b65c14..22ab774 100644 --- a/source/core-developers/struts-default-xml.md +++ b/source/core-developers/struts-default-xml.md @@ -5,34 +5,20 @@ title: struts-default.xml # struts-default.xml -A base configuration file named +A base configuration file named `struts-default.xml` is included in the `struts2-core.jar` file. This file is +automatically included into `struts.xml` file to provide the standard configuration settings without having +to copy them. -~~~ -struts-default.xml -~~~ - is included in the +> To exclude the `struts-default.xml` or to provide your own version, see the `struts.configuration.files` +> setting in [struts.properties](struts-properties.html). -~~~ -struts2.jar -~~~ - file\. This file is automatically included into +The content of `struts-default.xml` is here: -~~~ -struts.xml -~~~ - file to provide the standard configuration settings without having to copy them\. +{% highlight xml %} +{% remote_file_content https://raw.githubusercontent.com/apache/struts/master/core/src/main/resources/struts-default.xml %} +{% endhighlight %} +This file defines all of the default bundled results and interceptors and many interceptor stacks which you can use +either as-is or as a basis for your own application-specific interceptor stacks. - -| To exclude the struts\-default\.xml or to provide your own version, see the struts\.configuration\.files setting in [struts.properties](struts-properties.html)\. - -| - -The contents of struts\-default\.xml are here: - - -~~~ -{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/struts-default.xml}
struts-site git commit: Updates production by Jenkins
Repository: struts-site Updated Branches: refs/heads/asf-site 36e3e8378 -> 26bb096d0 Updates production by Jenkins Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/26bb096d Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/26bb096d Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/26bb096d Branch: refs/heads/asf-site Commit: 26bb096d00e60ae9e670053aeb506b77a7406773 Parents: 36e3e83 Author: jenkins Authored: Mon Jul 31 14:11:34 2017 + Committer: jenkins Committed: Mon Jul 31 14:11:34 2017 + -- content/core-developers/struts-default-xml.html | 452 +-- 1 file changed, 413 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/26bb096d/content/core-developers/struts-default-xml.html -- diff --git a/content/core-developers/struts-default-xml.html b/content/core-developers/struts-default-xml.html index c11380e..8cc735f 100644 --- a/content/core-developers/struts-default-xml.html +++ b/content/core-developers/struts-default-xml.html @@ -126,45 +126,419 @@ << back to Core Developers Guide struts-default.xml -A base configuration file named - -struts-default.xml - - -is included in the - -struts2.jar - - -file. This file is automatically included into - -struts.xml - - -file to provide the standard configuration settings without having to copy them. - - - - - To exclude the struts-default.xml or to provide your own version, see the struts.configuration.files setting in struts.properties. - - - - - - - - - - - -The contents of struts-default.xml are here: - -{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/struts-default.xml} - - - -This file defines all of the default bundled results and interceptors and many interceptor stacks which you can use either as-is or as a basis for your own application-specific interceptor stacks. Notice the name of the package is âstruts-defaultâ. +A base configuration file named struts-default.xml is included in the struts2-core.jar file. This file is +automatically included into struts.xml file to provide the standard configuration settings without having +to copy them. + + + To exclude the struts-default.xml or to provide your own version, see the struts.configuration.files +setting in struts.properties. + + +The content of struts-default.xml is here: + + + + + +; + ++ + + +