[struts-site] 02/02: Explains how to use results
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 2221151387ae68146538deeab2743961371fb7b9 Author: Lukasz Lenart AuthorDate: Thu Oct 13 13:45:38 2022 +0200 Explains how to use results --- source/core-developers/result-types.md | 43 ++ 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/source/core-developers/result-types.md b/source/core-developers/result-types.md index c85a6d081..31d9b59d9 100644 --- a/source/core-developers/result-types.md +++ b/source/core-developers/result-types.md @@ -26,17 +26,50 @@ own applications. |[Plain Result](plain-result)|A plain result which all you to write directly to a HttpResponse using a simplified API (since Struts 2.6)| |[PlainText Result](plaintext-result)|Used to display the raw content of a particular file/page (i.e jsp, HTML)| |[Tiles Result](../plugins/tiles/)|Used to provide Tiles integration| -|[Tiles 3 Result](../plugins/tiles-3/)|Used to provide Tiles 3 integration| |[Postback Result](postback-result)|Used to postback request parameters as a form to the specified destination| |[JSON Result](../plugins/json/) |Used to serialize actions into JSON| - -## Optional - -|[JasperReports Plugin](../plugins/jasperreports/)|Used for [JasperReports Tutorial](../getting-started/jasper-reports-tutorial) integration|Optional, third-party plugin| +|[JasperReports Plugin](../plugins/jasperreports/)|Used for [JasperReports Tutorial](../getting-started/jasper-reports-tutorial) integration| Additional Result Types can be created and plugged into an application by implementing the `com.opensymphony.xwork2.Result` interface. Custom Result Types might include generating an email or JMS message, generating images, and so forth. +## How to use results + +Once your action has been executed it must either return a result name (as `java.lang.String`) or instance +of `com.opensymphony.xwork2.Result` and the result will be executed directly. + +If a String has been returned, the framework will try to find a matching result in the configuration and then it will +execute the result of a given type, see example: + +```xml +/WEB-INF/index.jsp +``` + +You can define many results per action distinguishing them by different names. + +```xml +/WEB-INF/index.jsp +/WEB-INF/form.jsp +/WEB-INF/error.jsp +``` + +## Default result type + +In `struts-default.xml` the Dispatcher result type is registered as a default result type, which means you don't have to +specify the `type` attribute if yoy want to use it: + +```xml +/WEB-INF/index.jsp +``` + +## Default result name + +If you action method returns `success`, which is a default name of the result, you don't have specify the `name` attribute as well: + +```xml +/WEB-INF/index.jsp +``` + ## Default Parameters To minimize configuration, Results can be configured with a single value, which will be converted into a parameter,
[struts-site] branch results created (now 222115138)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git at 222115138 Explains how to use results This branch includes the following new commits: new 004bd8f56 Cleans up navigation and content new 222115138 Explains how to use results The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[struts-site] 01/02: Cleans up navigation and content
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 004bd8f566166d66ab6d9da7b0ab20f71e107bb6
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 13:45:30 2022 +0200
Cleans up navigation and content
---
source/core-developers/chain-result.md | 4 +-
source/core-developers/dispatcher-result.md | 4 +-
source/core-developers/freemarker-result.md | 4 +-
source/core-developers/httpheader-result.md | 4 +-
source/core-developers/plain-result.md | 4 +-
source/core-developers/plaintext-result.md | 4 +-
source/core-developers/postback-result.md| 87 ++--
source/core-developers/redirect-action-result.md | 4 +-
source/core-developers/redirect-result.md| 4 +-
source/core-developers/stream-result.md | 4 +-
source/core-developers/velocity-result.md| 3 +
source/core-developers/xsl-result.md | 4 +-
12 files changed, 44 insertions(+), 86 deletions(-)
diff --git a/source/core-developers/chain-result.md
b/source/core-developers/chain-result.md
index b25a4ecc3..e443bb452 100644
--- a/source/core-developers/chain-result.md
+++ b/source/core-developers/chain-result.md
@@ -2,8 +2,8 @@
layout: default
title: Chain Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# Chain Result
diff --git a/source/core-developers/dispatcher-result.md
b/source/core-developers/dispatcher-result.md
index 9073b00b8..58ee47013 100644
--- a/source/core-developers/dispatcher-result.md
+++ b/source/core-developers/dispatcher-result.md
@@ -2,8 +2,8 @@
layout: default
title: Dispatcher Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# Dispatcher Result
diff --git a/source/core-developers/freemarker-result.md
b/source/core-developers/freemarker-result.md
index 7d429f768..73e77a313 100644
--- a/source/core-developers/freemarker-result.md
+++ b/source/core-developers/freemarker-result.md
@@ -2,8 +2,8 @@
layout: default
title: FreeMarker Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# FreeMarker Result
diff --git a/source/core-developers/httpheader-result.md
b/source/core-developers/httpheader-result.md
index eaa1234ef..e48fe857b 100644
--- a/source/core-developers/httpheader-result.md
+++ b/source/core-developers/httpheader-result.md
@@ -2,8 +2,8 @@
layout: default
title: HttpHeader Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# HttpHeader Result
diff --git a/source/core-developers/plain-result.md
b/source/core-developers/plain-result.md
index 7a2593ff0..f4a641209 100644
--- a/source/core-developers/plain-result.md
+++ b/source/core-developers/plain-result.md
@@ -2,8 +2,8 @@
layout: default
title: Plain Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# Plain Result
diff --git a/source/core-developers/plaintext-result.md
b/source/core-developers/plaintext-result.md
index 678cadd1c..6aed2565f 100644
--- a/source/core-developers/plaintext-result.md
+++ b/source/core-developers/plaintext-result.md
@@ -2,8 +2,8 @@
layout: default
title: PlainText Result
parent:
-title: Core Developers Guide
-url: index.html
+title: Result types
+url: result-types
---
# PlainText Result
diff --git a/source/core-developers/postback-result.md
b/source/core-developers/postback-result.md
index 2e8061cf0..aa4761d38 100644
--- a/source/core-developers/postback-result.md
+++ b/source/core-developers/postback-result.md
@@ -1,83 +1,38 @@
---
layout: core-developers
title: Postback Result
+title: Result types
+url: result-types
---
# Postback Result
## Description
-
-
-{% comment %}start snippet
id=description|javadoc=true|url=org.apache.struts2.result.PostbackResult {%
endcomment %}
-
-
- A result that renders the current request parameters as a form which
-
- immediately submits a http://en.wikipedia.org/wiki/Postback";>postback
-
- to the specified destination.
-
-
-
-{% comment %}end snippet
id=description|javadoc=true|url=org.apache.struts2.result.PostbackResult {%
endcomment %}
+A result that renders the current request parameters as a form which
immediately submits
+a [postback](http://en.wikipedia.org/wiki/Postback) to the specified
destination.
## Parameters
-
-
-{% comment %}start snippet
id=params|javadoc=true|url=org.apache.struts2.result.PostbackResult {%
endcomment %}
-
-
- location - http location to post the form
-
- prependServletContext (true|false) - when location is relative,
controls if to add Servlet Context, default "true"
-
- act
[struts-site] branch results updated: Cleans up content
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new 9c62c1335 Cleans up content 9c62c1335 is described below commit 9c62c1335b7a22c9088139b67858dd0091ded8d5 Author: Lukasz Lenart AuthorDate: Thu Oct 13 14:48:07 2022 +0200 Cleans up content --- .../execute-and-wait-interceptor.md| 152 +++-- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/source/core-developers/execute-and-wait-interceptor.md b/source/core-developers/execute-and-wait-interceptor.md index e9ec02abb..9bf87ebef 100644 --- a/source/core-developers/execute-and-wait-interceptor.md +++ b/source/core-developers/execute-and-wait-interceptor.md @@ -8,34 +8,34 @@ parent: # Execute and Wait Interceptor -The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice +The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice progress meter. This also prevents the HTTP request from timing out when the action takes more than 5 or 10 minutes. -Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this interceptor -is already configured but is not part of any of the default stacks. Because of the nature of this interceptor, it must +Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this interceptor +is already configured but is not part of any of the default stacks. Because of the nature of this interceptor, it must be the `last` interceptor in the stack. -This interceptor works on a per-session basis. That means that the same action name (`myLongRunningAction`, in +This interceptor works on a per-session basis. That means that the same action name (`myLongRunningAction`, in the above example) cannot be run more than once at a time in a given session. On the initial request or any subsequent -requests (before the action has completed), the `wait` result will be returned. +requests (before the action has completed), the `wait` result will be returned. ->The wait result is responsible for issuing a subsequent request back to the action, giving the effect +> The wait result is responsible for issuing a subsequent request back to the action, giving the effect > of a self-updating progress meter. -If no `wait` result is found, Struts will automatically generate a wait result on the fly. This result is written -in FreeMarker and cannot run unless FreeMarker is installed. If you don't wish to deploy with FreeMarker, you must +If no `wait` result is found, Struts will automatically generate a wait result on the fly. This result is written +in FreeMarker and cannot run unless FreeMarker is installed. If you don't wish to deploy with FreeMarker, you must provide your own wait result. This is generally a good thing to do anyway, as the default wait page is very plain. -Whenever the wait result is returned, the action that is currently running in the background will be placed on top -of the stack. This allows you to display progress data, such as a count, in the wait page. By making the wait page +Whenever the wait result is returned, the action that is currently running in the background will be placed on top +of the stack. This allows you to display progress data, such as a count, in the wait page. By making the wait page automatically reload the request to the action (which will be short-circuited by the interceptor), you can give the appearance of an automatic progress meter. -This interceptor also supports using an initial wait delay. An initial delay is a time in milliseconds we let the server -wait before the wait page is shown to the user. During the wait this interceptor will wake every 100 millis to check -if the background process is done premature, thus if the job for some reason doesn't take to long the wait page is not +This interceptor also supports using an initial wait delay. An initial delay is a time in milliseconds we let the server +wait before the wait page is shown to the user. During the wait this interceptor will wake every 100 millis to check +if the background process is done premature, thus if the job for some reason doesn't take to long the wait page is not shown to the user. -This is useful for e.g. search actions that have a wide span of execution time. Using a delay time of 2000 millis we +This is useful for e.g. search actions that have a wide span of execution time. Using a delay time of 2000 millis we ensure the user is presented fast search results immediately and for the slow results a wait page is used. > Important: Because the action will be running in a separate thread, you > ca
[struts-site] branch results updated: Includes _site again
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new d8cfdb9b1 Includes _site again d8cfdb9b1 is described below commit d8cfdb9b10113dc9a583172a1a1c8566f994c2c8 Author: Lukasz Lenart AuthorDate: Thu Oct 13 15:06:57 2022 +0200 Includes _site again --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5aa5ce38d..eb74c35ad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ target .bundle .jekyll-metadata .jekyll-cache -_site .project .settings/
[struts-site] branch results updated: Adds missing parent header
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new 078e1a719 Adds missing parent header 078e1a719 is described below commit 078e1a7191b5f2c8434ebdc1dbc741c411b16893 Author: Lukasz Lenart AuthorDate: Thu Oct 13 15:25:01 2022 +0200 Adds missing parent header --- source/core-developers/postback-result.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/core-developers/postback-result.md b/source/core-developers/postback-result.md index aa4761d38..806112919 100644 --- a/source/core-developers/postback-result.md +++ b/source/core-developers/postback-result.md @@ -1,6 +1,7 @@ --- layout: core-developers title: Postback Result +parent: title: Result types url: result-types ---
[struts-site] branch results updated: Excludes _site
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new f990ac0ce Excludes _site f990ac0ce is described below commit f990ac0ce8ffedbd7cb2ed86c705da6f50950494 Author: Lukasz Lenart AuthorDate: Thu Oct 13 15:36:50 2022 +0200 Excludes _site --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eb74c35ad..5aa5ce38d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ target .bundle .jekyll-metadata .jekyll-cache +_site .project .settings/
[struts-site] branch results updated: Lists folder
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 1640e3289 Lists folder
1640e3289 is described below
commit 1640e3289ac36c8c0ac0882a46d2d3ae54597482
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 15:37:49 2022 +0200
Lists folder
---
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index ef5004548..021a145cd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,8 @@ pipeline {
steps {
sh """
echo "Pushing changes into stage site"
+
+ ls -l
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
[struts] branch WW-5241-exec-and-wait created (now 26effbf05)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5241-exec-and-wait in repository https://gitbox.apache.org/repos/asf/struts.git at 26effbf05 WW-5241 Improves Exec&Wait example in Showcase app This branch includes the following new commits: new 26effbf05 WW-5241 Improves Exec&Wait example in Showcase app The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[struts] 01/01: WW-5241 Improves Exec&Wait example in Showcase app
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5241-exec-and-wait in repository https://gitbox.apache.org/repos/asf/struts.git commit 26effbf05de95ff9188b6cfe2ef930908bb6ba96 Author: Lukasz Lenart AuthorDate: Thu Oct 13 15:39:07 2022 +0200 WW-5241 Improves Exec&Wait example in Showcase app --- apps/showcase/src/main/resources/struts-wait.xml | 4 ++ .../src/main/webapp/WEB-INF/decorators/main.jsp| 2 +- .../src/main/webapp/WEB-INF/wait/complete.jsp | 29 - .../src/main/webapp/WEB-INF/wait/index.jsp | 53 + .../showcase/src/main/webapp/WEB-INF/wait/wait.jsp | 68 -- apps/showcase/src/main/webapp/wait/index.html | 53 - 6 files changed, 97 insertions(+), 112 deletions(-) diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml index 7b6a204a6..b237dac68 100644 --- a/apps/showcase/src/main/resources/struts-wait.xml +++ b/apps/showcase/src/main/resources/struts-wait.xml @@ -28,6 +28,10 @@ + + +/WEB-INF/wait/index.jsp + /WEB-INF/wait/example1.jsp diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index d63f61f9a..ff1353032 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -239,7 +239,7 @@ Person Manager CRUD -Execute & Wait +Execute & Wait Token Model Driven diff --git a/apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp index 74c97c74c..47cbb0674 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp @@ -1,19 +1,19 @@ +<%@ taglib prefix="s" uri="/struts-tags" %> + + +Struts2 Showcase - Execute and Wait Examples + + + + +Execute and Wait Examples + + + + + + + +These examples illustrate Struts build in support for execute and wait. + + +When you have a process that takes a long time your users can be impatient and starts to submit/click +again. + A good solution is to show the user a progress page (wait page) while the process takes it time. + + + +Example 1 (no delay) +Example 2 (with delay) +Example 3 (with longer check delay) + + + + + diff --git a/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp index e4b467968..57f169d87 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp @@ -1,19 +1,19 @@ - - - Struts2 Showcase - Execute and Wait Examples - - - - - Execute and Wait Examples - - - - - - - - - - These examples illustrate Struts build in support for execute and wait. - - - When you have a process that takes a long time your users can be impatient and starts to submit/click again. -A good solution is to show the user a progress page (wait page) while the process takes it time. - - - - Example 1 (no delay) - Example 2 (with delay) - Example 3 (with longer check delay) - - - - -
[struts-site] branch results updated: Stops using docker
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 7feb14523 Stops using docker
7feb14523 is described below
commit 7feb145234fb1fee6e6766368d368140d14394f1
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 17:06:45 2022 +0200
Stops using docker
---
Jenkinsfile | 5 -
1 file changed, 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 021a145cd..b2ba9172d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,11 +12,6 @@ pipeline {
}
stages {
stage('Build a staged website') {
- agent {
-docker {
- image 'jekyll/builder:4.2.2'
-}
- }
steps {
sh '''
export GEM_HOME="$WORKSPACE/.gems"
[struts-site] branch results updated: Reverts build to version before starts using Docker
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 48b0da92d Reverts build to version before starts using Docker
48b0da92d is described below
commit 48b0da92df79e654f81dc5184e34689d8e3e64b5
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 17:10:00 2022 +0200
Reverts build to version before starts using Docker
---
Jenkinsfile | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b2ba9172d..beca57e1a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,26 +10,31 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
+ environment {
+RUBY_PATH="${env.WORKSPACE}/.rvm"
+GEM_HOME="${evn.WORKSPACE}/gems"
+PATH="${GEM_HOME}/bin:${env.PATH}"
+ }
stages {
stage('Build a staged website') {
steps {
-sh '''
- export GEM_HOME="$WORKSPACE/.gems"
- export PATH="$GEM_HOME/bin:$PATH"
- export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+sh """
+ echo Generiting a new version of website
- bundle config set --local path $GEM_HOME
+ curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
+ mkdir -p ${GEM_HOME}
+ bundle config set --local path $GEM_HOM
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+
bundle install
bundle exec jekyll build
-'''
+"""
}
}
stage('Deploy to stage area') {
steps {
sh """
echo "Pushing changes into stage site"
-
- ls -l
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
[struts-site] branch results updated: Fixes typo in env name
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new bc79238d0 Fixes typo in env name
bc79238d0 is described below
commit bc79238d0c8268545f7b8f2d085d30860dc87d86
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 17:15:02 2022 +0200
Fixes typo in env name
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index beca57e1a..2a94cd153 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,7 +23,7 @@ pipeline {
curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
mkdir -p ${GEM_HOME}
- bundle config set --local path $GEM_HOM
+ bundle config set --local path ${GEM_HOME}
gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
bundle install
[struts-site] branch results updated: Defines envs in script
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 8ea0c7a34 Defines envs in script
8ea0c7a34 is described below
commit 8ea0c7a34d27c1a473bb72d9bdbd7f0c46db3066
Author: Lukasz Lenart
AuthorDate: Thu Oct 13 17:32:11 2022 +0200
Defines envs in script
---
Jenkinsfile | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2a94cd153..d1be1c824 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,21 +10,19 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
- environment {
-RUBY_PATH="${env.WORKSPACE}/.rvm"
-GEM_HOME="${evn.WORKSPACE}/gems"
-PATH="${GEM_HOME}/bin:${env.PATH}"
- }
stages {
stage('Build a staged website') {
steps {
sh """
echo Generiting a new version of website
+ export RUBY_PATH="${env.WORKSPACE}/.rvm"
+ export GEM_HOME="${evn.WORKSPACE}/.gems"
+ export PATH="${env.GEM_HOME}/bin:${env.PATH}"
- curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
- mkdir -p ${GEM_HOME}
- bundle config set --local path ${GEM_HOME}
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+ curl -sSL https://get.rvm.io | bash -s -- --path ${env.RUBY_PATH}
+ mkdir -p ${env.GEM_HOME}
+ bundle config set --local path ${env.GEM_HOME}
+ gem install --install-dir ${env.GEM_HOME} bundler -v '2.3.23'
bundle install
bundle exec jekyll build
[struts-site] branch results updated: Avoids using env prefix
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 17e886a6c Avoids using env prefix
17e886a6c is described below
commit 17e886a6cd84a6a7b62c3aa95cd24350011437c9
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 07:54:50 2022 +0200
Avoids using env prefix
---
Jenkinsfile | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d1be1c824..35e599dc3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,14 +15,14 @@ pipeline {
steps {
sh """
echo Generiting a new version of website
- export RUBY_PATH="${env.WORKSPACE}/.rvm"
- export GEM_HOME="${evn.WORKSPACE}/.gems"
- export PATH="${env.GEM_HOME}/bin:${env.PATH}"
+ export RUBY_PATH="${WORKSPACE}/.rvm"
+ export GEM_HOME="${WORKSPACE}/.gems"
+ export PATH="${GEM_HOME}/bin:${PATH}"
- curl -sSL https://get.rvm.io | bash -s -- --path ${env.RUBY_PATH}
- mkdir -p ${env.GEM_HOME}
- bundle config set --local path ${env.GEM_HOME}
- gem install --install-dir ${env.GEM_HOME} bundler -v '2.3.23'
+ curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
+ mkdir -p ${GEM_HOME}
+ bundle config set --local path ${GEM_HOME}
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
bundle install
bundle exec jekyll build
[struts-site] branch results updated: Sets proper envs
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 96180e142 Sets proper envs
96180e142 is described below
commit 96180e142a95ba54ee01d63d452ff0c69131b707
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:01:14 2022 +0200
Sets proper envs
---
Jenkinsfile | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 35e599dc3..c372c9de9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,15 +10,17 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
+ environment {
+RUBY_PATH="${env.WORKSPACE}/.rvm"
+GEM_HOME="${RUBY_PATH}/gems"
+PATH="${GEM_HOME}/bin:${env.PATH}"
+ }
stages {
stage('Build a staged website') {
steps {
sh """
echo Generiting a new version of website
- export RUBY_PATH="${WORKSPACE}/.rvm"
- export GEM_HOME="${WORKSPACE}/.gems"
- export PATH="${GEM_HOME}/bin:${PATH}"
-
+
curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
mkdir -p ${GEM_HOME}
bundle config set --local path ${GEM_HOME}
[struts-site] branch results updated: Reverts to Docker again
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new e309a66d3 Reverts to Docker again
e309a66d3 is described below
commit e309a66d367d2e221746f4aa7c06fb0948124ad3
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:07:40 2022 +0200
Reverts to Docker again
---
Jenkinsfile | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c372c9de9..23f155dcd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,25 +10,25 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
- environment {
-RUBY_PATH="${env.WORKSPACE}/.rvm"
-GEM_HOME="${RUBY_PATH}/gems"
-PATH="${GEM_HOME}/bin:${env.PATH}"
- }
stages {
stage('Build a staged website') {
+ agent {
+docker {
+ image 'jekyll/builder:4.2.2'
+}
+ }
steps {
-sh """
- echo Generiting a new version of website
-
- curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
- mkdir -p ${GEM_HOME}
- bundle config set --local path ${GEM_HOME}
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
+sh '''
+ export GEM_HOME="$WORKSPACE/.gems"
+ export PATH="$GEM_HOME/bin:$PATH"
+ export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+
+ bundle config set --local path $GEM_HOME
bundle install
bundle exec jekyll build
-"""
+
+ ls -la
+'''
}
}
stage('Deploy to stage area') {
[struts-site] branch results updated: List folders after Docker ends
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 02dba2cec List folders after Docker ends
02dba2cec is described below
commit 02dba2cecdb914fec6a3d56ef76b8eb20fd12ce1
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:14:43 2022 +0200
List folders after Docker ends
---
Jenkinsfile | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 23f155dcd..7d250ed64 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,15 +27,19 @@ pipeline {
bundle install
bundle exec jekyll build
+ pwd
ls -la
'''
}
}
stage('Deploy to stage area') {
steps {
-sh """
+sh '''
echo "Pushing changes into stage site"
+ pwd
+ ls -la
+
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
@@ -43,7 +47,9 @@ pipeline {
git fetch asf
git checkout asf-staging
git pull asf asf-staging
-
+
+ ls -la
+
cp -r _site/* content
cp -r _site/.htaccess content/.htaccess
@@ -53,7 +59,7 @@ pipeline {
git commit -m "Updates stage by Jenkins" --allow-empty
git push asf asf-staging
-"""
+'''
}
}
stage('Comment on PR') {
[struts-site] branch results updated: Performs all git operations in Docker
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 765d8efbb Performs all git operations in Docker
765d8efbb is described below
commit 765d8efbbc79d9b85a2d13ff14a51cf50ddca403
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:23:54 2022 +0200
Performs all git operations in Docker
---
Jenkinsfile | 20 +---
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7d250ed64..0ea5135db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,11 +12,6 @@ pipeline {
}
stages {
stage('Build a staged website') {
- agent {
-docker {
- image 'jekyll/builder:4.2.2'
-}
- }
steps {
sh '''
export GEM_HOME="$WORKSPACE/.gems"
@@ -26,19 +21,8 @@ pipeline {
bundle config set --local path $GEM_HOME
bundle install
bundle exec jekyll build
-
- pwd
- ls -la
-'''
- }
-}
-stage('Deploy to stage area') {
- steps {
-sh '''
- echo "Pushing changes into stage site"
- pwd
- ls -la
+ echo "Pushing changes into stage site"
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
@@ -48,8 +32,6 @@ pipeline {
git checkout asf-staging
git pull asf asf-staging
- ls -la
-
cp -r _site/* content
cp -r _site/.htaccess content/.htaccess
[struts-site] branch results updated: Puts back Docker
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new fb31aced6 Puts back Docker
fb31aced6 is described below
commit fb31aced6a002ba8123bba34ffb6b537457bbf37
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:26:53 2022 +0200
Puts back Docker
---
Jenkinsfile | 5 +
1 file changed, 5 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ea5135db..b35e8ade5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,6 +12,11 @@ pipeline {
}
stages {
stage('Build a staged website') {
+ agent {
+docker {
+ image 'jekyll/builder:4.2.2'
+}
+ }
steps {
sh '''
export GEM_HOME="$WORKSPACE/.gems"
[struts-site] branch results updated: Cleans up workspace and add missing git user data
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new aeda31d99 Cleans up workspace and add missing git user data
aeda31d99 is described below
commit aeda31d99c9f024d8ffe24e0c5166dfacfa22554
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:33:00 2022 +0200
Cleans up workspace and add missing git user data
---
Jenkinsfile | 5 +
1 file changed, 5 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index b35e8ade5..68e5d9af7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,12 +27,17 @@ pipeline {
bundle install
bundle exec jekyll build
+ rm -rf $GEM_HOME
+
echo "Pushing changes into stage site"
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
+ git config --global user.email "jenk...@apache.org"
+ git config --global user.name "Mr. Jenkins"
+
git fetch asf
git checkout asf-staging
git pull asf asf-staging
[struts-site] branch results updated: Uses local git config
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 949b4d755 Uses local git config
949b4d755 is described below
commit 949b4d7550befd64d56fea108819794788d53055
Author: Lukasz Lenart
AuthorDate: Fri Oct 14 08:36:37 2022 +0200
Uses local git config
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 68e5d9af7..6c31777fe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,8 +35,8 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
- git config --global user.email "jenk...@apache.org"
- git config --global user.name "Mr. Jenkins"
+ git config --local user.email "jenk...@apache.org"
+ git config --local user.name "Mr. Jenkins"
git fetch asf
git checkout asf-staging
